gentoo auto-resync : 10:05:2023 - 17:43:52

154 files changed, 1399 insertions, 2320 deletions

diff --git a/Manifest b/Manifest
index 03cfc9d4089b..28935cce86ac 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29457 BLAKE2B 1f469bfa18b8ee2553453e18462d77cb38604c94295ffafea7d70afb94d9114c6f42e80ee3afd1390c16d5b1c3f84b31e79fd74bb70fd6ad89ba0a988fe29c7c SHA512 dec0f482db2c72e41c8e7045af037fbdb83029bbc043c8a7b13e810ee37d60af4807c570733801d46238b6f765c4f482a5e4de743c4b63858e0dabcc0c1e6113
-TIMESTAMP 2023-05-10T10:09:50Z
+MANIFEST Manifest.files.gz 29448 BLAKE2B b45daa900acce085588550c2816109907f0959a9104ae09673bb33265ef859b95b2186324e85b336e564750e47f8db987bc66f050bf6f4c78419de57d89cb06c SHA512 714031486d14f1464253d427627552fc1dd72651482cb993a3321da0413eb4e7cafffc4c2717d7a80cdbefdab7a14916c3b05ed15617407f65ae27078fbf647b
+TIMESTAMP 2023-05-10T16:09:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbbW5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbwc1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAVbhAAmUW+2cnyGQN3s5UIcjqfw37D8UlHJpxHXxSJgjsL+DkDsYNyKvjxzAqP
-PdgPd8EUfYDu/VM50kRROoCcGJJpkXabOzbRgC8/aehxBkg1djw7wmVSB9fPHmcZ
-Kck41KRHct2Sjd3lQMCyQPOaGQUk9S1OVsNIrMghE2vbBxdmdYV5HYYH9MFlLrzb
-ouw200IiiqfvycoK0rb39QnbR4mKkaP8oLNvabs8lzswLjOae486bheW1u6q2lUK
-uFHJq3rHXGO6uz8MR3tWV6qDyS6scl7TLVVEDH6FGMBYKo+hdumacEx1mzywpOLF
-8W10Oc+QKvoYtYUTwZ4aeslSCnhqvmUk+k8K7MRXoqQbFODcF69c2kBswoFimRIq
-OqnQtvxhwp0eUOIrm83Il63bD0k7yUBC0DBiyiwbt08aOrYmLIGbuAcjk3KdVgk9
-yQUVnNG+C1+1yc3uiBe+jZUL8Q9tn1a6xtaDkdWXN73Yc/1Swa+I+ug2TJHHiSB1
-kDsh85oX2FBnSCUfrTjT6F9M5Pb4J5cqSlNQZFCUfXSFddvnkrfCu24nZLu7AIKN
-eID44E2ijGugzgCyvEZBiWAFAfywjFU5uM2fgYcIo19UBFnPU+Hs2fJUI9e17mLq
-4yzi4igEDWYr9Qt/8+KlRLtWwHzQi4/QRlY+xLM2fFEmlZPPHOE=
-=JrTH
+klAefg//a8LGvVmgRlhsOuddbocR5ATP2rseBOtyGYve32f1DTgslTTWiPD0jZup
+zN0COnHijGOcXzlpm2IsfutCdk7ZPFezIlIw+6/F/0Fw/4uymgwasl+GGxtha/lu
+GXlOjjgvFqRiggAuijyaXaotzF9Ql9ehoPqCvNeqjFRiT6OsZfHTFcZFtJcIUEFy
+tlZdLPrbQdIdOxlYiNHlK9Qq21q0LHauIDWCwvgg2LH8fyzMh+GnTkSYZ9AvWVc5
++QLsFa4CmhdGhCxuMGNIfT0lA8LUknIjebnBG0EiH11AiawGNa4ZIdQn5TRL/ORX
+l41fTmez7bV7BxZakFINhpQ/W888s2LnSfC3SocTcwK5d8E2blBcfEysN8UTQTGK
+YfNgUTs36hn3tJYGXE33u166M5gs/8cEDEfY2Hj/zp6OZ5KW4eXUzpW/lRk8KPZ3
+jCdy++qq01a9LAWcsOM3eniOg0fuUBAyF/Q7qjEym93I+kXIjEQTTnBk0sxAQl24
+VezsI5wK10H5hO09DMKOvBxqGgcbBjFLkbiOpsYJZW2zqSIDMGxw3A39t1sSvq2S
+IgtZqRqMVLetCZG+gu9p02niW3FeBkbJ+300uPRQDogpmkt0smfoe37IgYtyWJjB
+1JxtmrVRJAACVJktQYpO0usDMskj3xDC27OOar4fTmUqZiiDV+0=
+=Saco
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index fc407be89512..76d0c59d9d4a 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 524794fb36e4..ecb85b9e8e38 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 65cccf9c5541..c8e54e6d9277 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,9 +1,5 @@
 AUX gentoo.nanorc-r1 5379 BLAKE2B b78e80125832dc4c69a6518344d772cebd4bf8839f64f77e2b0ae9b6b2a151239122144cf13a61f13ab360a777c8f0fa33a703c0ccd04ea59bcfbcc325a75ea4 SHA512 892c207d6924db1076ef7d74e5d36bddf6ca9ab77f4e3988abe269b7b2722e80f77607447b9254485ac58c1635159192fcde118d3e0f116f843a26f7886eef25
-DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b
-DIST nano-7.1.tar.xz 1605272 BLAKE2B cc606a04b34e723da01326d617b50f79711d0b35034b3e75f410fa7e277ba3eddbb1a408a80255533d2fa953f23fee745979363d5621b63a79bd89b29d8d528e SHA512 e3226df636d3ae1d94e2907ce8bbdb8de69eb45afd02fb1c83e275a1dcc288081809041adbfdade35a580bcb9f9632d21a45d764b43d22b3e4cfd87c7757c4e0
 DIST nano-7.2.tar.xz 1608444 BLAKE2B c7e3b18383e9f2f9db1f6059c875ddd164d730ea0e5b363e66fb8e5f30e8598ba49a5afd8eea3a55e295f1e43fb136019f60cc9154ae276c5d589002c0e5298a SHA512 a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583
-EBUILD nano-6.4.ebuild 2716 BLAKE2B 86f00018ade32386b2ee4f97755abbc02c08b3e60de04dfb40752696ab5fa834d8c06e6b67a7f54097eadeffa95f71708382e86e8d89962098dfe4cc0d86bd7d SHA512 1b8bbaf81a90ac30ec7d13a264c8895d280c8259c7c9bb0f84e7fabdc583e57e5106f0bf45f22aedfb39e55cb091df43b0396e119ad706e28d553bdc756024ab
-EBUILD nano-7.1.ebuild 2659 BLAKE2B 03652b470d2dd1a4573c773298a888cb7ffee1b9de9c7c620cd581347f816c79f9bee2cca4b7128160db4fc3f4f7d1f348c381dcf99b630dcf303ea69a3c0c36 SHA512 a1b47e9de73c9801bcecf7138639351fe9a908fa09137445d8f1dc5891c8b9fd8cc618408bad93701b4083189094fa725b05f26d6b0be660bf59d3b560fe7c9d
 EBUILD nano-7.2.ebuild 2651 BLAKE2B 09dba83cb9100f96524315f29dbf6827fa9b1905dbc3e421071b07f9ba497ecbb2d996068fe653577bc1146cbfeedcc9dcbf7e76146831c522f59f9715ca1954 SHA512 763c7e7342bac7c0d0cbb58dde43029004e58404b265db2a54d2820151e06394d8b5e7a103939000b34518374bcceaba7a2126973e3be9e372f7b440d82d9aaa
 EBUILD nano-9999.ebuild 2659 BLAKE2B 03652b470d2dd1a4573c773298a888cb7ffee1b9de9c7c620cd581347f816c79f9bee2cca4b7128160db4fc3f4f7d1f348c381dcf99b630dcf303ea69a3c0c36 SHA512 a1b47e9de73c9801bcecf7138639351fe9a908fa09137445d8f1dc5891c8b9fd8cc618408bad93701b4083189094fa725b05f26d6b0be660bf59d3b560fe7c9d
-MISC metadata.xml 1677 BLAKE2B f6ed764002859bb082787004b858cc2098273fe034df9215ab380c90d2b6dcea168cd92b2fb6ea69ea157e9f9cb239e5499fb1dd8337d167c13031f8b5505343 SHA512 cf2a9a4224b47bc7657c2bfedacba1db7f66e8f1de25fa6203eb9fcd779bc646cc19ddfcc2b7f2555c8f1d8f173c87792db16667535cd053f1a21fc658ad518f
+MISC metadata.xml 1580 BLAKE2B 5977013d57a99580adaf6df69a926972f430ceaec8f19f5d6ea060c5b5d066b9ac3e2fd1ca59def8266f39143b35340c6571651c90e5ef7050ec93cb58d588e3 SHA512 1533be592588e8f33c67072d14432cee0267f23d5a67626b21aa6ea8027fdce754fcd7c731645d5af7033c128b5b09af7140e15d8d5dc4e357ffa73a0428a865
diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index f0ba3c2c58b5..0e05c7d4c62f 100644
--- a/app-editors/nano/metadata.xml
+++ b/app-editors/nano/metadata.xml
@@ -35,8 +35,5 @@ perhaps providing other extra functionality.
 			Disable all fancy features, including ones that otherwise have a dedicated
 			USE flag (such as spelling).
 		</flag>
-		<flag name="split-usr">
-			Enable this if /bin and /usr/bin are separate directories
-		</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-editors/nano/nano-6.4.ebuild b/app-editors/nano/nano-6.4.ebuild
deleted file mode 100644
index e6c3f4ce901a..000000000000
--- a/app-editors/nano/nano-6.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit autotools git-r3
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	sys-libs/ncurses:=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-
-		insinto "${rcdir}"
-		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
-
-pkg_postrm() {
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
-
-	local e
-	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
-	if [[ ${e##*/} == nano ]]; then
-		ewarn "The EDITOR variable is still set to ${e}."
-		ewarn "You can update it with \"eselect editor\"."
-	fi
-}
diff --git a/app-editors/nano/nano-7.1.ebuild b/app-editors/nano/nano-7.1.ebuild
deleted file mode 100644
index 1cc0796fdf71..000000000000
--- a/app-editors/nano/nano-7.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit autotools git-r3
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell static unicode"
-
-LIB_DEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	sys-libs/ncurses:=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-
-	econf "${myconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-
-		insinto "${rcdir}"
-		newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc
-	fi
-}
-
-pkg_postrm() {
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
-
-	local e
-	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
-	if [[ ${e##*/} == nano ]]; then
-		ewarn "The EDITOR variable is still set to ${e}."
-		ewarn "You can update it with \"eselect editor\"."
-	fi
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 826e5e70dae5..2ff3320e8665 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index c156adfe3e81..e6978d0e0023 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -1,5 +1,5 @@
 AUX opendbx-doxy.patch 1557 BLAKE2B 260c5578e22a751f59308d9dc3f94017951f24775c5dc52d3e4e512380244e5d7266704aae43119267c1726a08c086658c7c0e89bbcb66f671507712d9e2c9ba SHA512 f98f1b1014a44713c1cc5adf46fba8af5333c97faf765e8d1e6c0eb4772650c7524f4c8a90cffe6bbdb4c688beb6bac3eb2755105164002f3e85797adb135004
 AUX opendbx-man-optional.patch 1000 BLAKE2B a8e5dc4e0721b94acd0b379a6d27ea8e349e85ea31d362d4f6c0ac274220f69e09bcb4c0436b6cfd3037983e66d484cb48057cb740456d772ab49e7c4dade566 SHA512 1acf644bc84474e62d28cfa07a0030fd2ec919e27cb514cf710d4322f0f6c869e79bb11895e5eee549e4edb5e1924e708dc7ec87b02be722ce5306c418b6ecf8
 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55
-EBUILD opendbx-1.4.6-r5.ebuild 2425 BLAKE2B 781a56db8841b8de991c90fed771562b4b13fbb3baf09cac4947a1bb67f450a4b63e9509beeb3ff3eddb4e1caaea8910aea0fd1c1801322f57da7f4d00f1f61b SHA512 540cf68cae95be043da81401ca63ba9e09289c154c20919878076de7eb94e5eb7ab1593b705f63c68155edb0b94f6ceae60e8c6e083893cef90e96c122535b25
+EBUILD opendbx-1.4.6-r6.ebuild 2575 BLAKE2B 691d03cf32321b5a8b280b5e3acd10c0116c662d1a8d483e9d0c803679f6613baa64b4bf38f6e687c255c376769311c7a9e6b8d40cf0e8ea451ba312fd532469 SHA512 b84063de45c99775d9766751b69b1c942b2b9630815641f9236bf9537433581bcc707c7a3fd0dc15dc4e75d1188287543cd7618d6a9d016b76450d61cdc9d942
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild b/dev-db/opendbx/opendbx-1.4.6-r6.ebuild
index a84c00e4f96d..5a24ad4af48d 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools flag-o-matic
 
@@ -12,26 +12,35 @@ SRC_URI="https://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="firebird +man +mysql oracle postgres sqlite"
-RESTRICT="firebird? ( bindist )"
+IUSE="firebird +man +mysql oracle postgres sqlite test"
+# The test programs need manual/interactive use.
+RESTRICT="
+	firebird? ( bindist )
+	!test? ( test )
+	test
+"
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
 
 RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite:3 )
 	oracle? ( dev-db/oracle-instantclient[sdk] )
 	firebird? ( dev-db/firebird )"
-DEPEND="${RDEPEND}
-	man? ( app-doc/doxygen
-		app-text/docbook2X )"
-
-REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
-
-PATCHES=( "${FILESDIR}/${PN}-doxy.patch"
-	"${FILESDIR}/${PN}-man-optional.patch" )
+DEPEND="${RDEPEND}"
+BDEPEND="
+	man? (
+		app-doc/doxygen
+		app-text/docbook2X
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-doxy.patch"
+	"${FILESDIR}/${PN}-man-optional.patch"
+)
 
 pkg_setup() {
-	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
-	then
+	if use oracle && [[ ! -d ${ORACLE_HOME} ]]; then
 		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
 	fi
 }
@@ -50,8 +59,8 @@ src_configure() {
 	use postgres && backends="${backends} pgsql"
 	use sqlite && backends="${backends} sqlite3"
 
-	use mysql && append-cppflags -I/usr/include/mysql
-	use firebird && append-cppflags -I/opt/firebird/include
+	use mysql && append-cppflags -I"${ESYSROOT}"/usr/include/mysql
+	use firebird && append-cppflags -I"${ESYSROOT}"/opt/firebird/include
 
 	if use oracle ; then
 		# Traditionally, OCI header files are provided in:
@@ -71,7 +80,10 @@ src_configure() {
 	# bug #788304
 	append-cxxflags -std=c++14
 
-	econf --with-backends="${backends}" --enable-manpages="$(usex man yes no)"
+	econf \
+		--with-backends="${backends}" \
+		--enable-manpages="$(usex man yes no)" \
+		$(use_enable test)
 }
 
 src_compile() {
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c10ecab5a49c..731e97fd65a8 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index ea8afb2e6c5f..520e390f9d38 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,6 +1,7 @@
-AUX spidermonkey-102-known-test-failures.txt 6640 BLAKE2B 3158083ec95cfcdb552a077562a0851809c7ffbd7dc346e346eda73035ecdf97bda2bc87a9eb84382e42ff49d969c4b37e5e83d7d339511f3f52782e4d0478c9 SHA512 5d57efcf3fee66c6e31a6c5b6fcd3f1f4a9ca2cf51caa324b25be4695709637e6028a980482f9532749af9006844320c117627dd748848f5c81d0936d72b60a3
+AUX spidermonkey-102-known-test-failures.txt 6918 BLAKE2B 00c40884cdb5f8bc9667ac8689a20e4113c1bf9a1e8311803f16836edd3abd184ddddb0c107ccd6ff3ba700a938716947311510eabce1836d0fae01099b7f6ab SHA512 2186204514b7145f7f0ba0f5e4231c5c281dc9ecc7c6ede816182f78d4c96be50311b9d97b746c3abb5b2335e5b4b7c7fc1114bb1cf9360092b8db37dac02a2b
 AUX spidermonkey-91-known-test-failures.txt 10531 BLAKE2B 905a76f6c4b6a00dd7ffe0eff1c92c467bd48105ab612272fa5768f661fafffa3db691882674816ac38039fc74a97e2d7ca1b87b3d87966e3b35d7e6d911401f SHA512 3439eca54200c638f80f23762d358f47c43b0a9b522e72c023e158cb310d15e16f1b6c5fb95f8e4f1fdaf32cf6b3d2ca7e1d0d44fc437873ba23695de539704c
 DIST firefox-102.10.0esr.source.tar.xz 479026088 BLAKE2B b4d8eaa6d72b009d12b435781c360f043bca7554d8b069b8d858399ece03f20703d7e36427a3f92d0b801a94b1c3f132904f21e51ba4118116bbfa4e5668d651 SHA512 f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b
+DIST firefox-102.11.0esr.source.tar.xz 477769716 BLAKE2B b19db1b35e6c652e2cd44ec5219bd5c42aacd55987962dbcaf50b5ec54d2ac5066290264f938ba3d45ef111779b9f27b06736ae7df11fa62478ab2179acfe723 SHA512 fdfed404c87f33001c0ab50f9899fa80c897fac645be8ed832e426f412aafbf1468b1c8301bad463b3f5535b6d6f2005a96a748b6e2d6bf5afbc3b5bc10983d6
 DIST firefox-102.6.0esr.source.tar.xz 478856656 BLAKE2B 2094bbb3ba00fc2d726a620e9946ca1ec98ad4c930ed611486ac92a7c74aa84da9c15b1353603eb36ce0a9098bd1f311dea2bea255f2bb6dd06fafbc7808d52c SHA512 c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308
 DIST firefox-102.8.0esr.source.tar.xz 479172816 BLAKE2B 0b4cbf11028abc73a8479fb94670e98f0a293fc12381b1eccbadd64a33db068ab7434357abbe3ce0773382c7c90b8fe4d2258cc55abe8bdc2f551bba1dc2b797 SHA512 93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275
 DIST firefox-102.9.0esr.source.tar.xz 484308672 BLAKE2B dffd3928c268562802b9d9788cc83203ca932c85758b822c344e54259d81ef84668231149f3452cec3c2bf32c654db321303bcb9f81f8ccaac477ad2499ce346 SHA512 3923212ce4b7d1f589129025961ff1b380b8aaf1dd074674f3bd63cf14e9a44ff051bda556b7796c25634e153de00ce62243ece15a520f63dd0791a19b2a6685
@@ -16,6 +17,7 @@ DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6
 DIST spidermonkey-78-patches-05.tar.xz 4480 BLAKE2B aaba61d1ee72496ef02463333a9fa9cc18b873953d1875411667fec73cd9f485224371cde65be0506fa3853368a0885cba3a109e052a3408e7d0ff22a8066e22 SHA512 c2522081bcc58d6f517320c344747403e1525c887b2f7ad6d23df76a954cdac1660d7fe5e2ae7a040763d6a6e0e6eaf127c8bffbd9d3ac0283d19d0d6f1f5edd
 DIST spidermonkey-91-patches-05j.tar.xz 5964 BLAKE2B 13f09f77bf16bc61b03c9488b7ab521552e179bfb123e390d0883ea4a3f55e87e0a5d5a246f31a9ddc35f212ea84655fe9d4fc364bbdddc1aac421eb28dbe41f SHA512 4d9cf21b712234ff6a18554a010badd756028e6147597040c423f7e27d260e3984938f956d9bc3572557163a144345ed28d9f88e459fc959aaa6fd448f6deab7
 EBUILD spidermonkey-102.10.0.ebuild 11178 BLAKE2B 310df370c261b46a364903deb46c5d2c41809c2c074da53544c25ebc46c08a35d2a8e732548878feb44f0dc905a7e0da928c6c7e8f31258330e4d3fb23589cd5 SHA512 fc5882e8a20d2c899ba45bac080f42e39d6e32a04f9175fac4487aedc96decc5f5da11d19633502bc4469d599597aca167c486dfa6b45221d8d2d00a7394150a
+EBUILD spidermonkey-102.11.0.ebuild 11263 BLAKE2B dd7cca7d5593c569c0d45025c07f5cda2955e059d8f210f4983decf3f0c90ce6f1ce477c48f6466a17fa3fdec5c7e7edbee635ba2d1c31597f894daed7492d3e SHA512 4cb59c59703c737a78063929ecc17cc058acd01ea73da8b0f0cf1b748f580131d79a5eaf3ca8b21ee63857c2cb81e581d3f375882fec38ce34f6b94c644401cf
 EBUILD spidermonkey-102.6.0.ebuild 11294 BLAKE2B 03ab2e77a5b35ae1daa33c958ad2318d72d7a8a0ad75ee6f63eb6b72ee1b3c35ed6ec9c21dcd1f85fb477d71c5d5a62ae18db95aec1c62dc04ed4f85b93471d5 SHA512 4028151d1aa5a46d365250ecdf513265f3c784c03bddf1250cbeeefd25bb9c5df3f5baeac1a5dd62e3ae3b860659e3ed750f8d5003e580bcbf0480b7a2168b94
 EBUILD spidermonkey-102.8.0.ebuild 11173 BLAKE2B 31a73de3f92ee13786d26b9d257333abfb665e7c172b6bcaeaeb75ffc71993781d2a88f0e3d44d3347b5a2ab2c24295c55839f273d8d2079314a47427795c655 SHA512 0c63f2cfa3c78e53810ace109b06412bd0b93e8b6b85a69b448e18f9c0fe12c4ad85ecf3e3c13b1f2ab98f2f1ecb1d2f8cf7ef9e8c4d002d51fa3d5a1e7fc601
 EBUILD spidermonkey-102.9.0.ebuild 11513 BLAKE2B 795b6aad193494239acae2bcff42959697ab7c8166c8718281a5a8f55c759a5400bbc9d414a8e7d8be4c9ee77b6de6d96d0807b60bba615e4dd815e900961cd9 SHA512 f6eee807acd0e11620f8130254ac3721c14c73e8dab0e2d6eeec81e6ac142017cfd5919e7c0873cb310ed736d2299cd5f45ad1c892af9b454d71cc14c989c6de
diff --git a/dev-lang/spidermonkey/files/spidermonkey-102-known-test-failures.txt b/dev-lang/spidermonkey/files/spidermonkey-102-known-test-failures.txt
index 44d7f767c1d7..ad245956ef03 100644
--- a/dev-lang/spidermonkey/files/spidermonkey-102-known-test-failures.txt
+++ b/dev-lang/spidermonkey/files/spidermonkey-102-known-test-failures.txt
@@ -19,11 +19,14 @@ non262/Intl/DateTimeFormat/format_timeZone.js
 non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
 non262/Intl/DateTimeFormat/hourCycle.js
 non262/Intl/DateTimeFormat/implied-script-has-consistent-output.js
+non262/Intl/DateTimeFormat/timeZone_backzone.js
 non262/Intl/DateTimeFormat/timeZone_version.js
 non262/Intl/DisplayNames/calendar.js
 non262/Intl/DisplayNames/dateTimeField.js
+non262/Intl/DisplayNames/language-dialect.js
 non262/Intl/ListFormat/conjunction-type.js
 non262/Intl/Locale/likely-subtags-generated.js
+non262/Intl/Locale/likely-subtags.js
 non262/Intl/NumberFormat/currency-narrow-symbol.js
 non262/Intl/NumberFormat/format.js
 non262/Intl/NumberFormat/notation-compact-long.js
@@ -98,3 +101,5 @@ test262/intl402/DateTimeFormat/prototype/formatRange/en-US.js
 test262/intl402/DateTimeFormat/prototype/formatRange/fractionalSecondDigits.js
 test262/intl402/DateTimeFormat/prototype/formatRangeToParts/en-US.js
 test262/intl402/DateTimeFormat/prototype/formatRangeToParts/fractionalSecondDigits.js
+test262/intl402/Locale/constructor-non-iana-canon.js
+test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js
diff --git a/dev-lang/spidermonkey/spidermonkey-102.11.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.11.0.ebuild
new file mode 100644
index 000000000000..925c94a3b13e
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-102.11.0.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-102esr-patches-10j.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-102-patches-05j.tar.xz"
+
+LLVM_MAX_SLOT=15
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="ssl,xml(+)"
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="firefox"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{juippis,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~{juippis,whissi}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+SLOT="$(ver_cut 1)"
+LICENSE="MPL-2.0"
+IUSE="clang cpu_flags_arm_neon debug +jit lto test"
+
+#RESTRICT="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/llvm:15
+			clang? (
+				sys-devel/clang:15
+				virtual/rust:0/llvm-15
+				lto? ( sys-devel/lld:15 )
+			)
+		)
+		(
+			sys-devel/llvm:14
+			clang? (
+				sys-devel/clang:14
+				virtual/rust:0/llvm-14
+				lto? ( sys-devel/lld:14 )
+			)
+		)
+	)
+	!clang? ( virtual/rust )
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+DEPEND=">=dev-libs/icu-71.1:=
+	dev-libs/nspr
+	sys-libs/readline:0=
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/llvm:${LLVM_SLOT}" ; then
+		einfo "sys-devel/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+			einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then
+			einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use lto ; then
+			if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+				einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+python_check_deps() {
+	if use test ; then
+		python_has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="7000M"
+	else
+		CHECKREQS_DISK_BUILD="6000M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use test ; then
+			CHECKREQS_DISK_BUILD="7000M"
+		else
+			CHECKREQS_DISK_BUILD="6000M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	# use prefix shell in wrapper linker scripts, bug #789660
+	hprefixify "${S}"/../../build/cargo-{,host-}linker
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+	eautoconf
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+
+		--disable-ctype
+		--disable-jemalloc
+		--disable-smoosh
+		--disable-strip
+
+		--enable-readline
+		--enable-release
+		--enable-shared-js
+
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	if use debug; then
+		myeconfargs+=( --disable-optimize )
+		myeconfargs+=( --enable-debug-symbols )
+	else
+		myeconfargs+=( --enable-optimize )
+		myeconfargs+=( --disable-debug-symbols )
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		myeconfargs+=( --enable-rust-simd )
+	fi
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Tell build system that we want to use LTO
+	if use lto ; then
+		if use clang ; then
+			myeconfargs+=( --enable-linker=lld )
+			myeconfargs+=( --enable-lto=cross )
+		else
+			myeconfargs+=( --enable-linker=bfd )
+			myeconfargs+=( --enable-lto=full )
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	# Use system's Python environment
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	cp "${FILESDIR}"/spidermonkey-${SLOT}-known-test-failures.txt "${T}"/known_failures.list || die
+
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "non262/extensions/clone-errors.js" >> "${T}"/known_failures.list
+		echo "test262/built-ins/Date/UTC/fp-evaluation-order.js" >> "${T}"/known_failures.list
+		echo "test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js" >> "${T}"/known_failures.list
+	fi
+
+	${EPYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		${EPYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 99e9cd3d9ad5..b0d2d634158f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 3652606f1a07..1091db0272c8 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,7 +1,9 @@
 AUX libfmt-8.1.1-fix-static-assert.patch 2670 BLAKE2B 781ccf10647dede937f38f2743dd3ab381c307774d136aeb974997ba6f004bb0e30ba02fa5e69952f76fb142133c9e5c9867194352d54ec6d9f4bacf9a13fa09 SHA512 c03186a3d4d1857f5063e94a5bdbc764535c042d98dc20d577c88ad3d93a60d75e7bf6a95c547df8fc7b037c021b464b9e47b6fcb6aba4ee9716e1727f181cd9
+DIST libfmt-10.0.0.tar.gz 851582 BLAKE2B 4e778fd352ed084b9790b59b4875fc6ed04b7a58a40b3673854dd00763f492cc838970e8faef77b5f9db5e912a2fc77943aedb4ca4afb64a3736129cc4611809 SHA512 6188508d74ca1ed75bf6441b152c07ca83971d3104b37f33784a7b55dfcc614d6243e77e0a14220018586fdb86207cc033eece834e7acd5e0907ed4c97403f3b
 DIST libfmt-8.1.1.tar.gz 826254 BLAKE2B 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9 SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189
 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be
+EBUILD libfmt-10.0.0.ebuild 738 BLAKE2B 274dabcc16a5f6ed496a7226399caebcc3fa9e207ed5c399c30756d95ccdebafaf924a4581a8c01690fa2ed46c376187ecee0ea012a7e99898df700bd51883ce SHA512 cf21e16c913a42825651e0a3cffe7a77185be3c6c8ed59f92ec3d2e3d97fefe36b486f3b20ae861690e31f4c60c572a51dc95c9b62e4bef9d2f40ef2f91808ec
 EBUILD libfmt-8.1.1-r1.ebuild 816 BLAKE2B f2012a5435e3d0f901b4a50ec64b20658120dec8193d9f9d1543df6574a0d1f066f0982d4cde2d47b1c3617563922336116bec97d25e91eaa5334b92b2ae0416 SHA512 0fd7f2f39dc951b623836eb8eb82609840d13112a210aad66f689ec9b1e8a79a281cbdb440662a53c4d30807a3faa0248b9f5f7a5d70579ce7a0486d4eac14fe
 EBUILD libfmt-9.1.0-r1.ebuild 732 BLAKE2B f8889001e89c870af690ae05b02654668cdd7cd56af5a3547f8310672ea7a32c36d155e5cab0c8ab196df83d20932040c562c6277ee110fb0522d77b043d7a64 SHA512 c7b6ae6d22d09da7df0656b7d6621af04bc5748c671583b5ebc2dccb8c52f9f77adc9c9834c0d8073f22868914797e2a1280d04e8f62495ad1f76826aa254781
-EBUILD libfmt-9999.ebuild 732 BLAKE2B 221727734038f14c302a9be166a4ae8133302357f223c7cb81fb2ff66b79fe27b69bd72d20e989c2609b0f28cb5375126ef57f18cddacc6317559e8381fa73d3 SHA512 6adc37f69eeadebc02c67642a2743999fadde4787e3affc047aedf32a7032dc77723d9cf26c50ae2571d381fe5e805cfd9e2b47873fd9de2839f95abdb949eb9
+EBUILD libfmt-9999.ebuild 738 BLAKE2B 274dabcc16a5f6ed496a7226399caebcc3fa9e207ed5c399c30756d95ccdebafaf924a4581a8c01690fa2ed46c376187ecee0ea012a7e99898df700bd51883ce SHA512 cf21e16c913a42825651e0a3cffe7a77185be3c6c8ed59f92ec3d2e3d97fefe36b486f3b20ae861690e31f4c60c572a51dc95c9b62e4bef9d2f40ef2f91808ec
 MISC metadata.xml 382 BLAKE2B e67d9bbfe9721b994b68130e570826f819088bf0c891073ecf1451a4fb54611e2ed1465588314cf6d1b69be91d7ac2c082da8aa4e2ed5b4d531a40fce7143bac SHA512 21bd1200ee00e4f664b5d992281492c1c4a61229aa408c387280db08a9438f75b2215ef0c0ee1aa9db0d7537bfff074fba54176d44f1f105db611ebe1e45e742
diff --git a/dev-libs/libfmt/libfmt-10.0.0.ebuild b/dev-libs/libfmt/libfmt-10.0.0.ebuild
new file mode 100644
index 000000000000..90083087d20e
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-10.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index e4d78ec51a7a..90083087d20e 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index ab106d4bd0ff..a3963d111c9a 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,7 +1,3 @@
-DIST libwacom-2.4.0.tar.xz 108812 BLAKE2B 18f41cd052b18c652c61062948355b4738afe57db344749055492cc6853bcbe3048c582a72318891727ec0fb01a7799f4c80c544b37b51c9246f98e5ae3fef1b SHA512 c67b8a81e9f4285a4e6f422b29e9b8b3677e3fc45e5190fd2b95ad361e5ef35e124b7d78bcf2bb9d7b7183525a6be9916b3038714c42c9ef405a1075750465f3
-DIST libwacom-2.5.0.tar.xz 109284 BLAKE2B cb9443aba276694eb64c6073488746ff4aff75ed77f334425d2f391a591f0a6cf222ef2124b6533ca7f2ca8e5eef36cd335026a87afabc12d912918ac1f930ed SHA512 62d181a5f4ce1335cd72623b7e82d5d44b9a11c08ec2ef4a98fd815fe2e1f814f42c909c2977e1b1ce803f04bac43414577830ff3724643fcecaf37113d098cf
 DIST libwacom-2.6.0.tar.xz 110288 BLAKE2B 321bacccab84f287141257b4c7af12822fca976c335027d399765fdbbb2c59eabcc76f40d4fd83c7cf1cdc88e2c57ccd317b1922ea3dddb98cf2a0847e920ff1 SHA512 aacf234e77bd976de2e2a687294c5ab704dca5a70df01fa2485441029e4faa34bec2824c455642115ae79f5cbbac41d064569e4eb2788655c324b37149009d26
-EBUILD libwacom-2.4.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
-EBUILD libwacom-2.5.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
 EBUILD libwacom-2.6.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
 MISC metadata.xml 313 BLAKE2B bee5263fa9309d84996574f86a17a4292e58a7eefc65159ecd0df578ccab24e39f4c050deaaabbcd33e5a86292af6c57c5b2c9eb2c9b6e3caeab86e5633cf3c7 SHA512 b1575775a9f633ffe2124bd5ebef65ab864ae697ed733f50e3028484d2d60ea827e5ac12305d57beedcdbe58d8699bbc7e67cb0c844041c7a56045cb91eae633
diff --git a/dev-libs/libwacom/libwacom-2.4.0.ebuild b/dev-libs/libwacom/libwacom-2.4.0.ebuild
deleted file mode 100644
index 62173377ae27..000000000000
--- a/dev-libs/libwacom/libwacom-2.4.0.ebuild
+++ /dev/null
@@ -1,71 +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 meson python-any-r1 udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Don't call systemd daemon-reload in the test suite
-	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-		-Dudev-dir=$(get_udevdir)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-libs/libwacom/libwacom-2.5.0.ebuild b/dev-libs/libwacom/libwacom-2.5.0.ebuild
deleted file mode 100644
index 62173377ae27..000000000000
--- a/dev-libs/libwacom/libwacom-2.5.0.ebuild
+++ /dev/null
@@ -1,71 +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 meson python-any-r1 udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Don't call systemd daemon-reload in the test suite
-	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-		-Dudev-dir=$(get_udevdir)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 9a67c8ac2f14..49c89a060b7e 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,5 +1,6 @@
 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
+AUX spdlog-libfmt-10.0.0.patch 1750 BLAKE2B 2369a5dc8f15a52d61387a0686acdaf8c6ccfa7150f9d237153c036a8e990ed037733358d51c3c4deb136689cd4da7a02aca3efc38abaffcb9a766ff0d95d6a9 SHA512 d713c753a62cd84fdffab96c897105ab5bebe7938f0cb782fcceb7e65758c740c3a4ae849d85617a293b62333cb1633e6f3d86fad939cc9e383de934e5251fd9
 DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
-EBUILD spdlog-1.11.0.ebuild 991 BLAKE2B 6538e5fb820081f85cc44d28302f66afed3c4e5b45a8ca3df6e7316bedd9f02330b874b5d01099c045a2a09f9253624d7459422006c4578641119c59aa25bd81 SHA512 a7605ada9603e60a2f476c00c3327c7a3aa62b53b3d4fed46ea226fa6dd6c569c94c7ddd0c71132d9d2b9f2c1e2ac4cb985bad8ec8a2b0ffa140b9e095370bf6
+EBUILD spdlog-1.11.0.ebuild 1032 BLAKE2B 52bbcf3ea9fa6e13b84dd6e3b5808823154920c48f0cce19476764cf518433f92f3966a95ca44269f8ba46bf955d040a3dfed25287655c35c7ab1dd7904b075a SHA512 f2fb35e66d4722f7c4feb73f70fbcf16112418c983366aed5ea251092646e814900c1a0708bac90a74c4dd00e8ad789710ba36bb24e9c49806c20a6183cfd5c6
 EBUILD spdlog-9999.ebuild 997 BLAKE2B 63ee00aedfb9a4aa437a72ed2d41dc28e590cb50c76476733ef5ee895ed5e2fe0b16f3ec0dce562a05bdcd5f373df2f657735ad30890a1eb1a4cec5b86422dcc SHA512 2628758065ca9a8bc93ad99c4c0f930b6aa7bb44a75e80a40cd781597124ab81f3e38e24e327401adb2128e5d909c3f46c500f1578bb198f8b47c23a566efd74
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
new file mode 100644
index 000000000000..03ef4e591048
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -0,0 +1,40 @@
+Bug: https://bugs.gentoo.org/906069
+Upstream: https://github.com/gabime/spdlog/pull/2694
+
+Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0
+
+https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05
+
+From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001
+From: H1X4 <10332146+H1X4Dev@users.noreply.github.com>
+Date: Fri, 31 Mar 2023 20:39:32 +0300
+Subject: [PATCH] fix build for master fmt (non-bundled) (#2694)
+
+* fix build for master fmt (non-bundled)
+
+* update fmt_runtime_string macro
+
+* fix build of updated macro
+--- a/include/spdlog/common.h
++++ b/include/spdlog/common.h
+@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>;
+ template<class T>
+ using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+ 
++template <typename Char>
++#if FMT_VERSION >= 90101
++using fmt_runtime_string = fmt::runtime_format_string<Char>;
++#else
++using fmt_runtime_string = fmt::basic_runtime<Char>;
++#endif
++
+ // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
+ // in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char>
+ template<class T, class Char = char>
+ struct is_convertible_to_basic_format_string
+     : std::integral_constant<bool,
+-          std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value>
++          std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value>
+ {};
+ 
+ #    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
diff --git a/dev-libs/spdlog/spdlog-1.11.0.ebuild b/dev-libs/spdlog/spdlog-1.11.0.ebuild
index ebda7ae2f4a2..6759c44b79f8 100644
--- a/dev-libs/spdlog/spdlog-1.11.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${PN}-libfmt-10.0.0.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5648274a0a1d..136db03dbf78 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 5c365f162727..8645bb08025f 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,5 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-3.0.0-nih-test-deps.patch 3435 BLAKE2B fbbe2bbd8b05dd215b2ba413e208a96fbd1df9904271980658e1fae100e6fb1d049e15d582a307364d6416090b97741cbfc8d7304e08d7b7bbfbd70e0f1a1522 SHA512 76cca0e404215e505d6ceb650da796862fd87ab460e1a65438c62cb926af4a3ebb8f603bd26acc1a6d1a1a37e6090fc01edc4ae7a7f81f18105d3d9fce03545d
 DIST paramiko-3.1.0.gh.tar.gz 351910 BLAKE2B 7350626f3a8e54d8950085cbd8253f5564355abb4db7c65113c0df22674e3df0081da7299cfad779f1fcf9569b01720b6ab5dc2bde32c4a71500e79910caf4c8 SHA512 1a556a5b7a6ebc72a0c61b59f326a95c9f2784d74fdc1a171455867ba7b4b07a15741e168747b5a3a225685ad069e2d58021f54dadf7feb00f8acf65b0c07d51
-EBUILD paramiko-3.1.0.ebuild 1235 BLAKE2B 36a9f9d10eb7a60962f30ae039ccb6f1b2146f9545cebc901db59544fd3251f1c61d25b4b94c2874151c92852cf2555f84894dea34d529cf43b7de9d3a2ccac7 SHA512 e0573656798999815fbdbdda8938c3b9eda4b17f2de32f5fff9a37465bf1ae220380d6daf0528af2250f71e804efe707ed4b20a99f791a1574cc3c17fb2aff51
+EBUILD paramiko-3.1.0-r1.ebuild 1201 BLAKE2B 83a9d97c92d63e3518f4b0f73d0400119f39491277bbe2a2551c90fe227095ec4645f5df1d6a1200ca03c0463044426a228113a4a2f4d240ed6b94f4a1d2276e SHA512 bbf9e0f03a25c1b32b42c562aeacf423c62f217fa584ad8796fd73a88e52c46926f610ab294877c15a367357605763a2d9153891dbe446bddc5a0d953711989e
 MISC metadata.xml 1222 BLAKE2B 46fb6385f6779cbc13fa54090dd5dfa0b5a7b5a753f728b133fa79a1e1c779a5652d6b38c5ea11cfcb505178b2ba70d9000dabba6228e38f30f426ecb1c49a3f SHA512 bf07a537ed375a3bf58d219c18ccfc29c810554041943e62819a46b63ce3fbcdd2197085dbeeb7ad36e0e601700edec6121ce5cc83dce1c7435d663473df2583
diff --git a/dev-python/paramiko/paramiko-3.1.0.ebuild b/dev-python/paramiko/paramiko-3.1.0-r1.ebuild
index dd2a49a105fc..380997434a93 100644
--- a/dev-python/paramiko/paramiko-3.1.0.ebuild
+++ b/dev-python/paramiko/paramiko-3.1.0-r1.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
 	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
 	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 9f38a6756431..c648254952be 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,9 +1,5 @@
 DIST urllib3-1.26.15.tar.gz 301444 BLAKE2B 2681f0290a4f8b335dcdf384a0c0692cf51e88ea829f80c8c857be328b00c618978a84957da4e23826e4597fe90764eb36ab9acbbc33f9a6ec8df3e3ff3f4d48 SHA512 b6ddb29c15b2d729605a6acb7c602f18c75a937cdfe9649d35d790a59fbb1d96a8d68975ba0a4c073c9f1750e383c67b7566dbcd81b3e8611501e9f4153e9a2b
-DIST urllib3-2.0.0.tar.gz 276792 BLAKE2B 3f5966ea97f1ddbf73ef4d1d292b426f502a211fef6e2bc354a88dc95766faf99a5dd34cb891147c580a03b8c5fb2dd7fdee22988bd603db046c03245c850904 SHA512 24e1b34d266983cf4e1556cbe026cc62d7fdb14c5ec5dace800e0b40e0a4f898d4df1679de351d14598ab0f72eb1bec74b6d2976df628b786f4bab4cb4380044
-DIST urllib3-2.0.1.tar.gz 277241 BLAKE2B ae4f323bcae505f2e177fd6c4764af78f5b98140366ac6e14f27eb0f5c55870f39bfdab6466628cd2fcf2171cd31ed6c82ae3f42e109834764aa87cfdd13f4ca SHA512 58b784052530f1447c8fca3db3309b127a7db352f8f6800765b92efb02762502ea9e6d50fee5d8c297a9ea0d6861c91f6db7254eb955941f0239d56f30d2dcc5
 DIST urllib3-2.0.2.tar.gz 277703 BLAKE2B 1c7935a6aca8e60ad212eb35ef76009b75a8d080b1a572fe229e94a200e75c352ab41d831dde3d4a4643ecbbe54c2128f9d9ca1850d978fd1730d6d730ce3ab0 SHA512 874674342259f2f9b77b4aac90bd525ea50d4b6134008c22eb0fe7a04e688797564c3ec8e556600f75416df2983c972867e8a569d5d85a8dda748948217af38e
 EBUILD urllib3-1.26.15.ebuild 2315 BLAKE2B f66ea329585eea090f339bd996900c5073918b6efc38fbe1d6d2eaba835c426149ae274a33659d6e5cfeeda87c84048e210456c7013006f59e464dcd9a38ae25 SHA512 21bbd772075249cf7af1b2509374186af3fb37341a89098717dbc91caf407cd65ea700a0d205f30c12277f509bf966123719a014d496dba2175eda95ef26a123
-EBUILD urllib3-2.0.0.ebuild 1891 BLAKE2B bddebc287f54cfe2a335ced1da9f920fbf8a6b74219e108ef928e83fd9e5f20ed02469c447ed5d0293ccffbbeab169476940409464383607ff2472a8a3a9c26e SHA512 45b78c8f82dae41d8e51495faa15bcc4edde0b0eaf53fbd8b42a484958a5bcf28c3f974f2a27ab6b92f33190e7ed6cd5c431becb5b94f885476d214d7e027daa
-EBUILD urllib3-2.0.1.ebuild 1891 BLAKE2B bddebc287f54cfe2a335ced1da9f920fbf8a6b74219e108ef928e83fd9e5f20ed02469c447ed5d0293ccffbbeab169476940409464383607ff2472a8a3a9c26e SHA512 45b78c8f82dae41d8e51495faa15bcc4edde0b0eaf53fbd8b42a484958a5bcf28c3f974f2a27ab6b92f33190e7ed6cd5c431becb5b94f885476d214d7e027daa
-EBUILD urllib3-2.0.2.ebuild 1981 BLAKE2B 012dd8514e86af6e9823b11360ba7382d9f5ec4adaee869f7165f1a55518a1cc31a16f3e1d4c27981ef1008c6a957580fae4684b438715866ee0b6aebe1258c9 SHA512 35a7347127186869f6da9aa14a9f471f918b044041bb84270187768877230931c809bfc0b8b6a1375cdb1207a065a5f885404bebc017253de1224e42924d5548
+EBUILD urllib3-2.0.2-r1.ebuild 1947 BLAKE2B 8de4b4e4e3cb744bf2eb43c9bbcee7bce1feb9bb92a540f4551d28ccfa69654d2ae9f1c6c0dba77725e1757e0e6561d120607f3f4b7eca1ef7cee78f0a1d8663 SHA512 a67410a45745c585c8306f733ddabfb238904426ffd032a1f05bea1dcb1f05ae208aa50a144779f61d503e7413191d704b1f16d0c6e26b186f7649e53feeb6e3
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-2.0.0.ebuild b/dev-python/urllib3/urllib3-2.0.0.ebuild
deleted file mode 100644
index 8ee137c6da4f..000000000000
--- a/dev-python/urllib3/urllib3-2.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.1.ebuild b/dev-python/urllib3/urllib3-2.0.1.ebuild
deleted file mode 100644
index 8ee137c6da4f..000000000000
--- a/dev-python/urllib3/urllib3-2.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.2.ebuild b/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
index 3d07423a2d37..9c46c938c35a 100644
--- a/dev-python/urllib3/urllib3-2.0.2.ebuild
+++ b/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
@@ -28,7 +28,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
 	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
 	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index b016f986830b..1fb435716146 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,5 +1,5 @@
 DIST xcffib-1.2.0.tar.gz 88972 BLAKE2B a8d9be7c3149f696d06474aab85e9f7605d45e9861151192dbb7b51e48483f75adb721e17531432294d19d8d6498b66ba312702ea011e8470c3ac42ac0cd6e23 SHA512 7012833f2877edea92cdc15030543883e2a848264c034a81222626ad48a69fcdac8a88cec2e07e61a80102640baa7fbdf29bbf25e08e59fc896aada08533bb77
 DIST xcffib-1.3.0.tar.gz 89874 BLAKE2B 5dd8d64b906d92cb987ee4398da668d6034faf4abc24a56c0fca3e5b6d0cd1252ea1459736a9f7fb83ee97d4d6cec5d103eb19aba626a3d646f67e6332e255a5 SHA512 a493f86891158ffa0c36168da5e7ebdeadafe5e9f067e2ad6052cf302c89db612f907b5e9950748fcfd74886b808870986529902bae77fede7e27d5d422d6ec6
 EBUILD xcffib-1.2.0.ebuild 805 BLAKE2B 273fcacfa407eaeddb2a1e05cd46580766fc03307a8224b5cee35f38131aa6d025bbc98dba2cc7c6545284f79b1115e4d40534764629b2ea90e69a1a0b206f2a SHA512 38aa6f5b01ffff693d5bcad5a199ad4eebfbed9508e9038618aa1651365dd9402d49cadae0983315b99947ed5052862067bcc825b873761fd6bcfffd75062de1
-EBUILD xcffib-1.3.0.ebuild 812 BLAKE2B 13ebcf5c25c688088b9b7223826b6738f6762524604695489e583118ea832373c3b340e5ac9888f85e0d546e28b35f7800e12237054a00953cdd3fa62ce939a2 SHA512 9a14a4bb091e24a6a4c8e0bd4d5fabb57d749cae3eb46d47f912d1f971cace347d201f2e77d8857244eff4887a895e5b1c1d77e40310c04263b3d4584713e3e6
+EBUILD xcffib-1.3.0-r1.ebuild 778 BLAKE2B efae7c97b1ec25fef9e5ac7b14d92dd5889e1ee03de3b12ed47c25d73504e534fc23d92b7b90d20f947719ba6cc843f6297c54d2d71a1fdc7b5d6331a1456df9 SHA512 d64f358fcf27c5e57f11db239561e4195ac4f298a60b3d70f02085b384efca0b44730d66a8c1d754b2973cc14c7e88aedc2075a3e808cdc762198bd9978708d1
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-1.3.0.ebuild b/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
index 0d811a0a3f89..827dd135f36b 100644
--- a/dev-python/xcffib/xcffib-1.3.0.ebuild
+++ b/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
 	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
 	${DEPEND}
 "
 BDEPEND="
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 6b29116ee1a1..fae00e4509cf 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wf-config/Manifest b/gui-libs/wf-config/Manifest
index fec73b888cd7..038c8fc70350 100644
--- a/gui-libs/wf-config/Manifest
+++ b/gui-libs/wf-config/Manifest
@@ -1,4 +1,4 @@
 DIST wf-config-0.7.1.tar.xz 39120 BLAKE2B b18048334df12b002391fe4a74529cb61df76a0678c9052f8ac91d777e8a48dae46b87680fb44630ebfb9a350dbac36b15bc81850341fa4cd6299c12f6fa057d SHA512 d535a09a3465a54a607df7b8764ee6818ab8b83536d68c85167b282b95a176636e4bf5cda6c0d1638c07721a1f4208203e9d41b83675038fb590a535314df719
-EBUILD wf-config-0.7.1-r1.ebuild 647 BLAKE2B a1ae5d6c093d738b7bbae79329441879d09f448dcb3fc688254ed4154149ce53b842739ae4eb152583d2a5faa939740455623a50ace1efbac4f6df0d8abb63df SHA512 fe2e9957e6b9a894f053d6a8512170d01e553d83831c1192d3f7fc613be5ecd9ba04579eeb694f378d960fa9a931778416e78e9303282a6abaedddcdcf9465a1
-EBUILD wf-config-9999.ebuild 648 BLAKE2B 7ed4b2e30559c64d915ad51f91d21b2092776c7b75d37206d5c22aeb22764b468de0f0502cccd668ab61c9129fedcb8ae471dc7929214c47ea0b0e3ffc5b6f88 SHA512 b5c963ed5891c17a4477896ba68a549c4bbe2ba1d6f7d44267942d83ee5e188e8c701abd0abd897b9fa684841166f7a77dbdfe270dc5eb2f258477683ba03393
+EBUILD wf-config-0.7.1-r1.ebuild 809 BLAKE2B 9f67605ea19118594c5a1d4a7e908787b9731234efa01ed4dcf5957d4a8c7e2f2dab90983e3b45a9a760ac2a0bbc7873ef09cc04c1247e326f0cf5a19e51de46 SHA512 0c48c0fc68edb3aab37eec47058db82434b3ce970b473927067aa94d274360faa5a871857466d4df54aaec138a7e13d371c54ef59af2e598498e8a15dccb317f
+EBUILD wf-config-9999.ebuild 810 BLAKE2B 68f71681519ec39e272cf5a35fc48855314fd77b0c98784f662ff266f9ca26bbcd415e8a7bc17793214ca72f7af6e1e581cba164ca8643f52f371186d3cd7c45 SHA512 e998fa99485845ee9f57a3fa57576f6f1908ea51f1232d88ce29f1e972656aacd6862ae5b7e2431fabfb5f430b3af064fda870db77e3caae1538ce25c8a703ec
 MISC metadata.xml 507 BLAKE2B 503103e40f0527b6593821f4170bf58d7077d6d32096cb71d125ed88ac768c341b089a6d7c173797aa4604e6450f9c9716fb4122d8d499b67f1067f75d3c60a0 SHA512 122c9699e3a22be6d91680ac303d09b9614313345f11a9a3a344c4064fecede8107f3b891c9e04bb19479aeed846beb18355803dc41b2052a81fb6c016c25f5f
diff --git a/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild b/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
index c663a20684e4..a223d4b9907c 100644
--- a/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
+++ b/gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,8 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libevdev
@@ -28,4 +30,13 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
+	test? ( dev-cpp/doctest )
 "
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test tests)
+	)
+
+	meson_src_configure
+}
diff --git a/gui-libs/wf-config/wf-config-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index 7ceb2c95adb3..ae9b12db688b 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,8 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libevdev
@@ -28,4 +30,13 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-libs/wayland-protocols
 	virtual/pkgconfig
+	test? ( dev-cpp/doctest )
 "
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test tests)
+	)
+
+	meson_src_configure
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 005ec65d5f3a..94795d6751a6 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 84820f5ce5c2..f6f43ec0b22e 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,9 +1,6 @@
-AUX kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch 1264 BLAKE2B eb4b151f724470f369ba9c2b36c4910b1933739cd5e10c7163d9135b6dad99a2f6876e7738b38c0fd82dc0638e63f6a71da13d7ab64c3deda0caa9fabeaff809 SHA512 cb76b1f337f26458639caba52e6c4bd90cf92cda2f38cc8bac2e5415069d9d9604348ba609d36b2c81fc5f394f16c05c6b27e3ce2a78d5b5e5f7a8e38259ab90
-AUX kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch 1178 BLAKE2B a12f4a7a88c7fbeb9ea8a2fa32a2c720383e0e491de8a11b6ac48eb575cabf837b1f6cfc87fcf779e6d80b8efb5f262a65549e17cd3fd542a2ed046171e39e29 SHA512 45e2145b292982452dbf723338e0ac21b0c1d2402a31d227d28ce9bcf163e0917123faa7015d8a399c36d4d8aaa0a9b70e57206544b2b4fdc07dd12b6b4ade43
 DIST kscreen-5.27.4-patchset-1.tar.xz 2552 BLAKE2B 4a7862f56e5fdd110c3a56893f07f54641079e3e8462515ae55329b8381beb31f929107dfb0fa232a1b5283618fa6a2cba9d6026441e3aa627e9fbd4c900dd49 SHA512 a9f062f342e8c10c9ae8ac7367ab22e9739b44eb31b07e8cf230fe64a6bd4555aae734ba2af4233b967f75ba6214001a3faf2f41acece573fd430e9e82c5843a
 DIST kscreen-5.27.4.tar.xz 184212 BLAKE2B f0ff9a98f0d6151e230dbc1f4ba33d123b80d4d3879de818adb5dbff0a50e09892fbee37c7cd96f31e1708aef43b0c9bbcdae2c6c13f81f5a80380ba8145d72c SHA512 2ce33a582e8315133de31c01fcd32ea02627dbbd00fa2a8c30ea8a9a082b12c36410d21bb74c4ef727fdbab0c7ae6d9ff6cc83597c249e6a5456d6e11b738518
 DIST kscreen-5.27.5.tar.xz 185368 BLAKE2B 83c3443a99b53af044aebdc1dad8505df43e4b348d8668e583fa9d321108feed734d03b8b9de25b9660115f118a7fd738467eddd22c366730419fcd0fd277fb5 SHA512 9627528a66537a09e1dd9cec03ae678fdb479a579cb9979cc74261992ecf17c1b3c3a4eb6777f4e4469c5d021f3a9b36108c144dbbfdb15a3a0dbaab0a66afe4
-EBUILD kscreen-5.27.4-r2.ebuild 1541 BLAKE2B bd9335e611521399d83346c5e39b933c301db2944917ddb8c4d3282b94c0ff2d6cc1a2c443b4c212eae215403c28c5940f4995ac401d506757deb97d1d15c859 SHA512 476a44cf343f9a191c2d61373ff58628b46397cea4bb303d6c1e3e3db287cedd0a1665276e165618bdf5245bd1c3ae2f4d4c8c19801fdb3903fd6b7798ca9ae2
 EBUILD kscreen-5.27.4-r3.ebuild 1501 BLAKE2B 91bc5fa08ac26fba02fc4df1bb214fece64c6765db63d38b90003d1b54d6e646acb3ae32f1bc76a935b2e8f69d5078e7faa1666539f1724d839bda5627c2bf91 SHA512 7e55ba7bde9ec381c522ec354528a3e13dd5f8ed418ef9c1423ad47502cc8389e81b38ad9abca377007579454150cc359edffc4358729069b416cd5a262d2192
 EBUILD kscreen-5.27.5.ebuild 1352 BLAKE2B 7ec94f34a0e1149e4f803041c48c19c639ea729750cca73f6b526f1ffffed1015851f767976eb48b4e0a0a784629158bc1a98a4ffede347c0919a8efb01fba3d SHA512 4909ce2d28e0ece3dbae30bbf61f3349940524846f61443c84ffab671d1fea83e5dd958d90a9c3d1f16633f400cf89241b623159151c9de8437639d7d19d494c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch b/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch
deleted file mode 100644
index 795773a679f6..000000000000
--- a/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8af1cfac332f6f7c4e6db40c851dd5ac719236f1 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 17 Apr 2023 16:01:50 +0200
-Subject: [PATCH] don't stumble over nullptrs if outputs changed during saving
-
-exec() opens a nested eventloop that does event processing and may end
-up processing output changes when e.g. a screen is getting unplugged. as
-part of this our m_configHandler may get reset to null, so make sure the
-pointers are still valid after exec
-
-BUG: 466960
-
-
-(cherry picked from commit 0bfa16bd2b59ac9b2ce8112c06d86e5e29c69654)
----
- kcm/kcm.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
-index f292699c..931509eb 100644
---- a/kcm/kcm.cpp
-+++ b/kcm/kcm.cpp
-@@ -172,6 +172,13 @@ void KCMKScreen::doSave()
-     m_stopUpdatesFromBackend = true;
-     op->exec();
- 
-+    // exec() opens a nested eventloop that may have unset m_configHandler if (e.g.)
-+    // outputs changed during saving. https://bugs.kde.org/show_bug.cgi?id=466960
-+    if (!m_configHandler || !m_configHandler->config()) {
-+        Q_EMIT errorOnSave();
-+        return;
-+    }
-+
-     const auto updateInitialData = [this]() {
-         if (!m_configHandler || !m_configHandler->config()) {
-             return;
--- 
-GitLab
-
diff --git a/kde-plasma/kscreen/files/kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch b/kde-plasma/kscreen/files/kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch
deleted file mode 100644
index 9c1e862ff480..000000000000
--- a/kde-plasma/kscreen/files/kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e9384150d8e41dd9c869f5f502e02c70a5c6f002 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 8 Apr 2023 00:33:24 +0800
-Subject: [PATCH] kcm: notify changes in kcmfonts when global scale changes
-
-Otherwise kde-gtk-config will use the old font DPI value.
-
-CCBUG: 468203
----
- kcm/kcm.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
-index 6d96625d..f292699c 100644
---- a/kcm/kcm.cpp
-+++ b/kcm/kcm.cpp
-@@ -438,7 +438,7 @@ void KCMKScreen::exportGlobalScale()
-                 loadProc.waitForFinished();
-             }
-         }
--        fontConfigGroup.writeEntry("forceFontDPI", 0);
-+        fontConfigGroup.writeEntry("forceFontDPI", 0, KConfig::Notify);
-     } else {
-         const int scaleDpi = qRound(globalScale() * 96.0);
-         QProcess proc;
-@@ -448,7 +448,7 @@ void KCMKScreen::exportGlobalScale()
-             proc.closeWriteChannel();
-             proc.waitForFinished();
-         }
--        fontConfigGroup.writeEntry("forceFontDPI", scaleDpi);
-+        fontConfigGroup.writeEntry("forceFontDPI", scaleDpi, KConfig::Notify);
-     }
- 
-     Q_EMIT globalScaleWritten();
--- 
-GitLab
-
diff --git a/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild b/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
deleted file mode 100644
index f7712247e82d..000000000000
--- a/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://invent.kde.org/plasma/kscreen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-# bug #580440, last checked 5.6.3
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-kcm-notify-changes-when-global-scale-changes.patch" # KDE-bug 468203
-	"${FILESDIR}/${P}-avoid-nullptrs-if-outputs-changed-during-saving.patch" # KDE-bug 466960
-)
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index d798ee6491dd..3875cdad6507 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,8 @@
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
+AUX kwin-5.27.5-fix-xcbutils-nativeFloor.patch 931 BLAKE2B 301b2db3db66ded11986583810d8283bf30ed7f6b848db0232e7c91b1c7cb660eacc8f631ff31ed41df826be7d48443235dba7a125b955af968e872a7e903e32 SHA512 baf12c4f2b8a1804fc268ab3a05ff6d207b9cdb07be2faf4327ce53fd0d68f2dc032d92ef11d95cf23f1c9eed3499552c48c3034836b940fc71d1e563e2a2466
 DIST kwin-5.27.4.1-patchset-1.tar.xz 8736 BLAKE2B 26fa987b087c9f7687cb30b4c3d66d1d3cdac855bfa0c59af10429b67f9a75c7f2a9cf76ee0a0125afc31b70097cdc25fcd3a482496cf6fb2dae4c929695098e SHA512 2c2bc1756064f4c772172aad58533412b7ac534d25c1a81bb4b65671a2ce9747e9dbd201826bd0e79d2eb31b8df9473a1dcee7f284f7eb352844c0c8f5ed9049
 DIST kwin-5.27.4.1.tar.xz 7621340 BLAKE2B 53f8001542f03be032fcf09d214e5e1d8be56bfcb506c5440aba7ea2b37515770b4c865e10d11a76722ee0fe2a8376c7a07311ff44d5adacca0c5969425f5cc3 SHA512 b686fce07d48b52f987e459ff42dd29da3cbd80beea1f4f1a7cb52f49a6cce9ad167e549ac876697bc820d158fd7fdbaa39fb1261b3573cb374e058ea09e1bbf
 DIST kwin-5.27.5.tar.xz 7622688 BLAKE2B 267cd1515f2667a4b96f0ffccbced0885c602d4a5227127ba5c9a23ccd9483d5f613fbc40d39e58ca16c42103f0caf09d39b4e5387d2673bd22393519e142e8f SHA512 777bf193ad8e4440ee9866f6b725e191460c5ff4b33e3e517184568fda3aee4936be5274daa33996ae654465b477b108fee83f91e33f0db8f622de7629340de8
 EBUILD kwin-5.27.4.1-r1.ebuild 4402 BLAKE2B 4479c92ad0a612de319ea40c1fec88df3e1a74cbb1aaad844d8db00452c2d76037ca8ad13d41b357bec55dc7d045d55ea72e7657d993843f5e494142ffb01df9 SHA512 584f24c31a2c0fcf82f40eb1281d79471755927fe225dc6674a9600867ea28fb75f6baf8eecebd0362efcf2795a94eeb4aa386f85f9ad27f9caded09a47d3f5a
-EBUILD kwin-5.27.4.1.ebuild 4236 BLAKE2B c3583470daf0dfb1fe49036389cd6c974fd8014b1daf3691f2edf7f90a2ebfbe205bb78a32506028df1fb314e1ec9047014e1796a73afe5ea056447b45762b3e SHA512 a2538432fa347726a8348a000cdf70c2ce88505468cf02e1ba132c15a4924153edc7843a576efb08776f39ce5170c313b1a97e63117bf1ef1ffb8fd414865b22
-EBUILD kwin-5.27.5.ebuild 4239 BLAKE2B 9d1c87a9d24b8a344fe299c4d60c4d0bbb1d2f4996fdfc9d92966b9fb38561377907f5a48016b84ae7c35134ccddb1902563c0237fade23f816bdb65fb915f28 SHA512 836a9a772c26a92800334af64a53c3e8185eb4c04b75d78312278f3078f8212248a5a0cb5b3fe91f1e9c23dc0af63c1fa95048220a7ff83f5a5e8d7943599248
+EBUILD kwin-5.27.5-r1.ebuild 4302 BLAKE2B e2348bc35229b66a8e62b1279266b85f8465599a9ac94960c520ae7a8135f695480d83d2961b0294b0515ae28d14bbd04dc846606f328387cd00eeca3ab95698 SHA512 b1b0735492d9e73565367852da3ed733ea0ea3dfe80af2089ae300ac8831683bc5bfb2b9da676feeec720e56bbc8afadf5a8a4f98a203f73991079981045cee0
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.27.5-fix-xcbutils-nativeFloor.patch b/kde-plasma/kwin/files/kwin-5.27.5-fix-xcbutils-nativeFloor.patch
new file mode 100644
index 000000000000..97fed89af956
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.27.5-fix-xcbutils-nativeFloor.patch
@@ -0,0 +1,32 @@
+From 2237391e979b2423462bb5eaf1fdf4c0876f7476 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Wed, 10 May 2023 12:28:24 +0200
+Subject: [PATCH] xcbutils: fix nativeFloor
+
+The floor was not done in the X-native coordinate space but with double
+scaling
+
+BUG: 459373
+
+
+(cherry picked from commit a48c98f5aba71fab8bc1e1d5dd18668833631920)
+---
+ src/utils/xcbutils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils/xcbutils.cpp b/src/utils/xcbutils.cpp
+index cea0ef7c894..9731f483c0b 100644
+--- a/src/utils/xcbutils.cpp
++++ b/src/utils/xcbutils.cpp
+@@ -646,7 +646,7 @@ QSizeF fromXNative(const QSize &s)
+ 
+ static qreal nativeFloor(qreal value)
+ {
+-    return std::floor(value / kwinApp()->xwaylandScale()) * kwinApp()->xwaylandScale();
++    return std::floor(value * kwinApp()->xwaylandScale()) / kwinApp()->xwaylandScale();
+ }
+ 
+ QRectF nativeFloor(const QRectF &rect)
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.27.4.1.ebuild b/kde-plasma/kwin/kwin-5.27.4.1.ebuild
deleted file mode 100644
index 0d699eaa879d..000000000000
--- a/kde-plasma/kwin/kwin-5.27.4.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.19
-	>=dev-libs/wayland-1.21.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=[X]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libepoxy
-	media-libs/libglvnd
-	>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	>=x11-libs/libdrm-2.4.112
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxcvt-0.1.1
-	>=x11-libs/libxkbcommon-1.5.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	accessibility? ( media-libs/libqaccessibilityclient:5 )
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-	lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
-	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/kwayland-server
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	sys-apps/hwdata
-	x11-base/xwayland
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.9
-	>=dev-libs/wayland-protocols-1.31
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-5.27.5.ebuild b/kde-plasma/kwin/kwin-5.27.5-r1.ebuild
index beb16fbcca7d..1cb246c16ea3 100644
--- a/kde-plasma/kwin/kwin-5.27.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.27.5-r1.ebuild
@@ -103,6 +103,8 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
+PATCHES=( "${FILESDIR}/${P}-fix-xcbutils-nativeFloor.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 237fc353ee5b..0bfab0283055 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,9 +1,6 @@
-AUX libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch 726 BLAKE2B bb44e67305f109d3dbe2c74286b3dcba805a781756c33cf8c6130891c2f3ad1e2aeedaac2dfe4833823c68fee64c96c6516497ae11ebcad9dc8a9af3debf4a39 SHA512 1742d9eac14b6713565e70557499149c8f1b22de7d85488fd23d7a3a25109ce1b0663875e4a0823fcc1364304e88d61e8cb9545f5a9db3b94ff311cdd79e0e2f
-AUX libkscreen-5.27.4-clear-edid.patch 1199 BLAKE2B 5323d5314ebd8b37368564a4b936981dc3597bc1a3e85ccee619ae9f92c109b48820225f8e03a0f6aa54fb7074629affb9913edfd502b7daf50afc1c85b47084 SHA512 84c4492731d85e0c642f3ab3c42dc6edb632c9db9214ac480afd1169c28379f243a2aee8fc9603ffeda5fcd8911d33683c3db54b8f115160372878cd3dcb8f47
 DIST libkscreen-5.27.4-patchset-1.tar.xz 2064 BLAKE2B b3a5bac74445c176239f86400a9a25ca7c301f0318196dccfdb34856e2ea8550fc9f732dc3b496274bb7a269fc0c0e70c92db60a576973f4efa64b577bd078d8 SHA512 6b7a13fe54aeeef5fef319cff186a4fdab786920c2e148d23cdbcacf48f96105d2cdab68252a6dc4f0b3770d1564796772acfca4f74886520cd847bb6727dcee
 DIST libkscreen-5.27.4.tar.xz 114760 BLAKE2B f59ec5e2e8266dbea3a9b13f9ebe80cc79231e204124e13a71f11b5e164c468de653ec241bc114e4a964dee3ce4f6cdcb9edce6538502c83370e324b64d3ea1e SHA512 2696e462ba6619842eebe08a0c3a72525241795462dccb4e693a18336a4fd2e4f6209fd73e3317392556a83b047191673e6d639cb2d777e7ee29e186ead1ee16
 DIST libkscreen-5.27.5.tar.xz 115492 BLAKE2B 68119aacd0c64435afa7a68895e78d54f350d0433b55ac92ca26ddabdd83676534748d2c277abafdf15bd4cbecb064a7d5611094994632232017c35912704767 SHA512 b70a842790c1aa5aefe52d7481cd2956092b510772b931c08c8e3ee6bbc82fd92b59d8e13fa1cba962a76ba164b7e584ea1765a970e6c9853c867876004c79b1
-EBUILD libkscreen-5.27.4-r2.ebuild 1004 BLAKE2B 2ebfc7b565cfce8cd2e4b7cbb8ebb61a13726141a38fef013a7996c9478c99d4302bd46dfa81b27e60937df5a7d1beeb6886698cd6e0d03f8b7f667eab599faa SHA512 7906261da3700d142793aeef3ff874f8644cc06697474846520d0b50214eec2df3db3488c53095a74c397f97e3802a6f9b6b5a5988dbd114d47e7d8c0a7e01cf
 EBUILD libkscreen-5.27.4-r3.ebuild 1024 BLAKE2B 9320d0ce8c3efd5029c1b6b05db3fa713deff398e6e357f0c6dcc174b3d725f9acf2578a37a68742d64f95121cd8087666153247e2033802dcc47f71a0784404 SHA512 06d996e4a88d3d92c6a83aa619b6d8443cb85b1e6bd13b3eca412cb000ff637bafc7ab2ec9b2dbbe176955ba9fbf7f0adc0afd831c32a47f3e577d6b582546c3
 EBUILD libkscreen-5.27.5.ebuild 883 BLAKE2B 9c827405b430f15434a975686eefa0ea4f9f1f416952f265eade39ea6487fd59e57fb775603cdf16901e35b61482cc79fb3eba26f278601518a475fc44a45b4e SHA512 3c67708fda27df9f6e46570640352de467d9edb13ee7e8accc3309d72ea3dcde2bfc76d47be84065f19c43c6b125b406df2794417389cecc93535d53f4e67192
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch b/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch
deleted file mode 100644
index 35f0c088d7b3..000000000000
--- a/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 771d68f6dd9d5ecd0a867280aae02fec1fae3fbe Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 2 Mar 2023 11:55:27 +0000
-Subject: [PATCH] Cleanup dpms object in destructor
-
-(cherry picked from commit 00d8e90f821123f04fcb7ea39724a1f221a76f37)
----
- src/libdpms/waylanddpmshelper.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/libdpms/waylanddpmshelper.cpp b/src/libdpms/waylanddpmshelper.cpp
-index 454d5272..e671b1fe 100644
---- a/src/libdpms/waylanddpmshelper.cpp
-+++ b/src/libdpms/waylanddpmshelper.cpp
-@@ -26,6 +26,11 @@ public:
-     {
-     }
- 
-+    ~Dpms()
-+    {
-+        release();
-+    }
-+
-     bool isSupported() const
-     {
-         return m_supported;
--- 
-GitLab
-
diff --git a/kde-plasma/libkscreen/files/libkscreen-5.27.4-clear-edid.patch b/kde-plasma/libkscreen/files/libkscreen-5.27.4-clear-edid.patch
deleted file mode 100644
index 11e20b9a2f09..000000000000
--- a/kde-plasma/libkscreen/files/libkscreen-5.27.4-clear-edid.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 282cb301f5961d6519bb5a295155f25f96421c85 Mon Sep 17 00:00:00 2001
-From: Kai Li <likai@kylinos.cn>
-Date: Wed, 5 Apr 2023 10:51:31 +0800
-Subject: [PATCH] Some GPUs will report a virtual edid even there is no monitor
- connected to the VGA/HDMI port, when a monitor is plugged in, the edid will
- be updated. The old pattern is not working for some GPUs, because the edid is
- already in the cache with wrong data.
-
-So we clear edid when output changed, to make libkscreen to get the latest
-edid and improve hardware compatibility.
-
-Signed-off-by: likai <likai@kylinos.cn>
-
-
-(cherry picked from commit f34ec78318aca50511ae062cd218ef20627132a6)
----
- backends/xrandr/xrandroutput.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/backends/xrandr/xrandroutput.cpp b/backends/xrandr/xrandroutput.cpp
-index 2fce87a5..5a43b6f8 100644
---- a/backends/xrandr/xrandroutput.cpp
-+++ b/backends/xrandr/xrandroutput.cpp
-@@ -177,6 +177,7 @@ void XRandROutput::update(xcb_randr_crtc_t crtc, xcb_randr_mode_t mode, xcb_rand
-         }
- 
-         m_hotplugModeUpdate = XRandR::hasProperty(m_id, "hotplug_mode_update");
-+        m_edid.clear();
-     }
- 
-     // A monitor has been enabled or disabled
--- 
-GitLab
-
diff --git a/kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild b/kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild
deleted file mode 100644
index 4bf9130cc194..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Plasma screen management library"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/8"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-# requires running session
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.10.0
-"
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-clear-edid.patch"
-	"${FILESDIR}/${P}-cleanup-dpms-obj-in-destructor.patch" # KDE-bug 466181
-)
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 34cf13873a38..8e48562bebe4 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,9 +1,7 @@
-DIST plasma-desktop-5.27.4-patchset-1.tar.xz 3344 BLAKE2B 4e8daaa10a1f88fcfbf72346b275d3cf6656460dc05f3c61dae4cdc5b9c9071728cf9cf82a13f69d4b8cb6ca79844c1ca37842540a1acfe2fa799553bd0b6773 SHA512 a75e15053134968d805642daeadcf6b3aa321736470d1a04f19f7dc76b513423d97929b36363632bc8eab4167eead2ae58df727bbb69587ef90fcfc0aa94669e
 DIST plasma-desktop-5.27.4-patchset-2.tar.xz 9180 BLAKE2B 1ef7f0151d0b62e496aa06c8c63f970bff2133797a901dd11f916484a2b58d948f5433c4c979a1993f7997f7f5efbd4b197d1bd9c520836121d8ccab5dda5dd7 SHA512 40883f770c9c49d883b10708d3b6fbe00aa50eea8a8819e5882eb3661cc59fc67351c9690d1d569592d2e05a984847e6981eb98d6d047edc62fb50cc562e83d0
 DIST plasma-desktop-5.27.4.tar.xz 14335168 BLAKE2B b45aaa6cc04d3d519e7ccad0cae674f60c6f4c81105deb0a575db7f6c1eeaf19e9ce8e441c4144ac670c722a9413b68e9eb2c111338844e0bed0839e69da69ce SHA512 a9e8dc3244631af50429d05c3ec861396e2b5b58738ebee7dfcc9c912f43ca9865ed8343f585fd665df41a05c401996a97161da10e852970dfc2741e01614162
 DIST plasma-desktop-5.27.5.tar.xz 14361248 BLAKE2B cf8efedc79c9ca24c7f267c02fa51af2680ef130eba702855e6a1a75537b55b266206bd1c0b5ca4c99779ff5d9a567c5da74d3c58f5320c39c9bd322e642f9e9 SHA512 2dee9d068b0a4ffaccffe6175f8c9833451d2235837d3187ee3f5bf62e0024d48ff50884b7708b914e0e383471e83b9ba969c84103d5351e1b8583a04ec703fb
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
-EBUILD plasma-desktop-5.27.4-r1.ebuild 5402 BLAKE2B 887f57ed533fbb35f531b8a929125b3cb7dde301a241b8e2600246fe82f9a8c087481c9ee471fab455ea76d9509442e1a24a740aac34ff5d55897ab808f53b37 SHA512 159fbdb13cae84f848ca6d02808e34544d03dd8859b297e06a4c77d60abf352e6e6dce885acc46db9bbaab42f6c9022d6932ad301708fa3bb85aee1d5a398cde
 EBUILD plasma-desktop-5.27.4-r2.ebuild 5451 BLAKE2B 4f2e5b819a3356ebc5f364bb29fd045646101d3d3d35558e9e9df74a684cbc185c33b0bdeb85ee1504577be24bbfa3807c051797a00ab87f45b33d859500fef9 SHA512 62bd4d2e07ed77440e3bd877028a9f3c50149e51437c5cc764a4626c7916269aa68783f22bd9a67ac2a5397fa5de740358cd41187a7f0d00a40de1c981f0d175
 EBUILD plasma-desktop-5.27.5.ebuild 5276 BLAKE2B a89b14d3f258fe2d2807ef82ebdb6a886255b65fdc47ce255cc28e5f492885434060cc4a1433ace401c80aa23a247129a1c6f4e8091ec168a07a50faa95ab4d1 SHA512 5ffe37184eae53e4b9e5811f082bf810ba40e9f83ba2ec5036220bb00b520686f61b6b6121c1d3a577b0b2bde630c9b627d28d5c1d2feb4cdc5225ce84d1ddf6
 MISC metadata.xml 560 BLAKE2B bf6910f40706c17989a0961c39073bd1bb00575b0bbd12c9a44c5ae8c699b33451dac36512afe8310c4bff5432864d16adb0f5b6b3f933b39705409547b05ee5 SHA512 0f34c3e91789674538cbac7f857ef57db8e1ca9b85b7e5d512b1a6af10fb218bfae01f65ae1825d26bb31103e7b95c0cf68fc3965c40952392afafcbf5877a25
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild
deleted file mode 100644
index 024190e91d3d..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-2"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="ibus +kaccounts scim screencast +semantic-desktop"
-
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?]
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/wayland-protocols-1.25
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kdeplasma-addons-5.25.50
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	media-fonts/noto-emoji
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( net-libs/signon-oauth2 )
-	screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 )
-"
-BDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # downstream patch
-	"${WORKDIR}/${P}-patchset-1" # KDE-bugs 452187, 467709, 468313
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package ibus GLIB2)
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" app-accessibility/orca
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 8c9208aaec52..871d6e74bef8 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -2,6 +2,5 @@ DIST powerdevil-5.27.4.1-patchset-1.tar.xz 11772 BLAKE2B 7b288580ba04a5d3bacee76
 DIST powerdevil-5.27.4.1.tar.xz 785704 BLAKE2B bdd39bd29c480e1116c786de0bbd00d979e35afe3bef943ba921affe70d95194619eeed430ce77655abb60569bebe36df72c84a76b4f11ea9f9b5b0fae51beca SHA512 8e4cbfb2cad141c12d77b17d23f056a6d60bca50bfc8c52d6ed65857d638ea52db1d182b399e56a5b46830ef8fac55aa65e152b93d75a728f031eb72104375d3
 DIST powerdevil-5.27.5.tar.xz 788188 BLAKE2B b6b15e93d5d970c8ff16b58a0c3900c0e5a46a372207f7927dcf0efe5705183eb624a21bd96a1ecbd2f7ecdd57fc00fd369f7bfc79866ba481752ab8b643ca5e SHA512 3ac9d19dde9c430d17104a6abd9d410e6ea37a7a18a23e753624da2a119bc71714e948c3626d362f84bd8e89b1acd21f457b9510bc916cb85d651f587d26aa27
 EBUILD powerdevil-5.27.4.1-r1.ebuild 2150 BLAKE2B c37fe02500a71970317a4560cbcc0b994e2263996fca7beb240e9e199747858ec8f221756421400af09f35d6d1b3723bcacb08a49005477d242f7bb83d8264b2 SHA512 e40cec7fb72841f9921a4a1ec8abb12de28592d0f93e8b34afcf5116a460e23045ba359120e0763328479d388ac34eabc7886b632fc9e89aa7d551246ff74a46
-EBUILD powerdevil-5.27.4.1.ebuild 2015 BLAKE2B 27c73310e34d2353b856b7cbcd5bbce202e309a0a996a59ea75afc86c21449f3c6a4b6ce5717bd4f57405eb674a0dedba45d2695c892995af234f622d7ba0904 SHA512 10e995b94263240bd7b97237f4cbec885120f555ee77b02b26495823349d9184f7a0811b72f34e8f1ca44a12c6f0310068f95697f7117bddb9a22f4d42a78d61
 EBUILD powerdevil-5.27.5.ebuild 2018 BLAKE2B 668753e82b9d39b7667559a9e1417b26911a7b6c4a05503311aa82dea6050a21e353248017170e2a296654d7d95419fbe29de952d99a9f94437571963c5343f9 SHA512 630a6ea75747ab7921d48a732b29d1c1c74fe7dc3b701faa2f0b9beb6e0e02719f3722d25ae67b6f3a18a1cd3c58088b8cdf336912b1ea627b5e37feae1eeb7b
 MISC metadata.xml 597 BLAKE2B 4e436cb067ff3c936a6e497de75b03947f4ccd1103f45237a8a7fe738f67c5a718bf17bbb7aa0a9eff068ce18ce4f0b73bb8f737badc63971e3edabcdd09bff8 SHA512 f4652971683109791e796a57de30efaf603566ad5f9e3e1d16ca54b1212b4cd3ebe1d9a934959fcb51d2722aafe3d57af708f45722534f225ea4b2889a492dc6
diff --git a/kde-plasma/powerdevil/powerdevil-5.27.4.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.27.4.1.ebuild
deleted file mode 100644
index 14067d1bfc2a..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.27.4.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="brightness-control caps +wireless"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil:= )
-	caps? ( sys-libs/libcap )
-	wireless? (
-		>=kde-frameworks/bluez-qt-${KFMIN}:5
-		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=sys-power/upower-0.9.23
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 5afd03ebddce..65496f04f8f7 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index de6db5cec9d0..c50dc3a1d898 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,9 +5,9 @@ AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e
 DIST postfix-3.7.4.tar.gz 4833834 BLAKE2B edb716ef4576d339189f11b535a62f3c6f8f28613723d916f13cdd2d37228aa8768dacdb9d8616c83f0ded3a3c801c45747375ea6cfa505b668a7163c4637128 SHA512 972738291b960c90fe83861d55b1288900416167adb353418956e69bcc709a6daf84fbfde11d573eebba030654d27abc8d55f90661a2b880ccfb3a334064c236
 DIST postfix-3.7.5.tar.gz 4834332 BLAKE2B 60be442c165e722dca3f1b5ece30adb85493560c583f6bb485e548f35bffe9e5ec27193eb68222f95a3076007af046622c98ee954167b53d2e306969ccf07647 SHA512 097c8f74386d746e849176c1344fe51c957b972cc1b15ebbb27cee4c825deae7201081cb1212e3fb12f16a6795c86381492d71123a8bf287fc8b58c6979fbf8f
 DIST postfix-3.8.0.tar.gz 4851893 BLAKE2B 3ef0c0c83eed3263c890143ae962674dfbfa01f589f1b503a01d57497e4732171aa58468357276f29a9454c577573e8442095c2db25005324754dbd305875297 SHA512 a66956b0cc5eb6ad5ee926348b584ba5640586784aec794a84c40472faecb6313d46537c9f5696edfd8fda070591925a0cfaedc014e15bb3496195e5fb9ee4bd
-DIST postfix-3.9-20230507.tar.gz 4860598 BLAKE2B 44bcaae2f870e2d41f34ab58869dce2a94bb2f5a750092ef399e657bc53ba144caa52f18882691bfbc1e1a4378950a2720cba137ba3555127a4dc28bb9f076d8 SHA512 0eb4dccad6b7a4e9c6014439e9f1107254e402d2c96bc7c0cefae6951b95949266662fa5eedf5d8ca59929290c1441e0b9a12473715d01acc6eb1237ceac01e2
+DIST postfix-3.9-20230508.tar.gz 4861450 BLAKE2B a7f6787f73bf8bcc6604b88cd75f4a93cd334cd622c89aa8c8cbb45f8c25b3fb58c9cd9893fd99580531bb65f9a05bcf7dbcee702c6f0b3d687b1ce65b9704b6 SHA512 e3945471d5ee625ffad08ede66444efa721f00fe428c4c82a47afcb3a84f70bcc05159d1dc1371464803f0879862f16339aa1fe6890e0dbeda9e03fb97d6c04d
 EBUILD postfix-3.7.4.ebuild 8023 BLAKE2B f1ed37c430536e96591beceb346144d28bf5eee3a1f93d7d41d4db3f3ed36b9fea7847cbf0c3b278a8ee99ec93ad91797a8fccfad5104717deec5bf4ef18396e SHA512 0676646a5d0bc5187779b707593b8c6ac438c2f13524c4105bc4955feb57ed40aa86df78b740bec4cfa651ce22e44075d8fe6bbecbe44ad591842634856403cf
 EBUILD postfix-3.7.5.ebuild 8029 BLAKE2B acc668752b4e0f4df4cb5fc03a2fb1ed723018a2a6ebd016d7f3172203151f83d9abc23f9c50924788cfc57ccce9ef39b7968d6b7c4ee888f2120afa25182779 SHA512 0cefa25cffd806d11983d9324b10668ca53ff18a5a9192bcefb4b92ae00fc9acb8cbabd75b6fb38089b62399d50d2076dd1f2b2c53ce5577ad04e9054d97219e
 EBUILD postfix-3.8.0.ebuild 8196 BLAKE2B cd5dd1fead1f37a73ca3b2ffd232db629b617470d6543cd3d6b0fd34ce6b82a2bcfd7cac91a81719fcbb5097cd478548227cc01aa16aa71249ea7c923ee61c64 SHA512 38285f7690cc46d9adb91dfa0d49e58987b45f673b85d09e5acc65658c5cb865129e8c279a95d5eeb4276bcea7ea72e6c293c071cc05639710686681591a2b15
-EBUILD postfix-3.9_pre20230507.ebuild 8199 BLAKE2B 4415e28f87a7a5a1df454e45f4d296845f7cc1947a7df900cf25d4fa1c4c73158e831d78e5d0d427ab5d09f96536803a56d2dcb2a71f142d288a631a4219e5ed SHA512 50a2464559afd3582603876caeb44db9a733344d7ff9524b8b68015b0ee5412526703db6b4b62a955f60e4e7bd4545a811ce0552d69e9346c0196e05fc1be86a
+EBUILD postfix-3.9_pre20230508.ebuild 8199 BLAKE2B 4415e28f87a7a5a1df454e45f4d296845f7cc1947a7df900cf25d4fa1c4c73158e831d78e5d0d427ab5d09f96536803a56d2dcb2a71f142d288a631a4219e5ed SHA512 50a2464559afd3582603876caeb44db9a733344d7ff9524b8b68015b0ee5412526703db6b4b62a955f60e4e7bd4545a811ce0552d69e9346c0196e05fc1be86a
 MISC metadata.xml 853 BLAKE2B 96b2b5c531692f1eba1bc4c543ba4df77754d11802e9754ac102907d00dc1284fe449384d3c8c4e53c343e3424f79cf654b7a0c6a112d0ec973f8da585045ff7 SHA512 15c4521a70f25d8d5261c1c981d7ab41cdf542a1630c6857037e0b3e3ab0a51f6dbb4edee9ee9857d0b7a130c5da6f475e1be6a02728edecb23defa004be48eb
diff --git a/mail-mta/postfix/postfix-3.9_pre20230507.ebuild b/mail-mta/postfix/postfix-3.9_pre20230508.ebuild
index 809c17c943f1..809c17c943f1 100644
--- a/mail-mta/postfix/postfix-3.9_pre20230507.ebuild
+++ b/mail-mta/postfix/postfix-3.9_pre20230508.ebuild
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2c489fbf0cc2..b49b64245f48 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index ce843c77cbb3..16af8d7afa3d 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -3,7 +3,9 @@ AUX shotwell-gphoto2-Add-missing-cheader-attributes-of-delegate-s.patch 1835 BLA
 DIST shotwell-0.30.17.tar.xz 6533460 BLAKE2B 58ec94f21bf465dcc19760f40235db7d2ad7d00c214802cd3ad6cfd67cb1088a5999f183c8ae36398e492a1b387e6ea717a9b8d0f31f4ef369e67c10150ae57a SHA512 f680b6f58538fb7b584594d00da7fe997dbc766583a5b5a85943b3df905dbc7192d3e7b5c7b47b6bd1221280995aaba878ea1afff9b042995bf30fbcbce5f7ea
 DIST shotwell-0.31.7.tar.xz 6610144 BLAKE2B b8f69237abb987508f565d5bfd59123fabf2fa1023783362b189da2690a2b72d5908e13c1371097b48db9eddf1b1361b0b92ca1b5e86287dd35b484bbf119593 SHA512 6653cbc2b2147f65d615f6ea879d012e6a5c5b55c9dfcdb8ff9fecf909ee6f5db96ac8124608d8223e0a95ab26508064b9376a293a2bd4fe05a821988400f42e
 DIST shotwell-0.32.0.tar.xz 35326752 BLAKE2B a201e5cc910872730a902d43a8d8b16f882966100bcc061d8c88fcfd43b1d0db54b98691b2d4a40568ddcb9d9ec28ca31c7575db7ae5ee4db304a27d10999c3a SHA512 0ff24d70cc15b68d5c51bc3ff42a10873656e5e16bfa273bb928a68ae569898136a33df92468b682c2ebc662f0bfa53ac7748b4b140d03b9608b68447b738051
+DIST shotwell-0.32.1.tar.xz 35324252 BLAKE2B a8fd4195dcf495db8413586805f0d75d37759b62847c55dc8e81ed447c7d3c75e1f0f6b95f3982ee0712403b850d735962e4cd0f48ec41426e98c62555fdeb60 SHA512 1d487a0ea7ef0fb1b26d7c53b50e64b7d899bb9082744620dd421195b3ea90765633aac940695371d82fe5054f979e43cb587e726c4fa90712403ea9f60afcfe
 EBUILD shotwell-0.30.17-r1.ebuild 2003 BLAKE2B 1b00a0247eccac96d54b539b268544453d62341afb6bd84f0c707480e2e39b0dfaf686ee011fb0b91fbaf77c190ab72a8cbb6444080943a67237f01b16656b4d SHA512 844c5db5695d761ccb9bb08927d519898f777859dd2d967e37456cb1baceab564f7cbfa3609f1f518ce440ac28b55bf4619af1fce75384acd64cf39e59bddadc
 EBUILD shotwell-0.31.7.ebuild 2030 BLAKE2B 1a9935aac9de68539be322b2bd3302653125e854293c8413f2b15fe9525ebdac92727637ebc2d8e5cb750c52b4e732d954538256a3d66ee23c4b041d5998ad36 SHA512 b8d6aa7433be49d3bec26ade9c938235bcab41b3a4b06209dc84d8f8d5a3ea2b0bf70067a1ef7b657645fb043a99cfa410ccf72b9fc3e30516b983ae05aed391
 EBUILD shotwell-0.32.0.ebuild 1934 BLAKE2B e8549499b32a85b8866c1c3d7bfb13d9f349c13af02615eb00c1d951c6485a0e26259d95e753ce0b3bddd0b504781fb9dd80bf078cc2d36e5ffc91e1003cb28c SHA512 c1f55da12f1485f8e4fe4d5e76c30621a890b7c261444e0e2b0b034abed698f88c6c061da8e96c0d5096e5f3b4c2b4d3dfb8ffca2ca8c8e8705c82aa81c5100b
+EBUILD shotwell-0.32.1.ebuild 1873 BLAKE2B f5371f116d2953529d597b21a3733f11dcfb089cc60638797645f8e7bbddd936e2c43870f6d3edc6b4dd9504e18f43ee2434de90129e12ae31bd43064a667717 SHA512 4cd5abd81304c15abfda3fde2c23f19590eeabee6d6df4acb7029acd86333f5259800aea7877d5e4737b61723882da34ac5d905a301d672763a49430fe98c7df
 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490
diff --git a/media-gfx/shotwell/shotwell-0.32.1.ebuild b/media-gfx/shotwell/shotwell-0.32.1.ebuild
new file mode 100644
index 000000000000..5be584be1de2
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.32.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+IUSE="opencv udev"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8=
+	>=net-libs/webkit-gtk-2.26:4.1
+	net-libs/libsoup:3.0
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	>=media-libs/gstreamer-1.20:1.0
+	>=media-libs/gst-plugins-base-1.20:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=dev-libs/libgudev-145:= )
+	>=media-libs/gexiv2-0.12.3
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16
+	app-crypt/libsecret
+	>=dev-libs/libportal-0.5:=[gtk]
+	media-libs/libwebp:=
+
+	>=app-crypt/gcr-3:0=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-4.0.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-libs/glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:3.0[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr:0[vala]
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity_support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		#trace
+		#measure
+		-Ddupe_detection=true
+		$(meson_use udev)
+		-Dinstall_apport_hook=false
+		$(meson_use opencv face_detection)
+		-Dfatal_warnings=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 359f2693a13a..22c6a27d07d4 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d665baca35fc..2cceca53e02c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 10:09:46 +0000
+Wed, 10 May 2023 16:09:45 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f4ae84a7757d..e3c72a8ebe31 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-10T10:09:49Z
+TIMESTAMP 2023-05-10T16:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbbW1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbwcxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCUkQ/6A9vh4p2L6JpX1mKTkhTE9JIVOAQn9tmdFXhTZcjtIq8J4ehtT4TWJPVT
-SVSPeqORPdimC03hLHce0ekqqQ83xH0NwIQrRo6153X8j/bq0YfLG0K1RL4ny4/u
-tlaAAYGqXvf6q0GNd0Pa3cH9h+ggrwxd30NzGK5MYz1dE1IMTsbYwb/RMGaxwFIT
-hIJv2uVGQ/E+weg1i/CLLfXnCoolp/rtJPnVpxybIbsRNe1l6eAiPZnS37Wl7G6z
-DtqYzDc24+gQgXDSMmNdhUaun1ZK1QqtmQmdZtXF9ucQLPpiMmUqzNG97fIC/Z7D
-0bPvsdE6x8k9/Mzm49yAdqsxalm9AiS2zH9w0phU+F7OK+MG9mgk7/5kejrfo8f6
-wblZVD61JkFqwfdfJshGmRzdlco2kSniC886rStt4jghyMqkKzdtMG0PmN5NwNOH
-FRMUbHOAA75mq/ZyV6BkZgK1oO7+9UP9/mZF6KpahS5+Z/U5vHaVa+LxtJoApRyw
-RYSGqB/PN3HObIRYSoajafXa5RT/W5gv/d9T+gRsDbCwffXHJU1exMRqPnVh2yze
-s1kqVOHtPhL1kQvAn/AY1DimiHv95GedV2KuTZUTc3PjQIc4lK0NsvUWj0rV/Ix0
-osN8+K3b6l++I0VJZwus474X/00UuqlF8A3fdlMCDrCdOmz80fA=
-=v/2x
+klDRqA/9HU2/xUopZg++ru+oEMJnAvNrD+CaxN3HtTLpgQNs/ZEa95ltodrixqch
+nxxT+RvEui0EJ06Pj4he1rXakMI0mbkhOpqx4ztUitALmVJCJtCmest6XypiCZOH
+iL70pRA5Kt32qxTx/XfB3DNSo2bsttaDE3YKsir4JPEkH/9MCOfKcXuzDO2VbBvz
+7R3vgfipix5ffroAyASfzoMRIIRJeNRRoEqwuBhhLPXOH0iCydbsIirJk5a0S621
+Lqxo/V3sP5XcotQxO6StLzd6tCPRRONToRLwI4pMpfYu4uDFR9Q3+sLW/P6u3kNj
+5n/vRc/kL2q3EpJp1rKKEBfYrRJFUFnWeHdittpe/yEtiBf+ha7/K9btxB5zBeCn
+tQk01ILn6JsfEu69c4im8D2ZJz3RgmylkCw0Ir/MXhcbK6EcGY4jNEU99MBBo6/v
+WwaUfWmJ4FJtUVl7G2K2jO4HUDyRbz+S3ipRm+l66ekI+GQ0029XDrEEn+6Zpm6N
+bLibmhOz7ilAD7FhU3QJQlSn2qvvlGGMJA1scBlCbi6HXJ5rwA1jcQitMoXDOkN6
+IAAJ2sNbFbAxys5onbpb50nlqCzi0VWPXZ5HlYgYITUYOIyZDI08MiMsgQzt/s2+
+RGHpZqtnwOo0C24jvdPyEcXBuqnjtaHLYKabSQDKCHGH5KofC10=
+=Jaqw
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d665baca35fc..2cceca53e02c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 10:09:46 +0000
+Wed, 10 May 2023 16:09:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a5ea90daf5da..bb3a5e248df0 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index e70d996c5873..b2bcf942f9dd 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/nano-6.4 b/metadata/md5-cache/app-editors/nano-6.4
deleted file mode 100644
index 8c8388c9b2be..000000000000
--- a/metadata/md5-cache/app-editors/nano-6.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install postrm prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=8
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-INHERIT=flag-o-matic
-IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v6/nano-6.4.tar.xz
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c886be7d62ae7e6532c93e80aec2b551
diff --git a/metadata/md5-cache/app-editors/nano-7.1 b/metadata/md5-cache/app-editors/nano-7.1
deleted file mode 100644
index ed30fcf9b859..000000000000
--- a/metadata/md5-cache/app-editors/nano-7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install postrm prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=8
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-INHERIT=flag-o-matic
-IUSE=debug justify magic minimal ncurses nls +spell static unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v7/nano-7.1.tar.xz
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=580b5e8a7276460557174293d1182d4a
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7d690b10916f..ef7a22ba3dbc 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.6-r5 b/metadata/md5-cache/dev-db/opendbx-1.4.6-r5
deleted file mode 100644
index 8d769b19524c..000000000000
--- a/metadata/md5-cache/dev-db/opendbx-1.4.6-r5
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird ) man? ( app-doc/doxygen app-text/docbook2X ) 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
-DESCRIPTION=OpenDBX - A database abstraction layer
-EAPI=6
-HOMEPAGE=https://www.linuxnetworks.de/doc/index.php/OpenDBX
-INHERIT=autotools flag-o-matic
-IUSE=firebird +man +mysql oracle postgres sqlite
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird )
-REQUIRED_USE=|| ( firebird mysql oracle postgres sqlite )
-RESTRICT=firebird? ( bindist )
-SLOT=0
-SRC_URI=https://www.linuxnetworks.de/opendbx/download/opendbx-1.4.6.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	d1408425c7c4a7669b9b17735404b693	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bb78f07c0e8f14d280aa317dd415c2f3
diff --git a/metadata/md5-cache/dev-db/opendbx-1.4.6-r6 b/metadata/md5-cache/dev-db/opendbx-1.4.6-r6
new file mode 100644
index 000000000000..96d1fa01a2ec
--- /dev/null
+++ b/metadata/md5-cache/dev-db/opendbx-1.4.6-r6
@@ -0,0 +1,17 @@
+BDEPEND=man? ( app-doc/doxygen app-text/docbook2X ) 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
+DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird )
+DESCRIPTION=OpenDBX - A database abstraction layer
+EAPI=8
+HOMEPAGE=https://www.linuxnetworks.de/doc/index.php/OpenDBX
+INHERIT=autotools flag-o-matic
+IUSE=firebird +man +mysql oracle postgres sqlite test
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=LGPL-2.1
+RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) oracle? ( dev-db/oracle-instantclient[sdk] ) firebird? ( dev-db/firebird )
+REQUIRED_USE=|| ( firebird mysql oracle postgres sqlite )
+RESTRICT=firebird? ( bindist ) !test? ( test ) test
+SLOT=0
+SRC_URI=https://www.linuxnetworks.de/opendbx/download/opendbx-1.4.6.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4c3df5c3ef15119a916fedd41c820b8e
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 45cf73e253e9..826f73143f7c 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-102.11.0 b/metadata/md5-cache/dev-lang/spidermonkey-102.11.0
new file mode 100644
index 000000000000..a7e6ae601227
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/spidermonkey-102.11.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[ssl,xml(+)] >=dev-lang/python-3.10.9-r1:3.10[ssl,xml(+)] ) || ( ( sys-devel/llvm:15 clang? ( sys-devel/clang:15 virtual/rust:0/llvm-15 lto? ( sys-devel/lld:15 ) ) ) ( sys-devel/llvm:14 clang? ( sys-devel/clang:14 virtual/rust:0/llvm-14 lto? ( sys-devel/lld:14 ) ) ) ) !clang? ( virtual/rust ) virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11[ssl,xml(+)] dev-python/six[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[ssl,xml(+)] dev-python/six[python_targets_python3_10(-)] ) ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.13-r7:2.1 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib !!sys-devel/llvm:0
+DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
+EAPI=8
+HOMEPAGE=https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html
+INHERIT=autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
+IUSE=clang cpu_flags_arm_neon debug +jit lto test
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=102
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.11.0esr/source/firefox-102.11.0esr.source.tar.xz -> firefox-102.11.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-10j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-10j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-102-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-102-patches-05j.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e3205ef58f1c9b3568ca71daa2d5c0bf
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index df19db3d3247..cce0282729ed 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/libfmt-10.0.0 b/metadata/md5-cache/dev-libs/libfmt-10.0.0
new file mode 100644
index 000000000000..9c4ea778a922
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfmt-10.0.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Small, safe and fast formatting library
+EAPI=8
+HOMEPAGE=https://github.com/fmtlib/fmt
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0/10.0.0
+SRC_URI=https://github.com/fmtlib/fmt/archive/10.0.0.tar.gz -> libfmt-10.0.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=350f2b6fcadd5b8f23ef9016ac8e383b
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
index fe15a3556073..7fef6cc7735e 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9999
+++ b/metadata/md5-cache/dev-libs/libfmt-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=57b9ea977a6219b984bc1f3299bca81b
+_md5_=350f2b6fcadd5b8f23ef9016ac8e383b
diff --git a/metadata/md5-cache/dev-libs/libwacom-2.4.0 b/metadata/md5-cache/dev-libs/libwacom-2.4.0
deleted file mode 100644
index 2f8297e32925..000000000000
--- a/metadata/md5-cache/dev-libs/libwacom-2.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-libevdev[python_targets_python3_11(-)] dev-python/pyudev[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] dev-python/pyudev[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
-EAPI=8
-HOMEPAGE=https://github.com/linuxwacom/libwacom
-INHERIT=meson python-any-r1 udev
-IUSE=doc test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.4.0/libwacom-2.4.0.tar.xz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=6011b7d595de9d2cfef1b3055d2e88b0
diff --git a/metadata/md5-cache/dev-libs/libwacom-2.5.0 b/metadata/md5-cache/dev-libs/libwacom-2.5.0
deleted file mode 100644
index 4f30334fee13..000000000000
--- a/metadata/md5-cache/dev-libs/libwacom-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-libevdev[python_targets_python3_11(-)] dev-python/pyudev[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] dev-python/pyudev[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
-EAPI=8
-HOMEPAGE=https://github.com/linuxwacom/libwacom
-INHERIT=meson python-any-r1 udev
-IUSE=doc test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.5.0/libwacom-2.5.0.tar.xz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=6011b7d595de9d2cfef1b3055d2e88b0
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.11.0 b/metadata/md5-cache/dev-libs/spdlog-1.11.0
index e46a228f26e6..a55db97bb0dc 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.11.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.11.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.11.0.tar.gz -> spdlog-1.11.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=700ff44857eb11314faa8551685214df
+_md5_=2f4fb011f3ee8df31c7f4d5566b65bf8
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2dbb496d46e3..d4e85c9e7066 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/paramiko-3.1.0 b/metadata/md5-cache/dev-python/paramiko-3.1.0-r1
index 7c7145ed5d79..ed587017c5ca 100644
--- a/metadata/md5-cache/dev-python/paramiko-3.1.0
+++ b/metadata/md5-cache/dev-python/paramiko-3.1.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/bcrypt-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/bcrypt-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SSH2 protocol library
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=examples server test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/3.1.0.tar.gz -> paramiko-3.1.0.gh.tar.gz
 _eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ef1902f105f9b1455e23d63bab423cd1
+_md5_=f2004b474d7d84401f676f285c1211ff
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.0 b/metadata/md5-cache/dev-python/urllib3-2.0.0
deleted file mode 100644
index 438fa15b21a9..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=8
-HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
-INHERIT=distutils-r1 pypi
-IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.0.tar.gz
-_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e200dfc875e2cf512e992b6b21106f28
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.1 b/metadata/md5-cache/dev-python/urllib3-2.0.1
deleted file mode 100644
index 0bd4337f2f74..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-2.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=8
-HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
-INHERIT=distutils-r1 pypi
-IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.1.tar.gz
-_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e200dfc875e2cf512e992b6b21106f28
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.2 b/metadata/md5-cache/dev-python/urllib3-2.0.2
deleted file mode 100644
index 3444d3c2cda2..000000000000
--- a/metadata/md5-cache/dev-python/urllib3-2.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=8
-HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
-INHERIT=distutils-r1 pypi
-IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.2.tar.gz
-_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c174aad10004c9e136c2946ad151eb72
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.2-r1 b/metadata/md5-cache/dev-python/urllib3-2.0.2-r1
new file mode 100644
index 000000000000..784174eb1f96
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urllib3-2.0.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
+EAPI=8
+HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
+INHERIT=distutils-r1 pypi
+IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.2.tar.gz
+_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=beb5d6d6d5dd42c0f8d414b2f2b8efb9
diff --git a/metadata/md5-cache/dev-python/xcffib-1.3.0 b/metadata/md5-cache/dev-python/xcffib-1.3.0-r1
index e855892b59b2..d9751b951ae9 100644
--- a/metadata/md5-cache/dev-python/xcffib-1.3.0
+++ b/metadata/md5-cache/dev-python/xcffib-1.3.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) x11-libs/libxcb >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/libxcb
 DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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 )
+RDEPEND=python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) x11-libs/libxcb python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_pypy3 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/x/xcffib/xcffib-1.3.0.tar.gz
 _eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6d695ced4a478d93cdc2fa7838c4eaf5
+_md5_=94d21ae77fdf8f88202beefba23270ff
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 6b3e9afa02bc..ba5c145aad87 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/wf-config-0.7.1-r1 b/metadata/md5-cache/gui-libs/wf-config-0.7.1-r1
index ea700365ba11..e69315014676 100644
--- a/metadata/md5-cache/gui-libs/wf-config-0.7.1-r1
+++ b/metadata/md5-cache/gui-libs/wf-config-0.7.1-r1
@@ -1,14 +1,16 @@
-BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig test? ( dev-cpp/doctest ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install test
 DEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm
 DESCRIPTION=library for managing wayfire configuration files
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-config
 INHERIT=meson
+IUSE=test
 KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wf-config/releases/download/v0.7.1/wf-config-0.7.1.tar.xz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9da8ec74fe09bfc87c6b373f6d5ebb08
+_md5_=3ed78adc930888f37afd2d0a68a4657f
diff --git a/metadata/md5-cache/gui-libs/wf-config-9999 b/metadata/md5-cache/gui-libs/wf-config-9999
index 5e0d6953717c..df0cb85eba85 100644
--- a/metadata/md5-cache/gui-libs/wf-config-9999
+++ b/metadata/md5-cache/gui-libs/wf-config-9999
@@ -1,13 +1,15 @@
-BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig test? ( dev-cpp/doctest ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm
 DESCRIPTION=library for managing wayfire configuration files
 EAPI=7
 HOMEPAGE=https://github.com/WayfireWM/wf-config
 INHERIT=meson git-r3
+IUSE=test
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libevdev dev-libs/libxml2 media-libs/glm
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	git-r3	27e13c09a4c7e4c78ac812f74727e676	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=20869d6eeb6aa0a4486e43992177272d
+_md5_=ac195e62c9b7cf2a4248bad42a39c0ac
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 87a59f0652a8..a7fc025927cc 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.27.4-r2 b/metadata/md5-cache/kde-plasma/kscreen-5.27.4-r2
deleted file mode 100644
index be58d98f35eb..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.27.4-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.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=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsensors-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-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/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.4:5 >=kde-plasma/libkscreen-5.27.4:5 x11-libs/libX11 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma screen management
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kscreen
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtsensors-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kcmutils-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/kdeclarative-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kiconthemes-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/layer-shell-qt-5.27.4:5 >=kde-plasma/libkscreen-5.27.4:5 x11-libs/libX11 >=dev-qt/qtgraphicaleffects-5.15.7:5 >=kde-plasma/kde-cli-tools-5.27.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.4/kscreen-5.27.4.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	76234c40ad6f38d0d48cb04228708c86	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2ccc2ffe7ca3b911d5027dd666b52c20
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.27.4.1 b/metadata/md5-cache/kde-plasma/kwin-5.27.4.1
deleted file mode 100644
index 7173d1d4d6ed..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.27.4.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner >=kde-frameworks/kcmutils-5.102.0:5 >=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=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.21.0 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5=[X] >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-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/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5=[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/breeze-5.27.4:5 >=kde-plasma/kdecoration-5.27.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi >=x11-libs/libdrm-2.4.112 >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-1.5.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) lock? ( >=kde-plasma/kscreenlocker-5.27.4:5 ) plasma? ( >=kde-frameworks/krunner-5.102.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-libs/plasma-wayland-protocols-1.9 >=dev-libs/wayland-protocols-1.31 >=dev-qt/designer-5.15.7:5 >=dev-qt/qtconcurrent-5.15.7:5 x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=accessibility caps gles2-only lock multimedia plasma screencast test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.27.4:5
-RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.21.0 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5=[X] >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-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/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5=[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/breeze-5.27.4:5 >=kde-plasma/kdecoration-5.27.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi >=x11-libs/libdrm-2.4.112 >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-1.5.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) lock? ( >=kde-plasma/kscreenlocker-5.27.4:5 ) plasma? ( >=kde-frameworks/krunner-5.102.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) !kde-plasma/kwayland-server >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtvirtualkeyboard-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.7:5[gstreamer,qml] ) || ( 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/plasma/5.27.4/kwin-5.27.4.1.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	76234c40ad6f38d0d48cb04228708c86	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cacb22c6bd0c9e0a1f6ea81d679bca98
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.27.5 b/metadata/md5-cache/kde-plasma/kwin-5.27.5-r1
index 9a90c28425af..a365dbecd10e 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.27.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.27.5-r1
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.27.5/kwin-5.27.5.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	76234c40ad6f38d0d48cb04228708c86	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3fc5d7a33e1fb18cf7701d6782889af4
+_md5_=649f74f6b6163865865846ce715b1440
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r2 b/metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r2
deleted file mode 100644
index 127a2dd78bad..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.15.7:5 >=dev-qt/qtwaylandscanner-5.15.7:5 dev-util/wayland-scanner >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 ( =dev-qt/qtcore-5.15.9*:5 =dev-qt/qtgui-5.15.9*:5 =dev-qt/qthelp-5.15.9*:5 =dev-qt/qtsql-5.15.9*:5 =dev-qt/qtwidgets-5.15.9*: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=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 x11-libs/libxcb >=dev-libs/plasma-wayland-protocols-1.10.0 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma screen management library
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/8
-SRC_URI=mirror://kde/stable/plasma/5.27.4/libkscreen-5.27.4.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	76234c40ad6f38d0d48cb04228708c86	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3a1726e8f1625d031cd89a4f6d96ca1a
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.4-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.4-r1
deleted file mode 100644
index a53ffc55ac53..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.27.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 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=dev-libs/wayland >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtprintsupport-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcodecs-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/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-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/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-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/kpackage-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 >=kde-plasma/kwin-5.27.4:5 >=kde-plasma/libksysguard-5.27.4:5 >=kde-plasma/libkworkspace-5.27.4:5 >=kde-plasma/plasma-workspace-5.27.4:5[screencast?] >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxkbfile ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.7:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) >=dev-libs/wayland-protocols-1.25 dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=ibus +kaccounts scim screencast +semantic-desktop test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/wayland >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtprintsupport-5.15.7:5 >=dev-qt/qtsql-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=dev-qt/qtxml-5.15.7:5 >=kde-frameworks/attica-5.102.0:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kactivities-stats-5.102.0:5 >=kde-frameworks/karchive-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kbookmarks-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kcodecs-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/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kded-5.102.0:5 >=kde-frameworks/kdelibs4support-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/kguiaddons-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/kitemmodels-5.102.0:5 >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/kjobwidgets-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/kpackage-5.102.0:5 >=kde-frameworks/kparts-5.102.0:5 >=kde-frameworks/krunner-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-frameworks/sonnet-5.102.0:5 >=kde-plasma/kwin-5.27.4:5 >=kde-plasma/libksysguard-5.27.4:5 >=kde-plasma/libkworkspace-5.27.4:5 >=kde-plasma/plasma-workspace-5.27.4:5[screencast?] >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxkbfile ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.7:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.102.0:5 ) !<kde-plasma/kdeplasma-addons-5.25.50 >=dev-qt/qtgraphicaleffects-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtwaylandscanner-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/qqc2-desktop-style-5.102.0:5 >=kde-plasma/kde-cli-tools-5.27.4:5 >=kde-plasma/oxygen-5.27.4:5 media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) screencast? ( >=kde-plasma/kpipewire-5.27.4:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.4/plasma-desktop-5.27.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-5.27.4-patchset-1.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	76234c40ad6f38d0d48cb04228708c86	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=58188ca4c0490c6ebfd4e4260711bda8
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.27.4.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.27.4.1
deleted file mode 100644
index b84aa4e44780..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.27.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=kde-frameworks/kcmutils-5.102.0:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 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=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5[policykit] >=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/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libkscreen-5.27.4:5 >=kde-plasma/libkworkspace-5.27.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5 ) dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=brightness-control caps +wireless debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5[policykit] >=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/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/knotifyconfig-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/solid-5.102.0:5 >=kde-plasma/libkscreen-5.27.4:5 >=kde-plasma/libkworkspace-5.27.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.102.0:5 >=kde-frameworks/networkmanager-qt-5.102.0:5 ) >=kde-plasma/kde-cli-tools-5.27.4:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.4/powerdevil-5.27.4.1.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	76234c40ad6f38d0d48cb04228708c86	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c8daea16e989285a5bc58ff7abce67c9
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 0c5de38b8435..53624fcb6f96 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/postfix-3.9_pre20230507 b/metadata/md5-cache/mail-mta/postfix-3.9_pre20230508
index c8f59773bfd5..8ede7bc5b90d 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.9_pre20230507
+++ b/metadata/md5-cache/mail-mta/postfix-3.9_pre20230508
@@ -11,6 +11,6 @@ LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=|| ( berkdb cdb lmdb ) ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.9-20230507.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.9-20230508.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=309c87e1dbbfaca113e1b39855a03954
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 5db7f2a36aad..079ff4fea12c 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/shotwell-0.32.1 b/metadata/md5-cache/media-gfx/shotwell-0.32.1
new file mode 100644
index 000000000000..a2379a236ad6
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/shotwell-0.32.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/appstream-glib dev-libs/glib dev-util/gdbus-codegen dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig net-libs/libsoup:3.0[vala] media-libs/gexiv2[vala] app-crypt/gcr:0[vala] app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8= >=net-libs/webkit-gtk-2.26:4.1 net-libs/libsoup:3.0 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.12.3 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16 app-crypt/libsecret >=dev-libs/libportal-0.5:=[gtk] media-libs/libwebp:= >=app-crypt/gcr-3:0=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-4.0.0:= )
+DESCRIPTION=Open source photo manager for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson vala xdg
+IUSE=opencv udev
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8= >=net-libs/webkit-gtk-2.26:4.1 net-libs/libsoup:3.0 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.12.3 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16 app-crypt/libsecret >=dev-libs/libportal-0.5:=[gtk] media-libs/libwebp:= >=app-crypt/gcr-3:0=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-4.0.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/shotwell/0.32/shotwell-0.32.1.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8de69c15f7999e469c19ae5955d1ea7b
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index c8b4afa23143..5af9d0ed5ce6 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/discord-0.0.26-r1 b/metadata/md5-cache/net-im/discord-0.0.26-r1
deleted file mode 100644
index d899d849e1b0..000000000000
--- a/metadata/md5-cache/net-im/discord-0.0.26-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup unpack
-DESCRIPTION=All-in-one voice and text chat for gamers
-EAPI=8
-HOMEPAGE=https://discordapp.com
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=chromium-2 desktop linux-info optfeature unpacker xdg
-IUSE=+seccomp +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64
-LICENSE=all-rights-reserved
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango
-RESTRICT=bindist mirror strip test
-SLOT=0
-SRC_URI=https://dl.discordapp.net/apps/linux/0.0.26/discord-0.0.26.tar.gz
-_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f9c0cd1502ef504605defba195f4d0cf
diff --git a/metadata/md5-cache/net-im/discord-0.0.27 b/metadata/md5-cache/net-im/discord-0.0.27
index f933a2f68670..3a06f10f5dde 100644
--- a/metadata/md5-cache/net-im/discord-0.0.27
+++ b/metadata/md5-cache/net-im/discord-0.0.27
@@ -5,11 +5,11 @@ HOMEPAGE=https://discordapp.com
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info optfeature unpacker xdg
 IUSE=appindicator +seccomp +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=all-rights-reserved
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango appindicator? ( dev-libs/libayatana-appindicator )
 RESTRICT=bindist mirror strip test
 SLOT=0
 SRC_URI=https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=59e6a8dece87b06f30ec360bc3ded9e4
+_md5_=3d4c2e706932e1d21d9ea8611b643764
diff --git a/metadata/md5-cache/net-im/zoom-5.13.10.1208 b/metadata/md5-cache/net-im/zoom-5.13.10.1208
deleted file mode 100644
index e26e96ecc900..000000000000
--- a/metadata/md5-cache/net-im/zoom-5.13.10.1208
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
-DEFINED_PHASES=install postinst postrm prepare setup
-DESCRIPTION=Video conferencing and web conferencing service
-EAPI=8
-HOMEPAGE=https://zoom.us/
-INHERIT=desktop linux-info readme.gentoo-r1 wrapper xdg-utils
-IUSE=bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!games-engines/zoom >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/mit-krb5 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/quazip-1.0:0=[qt5(+)] media-libs/alsa-lib media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-libs/mesa[gbm(+)] media-sound/mpg123 net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc virtual/opengl x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm opencl? ( virtual/opencl ) pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 wayland? ( dev-qt/qtwayland ) )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://zoom.us/client/5.13.10.1208/zoom_x86_64.tar.xz -> zoom-5.13.10.1208_x86_64.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=26c132c3c064217afcc5a3c66063bb1b
diff --git a/metadata/md5-cache/net-im/zoom-5.14.2.2046 b/metadata/md5-cache/net-im/zoom-5.14.2.2046
deleted file mode 100644
index 861cae5eb3c6..000000000000
--- a/metadata/md5-cache/net-im/zoom-5.14.2.2046
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/bbe bundled-libjpeg-turbo? ( dev-util/patchelf )
-DEFINED_PHASES=install postinst postrm prepare setup
-DESCRIPTION=Video conferencing and web conferencing service
-EAPI=8
-HOMEPAGE=https://zoom.us/
-INHERIT=desktop linux-info readme.gentoo-r1 wrapper xdg-utils
-IUSE=bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=!games-engines/zoom >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/mit-krb5 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/quazip-1.0:0=[qt5(+)] media-libs/alsa-lib media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-libs/mesa[gbm(+)] media-sound/mpg123 net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc virtual/opengl x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm opencl? ( virtual/opencl ) pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 wayland? ( dev-qt/qtwayland ) )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://zoom.us/client/5.14.2.2046/zoom_x86_64.tar.xz -> zoom-5.14.2.2046_x86_64.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=26c132c3c064217afcc5a3c66063bb1b
diff --git a/metadata/md5-cache/net-im/zoom-5.14.5.2430 b/metadata/md5-cache/net-im/zoom-5.14.7.2928
index 9ebfb9164921..37a2d6eb3f19 100644
--- a/metadata/md5-cache/net-im/zoom-5.14.5.2430
+++ b/metadata/md5-cache/net-im/zoom-5.14.7.2928
@@ -3,13 +3,13 @@ DEFINED_PHASES=install postinst postrm prepare setup
 DESCRIPTION=Video conferencing and web conferencing service
 EAPI=8
 HOMEPAGE=https://zoom.us/
-INHERIT=desktop linux-info readme.gentoo-r1 wrapper xdg-utils
+INHERIT=desktop linux-info readme.gentoo-r1 xdg-utils
 IUSE=bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland
 KEYWORDS=-* ~amd64
 LICENSE=all-rights-reserved
 RDEPEND=!games-engines/zoom >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/mit-krb5 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/quazip-1.0:0=[qt5(+)] media-libs/alsa-lib media-libs/fdk-aac:0/2 media-libs/fontconfig media-libs/freetype media-libs/mesa[gbm(+)] media-sound/mpg123 net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc virtual/opengl x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm opencl? ( virtual/opencl ) pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtlocation:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 wayland? ( dev-qt/qtwayland ) )
 RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=https://zoom.us/client/5.14.5.2430/zoom_x86_64.tar.xz -> zoom-5.14.5.2430_x86_64.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=26c132c3c064217afcc5a3c66063bb1b
+SRC_URI=https://zoom.us/client/5.14.7.2928/zoom_x86_64.tar.xz -> zoom-5.14.7.2928_x86_64.tar.xz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d44a89e340735b5e6de2e3bcef92776b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 480b202f2b45..98e82b55482d 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libiscsi-1.19.0-r1 b/metadata/md5-cache/net-libs/libiscsi-1.19.0-r2
index 6903a03740ee..945dc3cac7f3 100644
--- a/metadata/md5-cache/net-libs/libiscsi-1.19.0-r1
+++ b/metadata/md5-cache/net-libs/libiscsi-1.19.0-r2
@@ -1,15 +1,16 @@
 BDEPEND=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=configure install prepare
-DEPEND=dev-libs/libgcrypt:0= rdma? ( sys-cluster/rdma-core )
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core ) test? ( dev-util/cunit )
 DESCRIPTION=iscsi client library and utilities
 EAPI=8
 HOMEPAGE=https://github.com/sahlberg/libiscsi
 INHERIT=autotools
-IUSE=rdma
+IUSE=rdma test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-libs/libgcrypt:0= rdma? ( sys-cluster/rdma-core )
+RDEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core )
+RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/sahlberg/libiscsi/archive/1.19.0.tar.gz -> libiscsi-1.19.0.tar.gz https://dev.gentoo.org/~sam/distfiles/net-libs/libiscsi/libiscsi-1.19.0-remove-ld-iscsi.patch.bz2
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2de173d6ab0f6963511e033c7179eaef
+_md5_=b8d93525681b1d2ae635d6a0ee81fdec
diff --git a/metadata/md5-cache/net-libs/libiscsi-1.19.0_p20230208 b/metadata/md5-cache/net-libs/libiscsi-1.19.0_p20230208
new file mode 100644
index 000000000000..68955cfdbf1c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libiscsi-1.19.0_p20230208
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=sys-block/tgt-1.0.58 ) 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=configure install prepare test unpack
+DEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core ) test? ( dev-util/cunit )
+DESCRIPTION=iscsi client library and utilities
+EAPI=8
+HOMEPAGE=https://github.com/sahlberg/libiscsi
+INHERIT=autotools vcs-snapshot
+IUSE=rdma test
+KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sahlberg/libiscsi/archive/22f7b26567760921fa1aad77cca642153123ea8c.tar.gz -> libiscsi-1.19.0_p20230208.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_md5_=c94b2bdfeaafb5437353c53ab69a4f07
diff --git a/metadata/md5-cache/net-libs/libiscsi-9999 b/metadata/md5-cache/net-libs/libiscsi-9999
index 3a286e901fdf..66374b22c01e 100644
--- a/metadata/md5-cache/net-libs/libiscsi-9999
+++ b/metadata/md5-cache/net-libs/libiscsi-9999
@@ -1,13 +1,15 @@
-BDEPEND=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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/libgcrypt:0=
+BDEPEND=test? ( >=sys-block/tgt-1.0.58 ) 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 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install prepare test unpack
+DEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core ) test? ( dev-util/cunit )
 DESCRIPTION=iscsi client library and utilities
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/sahlberg/libiscsi
 INHERIT=autotools git-r3
+IUSE=rdma test
 LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libgcrypt:0=
+RDEPEND=dev-libs/libgcrypt:= rdma? ( sys-cluster/rdma-core )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5a4b1c856ebb176c1eaf21e3a95e167e
+_md5_=c94b2bdfeaafb5437353c53ab69a4f07
diff --git a/metadata/md5-cache/net-libs/quiche-0.17.2 b/metadata/md5-cache/net-libs/quiche-0.17.2
new file mode 100644
index 000000000000..23a4407c616e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/quiche-0.17.2
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.66.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(-)?] dev-util/cmake >=virtual/rust-1.53 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Implementation of the QUIC transport protocol and HTTP/3
+EAPI=8
+HOMEPAGE=https://github.com/cloudflare/quiche
+INHERIT=cargo cmake flag-o-matic rust-toolchain multilib-minimal
+IUSE=debug 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 ~x86
+LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
+SLOT=0/0
+SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bindgen/0.60.1/download -> bindgen-0.60.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/boring/2.1.0/download -> boring-2.1.0.crate https://crates.io/api/v1/crates/boring-sys/2.1.0/download -> boring-sys-2.1.0.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.12.2/download -> bumpalo-3.12.2.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.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/clang-sys/1.6.1/download -> clang-sys-1.6.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/cmake/0.1.50/download -> cmake-0.1.50.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion-plot/0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/darling/0.13.4/download -> darling-0.13.4.crate https://crates.io/api/v1/crates/darling_core/0.13.4/download -> darling_core-0.13.4.crate https://crates.io/api/v1/crates/darling_macro/0.13.4/download -> darling_macro-0.13.4.crate https://crates.io/api/v1/crates/data-encoding/2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.3/download -> foreign-types-macros-0.2.3.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.1/download -> foreign-types-shared-0.3.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/1.0.6/download -> itoa-1.0.6.crate https://crates.io/api/v1/crates/js-sys/0.3.62/download -> js-sys-0.3.62.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.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.144/download -> libc-0.2.144.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/libm/0.2.6/download -> libm-0.2.6.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/matches/0.1.10/download -> matches-0.1.10.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.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.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/mio/0.8.6/download -> mio-0.8.6.crate https://crates.io/api/v1/crates/miow/0.4.0/download -> miow-0.4.0.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/octets/0.2.0/download -> octets-0.2.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/indexmap/1.9.3/download -> indexmap-1.9.3.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.56/download -> proc-macro2-1.0.56.crate https://crates.io/api/v1/crates/qlog/0.9.0/download -> qlog-0.9.0.crate https://crates.io/api/v1/crates/quote/1.0.27/download -> quote-1.0.27.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.8.1/download -> regex-1.8.1.crate https://crates.io/api/v1/crates/regex-automata/0.2.0/download -> regex-automata-0.2.0.crate https://crates.io/api/v1/crates/regex-syntax/0.7.1/download -> regex-syntax-0.7.1.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustversion/1.0.6/download -> rustversion-1.0.6.crate https://crates.io/api/v1/crates/rust_decimal/1.29.1/download -> rust_decimal-1.29.1.crate https://crates.io/api/v1/crates/ryu/1.0.13/download -> ryu-1.0.13.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sfv/0.9.3/download -> sfv-0.9.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.162/download -> serde-1.0.162.crate https://crates.io/api/v1/crates/serde_derive/1.0.162/download -> serde_derive-1.0.162.crate https://crates.io/api/v1/crates/serde_json/1.0.96/download -> serde_json-1.0.96.crate https://crates.io/api/v1/crates/serde_with/1.14.0/download -> serde_with-1.14.0.crate https://crates.io/api/v1/crates/serde_with_macros/1.5.2/download -> serde_with_macros-1.5.2.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.8/download -> slab-0.4.8.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.15/download -> syn-2.0.15.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.13/download -> unicode-bidi-0.3.13.crate https://crates.io/api/v1/crates/unicode-ident/1.0.8/download -> unicode-ident-1.0.8.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.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/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.85/download -> wasm-bindgen-0.2.85.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.85/download -> wasm-bindgen-backend-0.2.85.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.85/download -> wasm-bindgen-macro-0.2.85.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.85/download -> wasm-bindgen-macro-support-0.2.85.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.85/download -> wasm-bindgen-shared-0.2.85.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.75/download -> wasm-bindgen-webidl-0.2.75.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/web-sys/0.3.62/download -> web-sys-0.3.62.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.17.2/download -> quiche-0.17.2.crate
+_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	rust-toolchain	73b1f4e031bc8fa4637618a4fc1266d1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1b1d0e3c161d49733d31f8e9241b9626
diff --git a/metadata/md5-cache/net-libs/quiche-9999 b/metadata/md5-cache/net-libs/quiche-9999
index dc41ab279c87..fca384d3e202 100644
--- a/metadata/md5-cache/net-libs/quiche-9999
+++ b/metadata/md5-cache/net-libs/quiche-9999
@@ -9,4 +9,4 @@ LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-L
 PROPERTIES=live
 SLOT=0/0
 _eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	rust-toolchain	73b1f4e031bc8fa4637618a4fc1266d1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=97e9f7e2b85d83f20d05d93c568b3595
+_md5_=1b1d0e3c161d49733d31f8e9241b9626
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index c8e818854e37..2edcd3f05bf6 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.8 b/metadata/md5-cache/x11-base/xwayland-22.1.8
deleted file mode 100644
index b5e07389756d..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.8.tar.xz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ec2eaaded64304bb476b2b202a883e89
diff --git a/metadata/md5-cache/x11-base/xwayland-23.1.0 b/metadata/md5-cache/x11-base/xwayland-23.1.0
deleted file mode 100644
index 3ec6573f6a44..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-23.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.28 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.109 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-base/xorg-proto-2022.2 >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.28 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.109 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-23.1.0.tar.xz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1578544880f6f278df95bc9408169424
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 2808bea937e8..3492e5c8fb40 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-2.8.0 b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.8.0
new file mode 100644
index 000000000000..75af16d50e92
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-2.8.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( app-emulation/qemu dev-libs/libisoburn sys-fs/mtools grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_efi-64] sys-firmware/edk2-ovmf ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc] ) >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Preview a GRUB 2.x theme using KVM/QEMU
+EAPI=8
+HOMEPAGE=https://github.com/hartwork/grub2-theme-preview
+INHERIT=distutils-r1
+IUSE=grub_platforms_efi-64 test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-emulation/qemu dev-libs/libisoburn sys-fs/mtools grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_efi-64] sys-firmware/edk2-ovmf ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc] ) 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_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hartwork/grub2-theme-preview/archive/2.8.0.tar.gz -> grub2-theme-preview-2.8.0.tar.gz
+_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4f2c012b593f8bc914480a2ef43a6649
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1a71893cd985..6ae9ad3474e2 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-05-10T10:09:49Z
+TIMESTAMP 2023-05-10T16:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbbW1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbwcxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDxLRAAoDJBmnevusE8Dui+HNfQkBsxU+CyCmFWd6oBPhmEC9UASC2K/sjZCKbK
-YQ9HV4QzRT7WJ+S9C4sNtAnICyOi1u5p0hIlPy8BChvnHFpBQt0ercrf8/CWtb50
-yqjV3xaXUp+yO4usovTS/5pO469ENZYX30ehDDLws5/ZkiGOqgpY403qwdvnwqOg
-aPLGlHa7gQ+Q4Vd6jlATnHBYh+Wii2hYbhq3Ll8mPeBN9nIudooyCtmPRoIEqfyK
-/Ted+TOHmAfp+2baXRGDgEYWiz+oLyQ/i84KKix0CUFtAn1n9SR8nq3xxM1x3DrK
-xlH6btsozKDbPgMgw/3jyoLGnVJThZ9EHStUtBIP10O6weqtOLhY9qe8Oh3uai5e
-qHhYsTs9Nd5yTo0U7EixPpYlOWz8fQdEG/i3NeUBh22WCQL+E2ju4WzpPs6g3R9N
-Jh7y+8XCba2JoemJ4T8klo4o8lvU4eQL8gFsT0moKlU4pVlBkO7LTkgQ8gaJP3C5
-Xlu/OUC3cBChPffMP/CtekZitUFJoUpU3AKhNOU1INFP21RqEGNh/ekmf7zxb3x1
-Y/NjfPq8pk7y2ebLUIjm0avc3J4sQCtJX60yfkwDM6KozLZWMEagBa29B7LGRCMo
-0UYNIEqzxQQmwU00Lak5/blyJWdADeclsrHXFZE/zV2iLMyXk3A=
-=cc2B
+klADTw//XV5b1y5w1XlM08WXR2i8yZoPEI9edn4v+Nma2wTgFrRTP0ldR2q18kWy
+UxE4TxlzdA3xgB9JnfYx8FFqAoDMGWW89KMW7U+4eqbeSlp3l+vAW6unv3Ui0Pi4
+T9M0S6VZwvAcRI+MeBTsHEvJcOOL8r5C2031nUf9l6HRvoFj/zUV/ilgd1JFC9hV
+OrgvHSaqt36DXVEEa7nLIHMbh8KvLVTgLjKeGQ6F/LRQfwnhp7XryYL7CIzVidfo
+64iDLBa3U7/HVrvYLQTJ/OWXuxqd0jVGl1gLrRXBoM4Xdu4usSJhX193MXDpRPQa
+5zEcBYuBnE97FfBoHv+eluSMPiTWLXi2LLOybSx33ZhwJVmdxWq8BW37qXQbz/ry
+i1VbcTk7c3mpWhnulhJsyzRwTwSO3M7aqNfyQdIOuMB1dPNVKaGv3yY/ciELHcfB
+B8rIHLD70SavcApJaktviQcEJkk7T+YEU3wS4jXWhBJMB45yjjVZqBzKEUurQRHD
+hyP/9+S7EQ4anOb7PtcQ298BwJnZ1qm5FF1ruU+JNB1o7V9CZe3bqhkGVcQN8nvO
+c+Y9zMpHbHMeGFDdjMacJyqnnFWZ6WIm0e1POMZbmrXZ1E1gXPRR1ShpgQcZ3/DL
+3zOqbtmIS1cR10V1je8DIVpaBnWFQ9hit+7mctjUhage9DDmajc=
+=yOM3
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d665baca35fc..2cceca53e02c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 10:09:46 +0000
+Wed, 10 May 2023 16:09:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2fc63a9c1816..39bc54e439c4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 10 10:09:46 AM UTC 2023
+Wed May 10 04:09:45 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2625889be96c..117b064885ee 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 10:15:01 +0000
+Wed, 10 May 2023 16:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e12bc57e3d1d..ea05de9b3c0f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1067e9951208957ddbb68139603a51573deb7b4c 1683711640 2023-05-10T09:40:40+00:00
+8840d4c8be04f2227756d610d4a529c33cdcf538 1683732775 2023-05-10T15:32:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4e5f435afb23..635a3986cfe4 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1683713401 Wed 10 May 2023 10:10:01 AM UTC
+1683735001 Wed 10 May 2023 04:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d665baca35fc..2cceca53e02c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 10:09:46 +0000
+Wed, 10 May 2023 16:09:45 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 61225c81481d..464894c07de0 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index 7e33a3fed55e..f094aedf4b2b 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1,5 +1,3 @@
-DIST discord-0.0.26.tar.gz 93012747 BLAKE2B 9759a1319835d48e5bc5a72b9c96308ac2cc8251de66b82b55abff0cb2ea199a94f7fa25488a95ed577176ce12fe6eb8455f25fa111b6306778f195b15dc6468 SHA512 65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b
 DIST discord-0.0.27.tar.gz 92317071 BLAKE2B 5328abd5f6aba87c73ee26cc6387dd9af7745c003e67b70e168153a959f5f582d118d38ce0b45ff4a9165ff1423708b05d468824c880e4685755df41ceadd5e1 SHA512 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f
-EBUILD discord-0.0.26-r1.ebuild 3250 BLAKE2B 37ff53dcd821c1f9cb669bec81388632891027e0d0d60c74bc67c47d4eb28e660672ae6263bf1b64ed2b4bd88776eee0a37d02e12633ad55d09563b82c92006b SHA512 586d23a2b9d1decbf644d89d94829c935ed6e7de90fd0be31182f1d2c04e2dd9f50b0ce7c5164fa82ec83df56e84ea6b08a7b8e79d43b9bd0d0316ee02251331
-EBUILD discord-0.0.27.ebuild 3414 BLAKE2B f06f04833524cbf310e59cc508f3bcc80c36c34a6f9feb8ab3b83a296a9dca30159d69040dc4a33633ef423471159e75016c0782adfb49e25bf259dbae5d51e1 SHA512 707b77bef4162d16b98736d8f046ce7548c044726c29e2f10311ca36aed760b6ef6e26f784e66bac99dce56c798fcc9b67ac5f20c2d1aa0347c325a28232307b
+EBUILD discord-0.0.27.ebuild 3413 BLAKE2B 80cd994612cfb1da73c9f6eefb9ba254eca549da180e704e7477946b0aa05b7f7daa1aff60501712c0c830ca5fa335e0f1d567d1a16b0bef4ca930dc7f9ad3d4 SHA512 ae44d8dd768191a3097b0e5882b85b6a4e72868cbb648bfdd911d5c5e1b56974e752dcc4a322948e55b246c3b94a48b26e185535b203b8f758accd11fb4f56c5
 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665
diff --git a/net-im/discord/discord-0.0.26-r1.ebuild b/net-im/discord/discord-0.0.26-r1.ebuild
deleted file mode 100644
index db19d1e80952..000000000000
--- a/net-im/discord/discord-0.0.26-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-bin/}"
-MY_PV="${PV/-r*/}"
-
-CHROMIUM_VERSION="102"
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
-"
-
-inherit chromium-2 desktop linux-info optfeature unpacker xdg
-
-DESCRIPTION="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discordapp.com"
-SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64"
-RESTRICT="bindist mirror strip test"
-IUSE="+seccomp"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-DESTDIR="/opt/${MY_PN}"
-
-QA_PREBUILT="*"
-
-CONFIG_CHECK="~USER_NS"
-
-S="${WORKDIR}/${MY_PN^}"
-
-src_unpack() {
-	unpack ${MY_PN}-${MY_PV}.tar.gz
-}
-
-src_configure() {
-	default
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	default
-	# remove post-install script
-	rm postinst.sh || die "the removal of the unneeded post-install script failed"
-	# cleanup languages
-	pushd "locales/" >/dev/null || die "location change for language cleanup failed"
-	chromium_remove_language_paks
-	popd >/dev/null || die "location reset for language cleanup failed"
-	# fix .desktop exec location
-	sed -i "/Exec/s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" \
-		"${MY_PN}.desktop" ||
-		die "fixing of exec location on .desktop failed"
-	# USE seccomp
-	if ! use seccomp; then
-		sed -i '/Exec/s/Discord/Discord --disable-seccomp-filter-sandbox/' \
-			"${MY_PN}.desktop" ||
-			die "sed failed for seccomp"
-	fi
-}
-
-src_install() {
-	doicon -s 256 "${MY_PN}.png"
-
-	# install .desktop file
-	domenu "${MY_PN}.desktop"
-
-	exeinto "${DESTDIR}"
-
-	doexe "${MY_PN^}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so
-
-	insinto "${DESTDIR}"
-	doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin
-	insopts -m0755
-	doins -r locales resources
-
-	# Chrome-sandbox requires the setuid bit to be specifically set.
-	# see https://github.com/electron/electron/issues/17972
-	fowners root "${DESTDIR}/chrome-sandbox"
-	fperms 4711 "${DESTDIR}/chrome-sandbox"
-
-	# Crashpad is included in the package once in a while and when it does, it must be installed.
-	# See #903616 and #890595
-	[[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler
-
-	dosym "${DESTDIR}/${MY_PN^}" "/usr/bin/${MY_PN}"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "sound support" \
-		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
-	optfeature "system tray support" dev-libs/libappindicator
-}
diff --git a/net-im/discord/discord-0.0.27.ebuild b/net-im/discord/discord-0.0.27.ebuild
index 8f127eeca494..0c75ad505e10 100644
--- a/net-im/discord/discord-0.0.27.ebuild
+++ b/net-im/discord/discord-0.0.27.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="bindist mirror strip test"
 IUSE="appindicator +seccomp"
 
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index b9a494da35da..f8f46c92032b 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,8 +1,5 @@
-DIST zoom-5.13.10.1208_x86_64.tar.xz 166970460 BLAKE2B 58d1bda480345a77a1fc466bb1af3429a63d1959ee4aada608f7ea6d55a537afb2840c497951c8030fb78836a3bb671debc6e4cbae82fe870eed9383e111c207 SHA512 dc29e626d6bfe565519822249324510e9e2719beaaf0f9382187f3d3467ce24a7d81e0473d4af22485a28932a6727b368a1d13a3322cb970b69b44155b1d6a30
-DIST zoom-5.14.2.2046_x86_64.tar.xz 167565808 BLAKE2B 1e2ecbac52fa88ed7d068be8edcaa65b33643045e5cbed6d1af31e560df520723541fb1c61133073edb27068cd9a1ed66dfacdd3184b18ab7b26f71513f3855c SHA512 416ffd9bf48b7519302f87847efc6ac2086ae47b9a2083e9cad7b42ee2549e0b91d27edfbd1a0afd06cc02b1d0d0db8443ab294b0e863878c6533a143b4088be
 DIST zoom-5.14.5.2430_x86_64.tar.xz 168119892 BLAKE2B ffbcc3720e863897ef4eb5278118b3e6e6aeb25280b4cb493254909fe1707e454193ba6e63f1c625978b5ade8e0204f59dbb11f96c7af2d38058df9df952f234 SHA512 17f72d8fac95f9fff46db1dec674303e97b3d2060c1f9dd631055a1d5939810251b35bcfc0a13dcdbe80662c2c285dc1f224dd20bc1a7e4dfa928f641e1532ca
-EBUILD zoom-5.13.10.1208.ebuild 5763 BLAKE2B e59d2d9b2fa2729e2e26d00c65aa973fcccff9b33d7aa41f26238d95f94863fbb7faea353a9cbeb8cf3063e7106c9c260c55d59ee0d7c1c839876a32cb45068c SHA512 59b2d574ae3d308b0dc07bf4f3e51f55c94d3472359a13e8698cd78e77a65e9bd7391f6ae7654200a4476af97636949caa00461047b32bd09f96c4f1a815b09c
-EBUILD zoom-5.14.2.2046.ebuild 5763 BLAKE2B e59d2d9b2fa2729e2e26d00c65aa973fcccff9b33d7aa41f26238d95f94863fbb7faea353a9cbeb8cf3063e7106c9c260c55d59ee0d7c1c839876a32cb45068c SHA512 59b2d574ae3d308b0dc07bf4f3e51f55c94d3472359a13e8698cd78e77a65e9bd7391f6ae7654200a4476af97636949caa00461047b32bd09f96c4f1a815b09c
+DIST zoom-5.14.7.2928_x86_64.tar.xz 168160068 BLAKE2B f20dd7d87e14c2489517d229f18c395155fe56a51a10f57a35c62a4add54650d1c3831414740392cedb2cb13e2bb65274b7e2d59b52263aa079ff49bb0e4a9af SHA512 4b843533f300556773a31eedbd48dd46062ca5a607cf6241fb2af1d3bbb436333b0d3cabd03b091a61ed1088e40010adb971671b1fc79cd26ff4524bfb9e3b78
 EBUILD zoom-5.14.5.2430-r1.ebuild 5713 BLAKE2B 6baa601259759bfccb6d5da5433f8deb270cd0dce122e104b1e63c8973cf4a8072b599cc4bbef50c79b2741cca609b7e73ba83ccb61b6165d11d2948b0cff052 SHA512 229824e352ccf706ef6bac72a3697ba91f7613dbb328c917b22d068d95ac3754e726711eb79775ea826cc88e8e6d5f43248d4c28dd387f3ff38ed44869f192d0
-EBUILD zoom-5.14.5.2430.ebuild 5763 BLAKE2B e59d2d9b2fa2729e2e26d00c65aa973fcccff9b33d7aa41f26238d95f94863fbb7faea353a9cbeb8cf3063e7106c9c260c55d59ee0d7c1c839876a32cb45068c SHA512 59b2d574ae3d308b0dc07bf4f3e51f55c94d3472359a13e8698cd78e77a65e9bd7391f6ae7654200a4476af97636949caa00461047b32bd09f96c4f1a815b09c
+EBUILD zoom-5.14.7.2928.ebuild 5713 BLAKE2B 6baa601259759bfccb6d5da5433f8deb270cd0dce122e104b1e63c8973cf4a8072b599cc4bbef50c79b2741cca609b7e73ba83ccb61b6165d11d2948b0cff052 SHA512 229824e352ccf706ef6bac72a3697ba91f7613dbb328c917b22d068d95ac3754e726711eb79775ea826cc88e8e6d5f43248d4c28dd387f3ff38ed44869f192d0
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.13.10.1208.ebuild b/net-im/zoom/zoom-5.13.10.1208.ebuild
deleted file mode 100644
index 6c6cfdba4fb4..000000000000
--- a/net-im/zoom/zoom-5.13.10.1208.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop linux-info readme.gentoo-r1 wrapper xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/mit-krb5
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	media-libs/alsa-lib
-	media-libs/fdk-aac:0/2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa[gbm(+)]
-	media-sound/mpg123
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-	opencl? ( virtual/opencl )
-	pulseaudio? ( media-libs/libpulse )
-	wayland? ( dev-libs/wayland )
-	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="dev-util/bbe
-	bundled-libjpeg-turbo? ( dev-util/patchelf )"
-
-CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
-		|| die "Extraction of icon failed"
-
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-
-	if use bundled-libjpeg-turbo; then
-		# Remove insecure RPATH from bundled lib
-		patchelf --remove-rpath libturbojpeg.so || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r calendar cef email json ringtone scheduler sip timezones \
-		translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh
-	fperms a+x /opt/zoom/cef/chrome-sandbox
-	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
-
-	if use opencl; then
-		doexe aomhost libaomagent.so libclDNN64.so libdvf.so libmkldnn.so \
-			libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
-	fi
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so
-	else
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
-	fi
-
-	if ! use wayland; then
-		# Soname dependency on libwayland-client.so.0
-		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
-	fi
-
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
-		(	# Remove libs and plugins with unresolved soname dependencies.
-			# Why does the upstream package contain such garbage? :-(
-			cd "${ED}"/opt/zoom/Qt || die
-			rm -r plugins/audio plugins/egldeviceintegrations \
-				plugins/platforms/libqeglfs.so \
-				plugins/platforms/libqlinuxfb.so \
-				plugins/platformthemes/libqgtk3.so \
-				qml/Qt/labs/lottieqt qml/QtQml/RemoteObjects \
-				qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \
-				qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
-				qml/QtQuick/XmlListModel || die
-			use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
-				plugins/platforms/libqwayland*.so qml/QtWayland || die
-		)
-	else
-		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
-
-	make_wrapper zoom /opt/zoom/zoom /opt/zoom \
-		/opt/zoom:/opt/zoom/Qt/lib:/opt/zoom/cef
-	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
-		"Network;VideoConference;" \
-		"MimeType=$(printf '%s;' \
-			x-scheme-handler/zoommtg \
-			x-scheme-handler/zoomus \
-			application/x-zoom)"
-	doicon videoconference-zoom.svg
-	doicon -s scalable videoconference-zoom.svg
-
-	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
-		the whiteboard) require display compositing. If you encounter
-		a black window when sharing the screen, then one of the following
-		actions should help:
-		\\n- Enable compositing in your window manager if it is supported
-		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.14.5.2430.ebuild b/net-im/zoom/zoom-5.14.5.2430.ebuild
deleted file mode 100644
index 6c6cfdba4fb4..000000000000
--- a/net-im/zoom/zoom-5.14.5.2430.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop linux-info readme.gentoo-r1 wrapper xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/mit-krb5
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	media-libs/alsa-lib
-	media-libs/fdk-aac:0/2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa[gbm(+)]
-	media-sound/mpg123
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-	opencl? ( virtual/opencl )
-	pulseaudio? ( media-libs/libpulse )
-	wayland? ( dev-libs/wayland )
-	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="dev-util/bbe
-	bundled-libjpeg-turbo? ( dev-util/patchelf )"
-
-CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
-		|| die "Extraction of icon failed"
-
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-
-	if use bundled-libjpeg-turbo; then
-		# Remove insecure RPATH from bundled lib
-		patchelf --remove-rpath libturbojpeg.so || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r calendar cef email json ringtone scheduler sip timezones \
-		translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh
-	fperms a+x /opt/zoom/cef/chrome-sandbox
-	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
-
-	if use opencl; then
-		doexe aomhost libaomagent.so libclDNN64.so libdvf.so libmkldnn.so \
-			libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
-	fi
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so
-	else
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
-	fi
-
-	if ! use wayland; then
-		# Soname dependency on libwayland-client.so.0
-		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
-	fi
-
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
-		(	# Remove libs and plugins with unresolved soname dependencies.
-			# Why does the upstream package contain such garbage? :-(
-			cd "${ED}"/opt/zoom/Qt || die
-			rm -r plugins/audio plugins/egldeviceintegrations \
-				plugins/platforms/libqeglfs.so \
-				plugins/platforms/libqlinuxfb.so \
-				plugins/platformthemes/libqgtk3.so \
-				qml/Qt/labs/lottieqt qml/QtQml/RemoteObjects \
-				qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \
-				qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
-				qml/QtQuick/XmlListModel || die
-			use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
-				plugins/platforms/libqwayland*.so qml/QtWayland || die
-		)
-	else
-		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
-
-	make_wrapper zoom /opt/zoom/zoom /opt/zoom \
-		/opt/zoom:/opt/zoom/Qt/lib:/opt/zoom/cef
-	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
-		"Network;VideoConference;" \
-		"MimeType=$(printf '%s;' \
-			x-scheme-handler/zoommtg \
-			x-scheme-handler/zoomus \
-			application/x-zoom)"
-	doicon videoconference-zoom.svg
-	doicon -s scalable videoconference-zoom.svg
-
-	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
-		the whiteboard) require display compositing. If you encounter
-		a black window when sharing the screen, then one of the following
-		actions should help:
-		\\n- Enable compositing in your window manager if it is supported
-		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.14.2.2046.ebuild b/net-im/zoom/zoom-5.14.7.2928.ebuild
index 6c6cfdba4fb4..ca1f4dfb7b31 100644
--- a/net-im/zoom/zoom-5.14.2.2046.ebuild
+++ b/net-im/zoom/zoom-5.14.7.2928.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop linux-info readme.gentoo-r1 wrapper xdg-utils
+inherit desktop linux-info readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -160,8 +160,7 @@ src_install() {
 		fi
 	fi
 
-	make_wrapper zoom /opt/zoom/zoom /opt/zoom \
-		/opt/zoom:/opt/zoom/Qt/lib:/opt/zoom/cef
+	dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
 	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
 		"Network;VideoConference;" \
 		"MimeType=$(printf '%s;' \
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ce40c8f0a48b..e547a8c91536 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 5220b6cbe41c..5c39a77a0021 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -2,10 +2,13 @@ AUX libiscsi-1.18.0-fno-common-2.patch 2058 BLAKE2B 00a2d3bd1ae4b08479593f92eaf8
 AUX libiscsi-1.18.0-fno-common-3.patch 1387 BLAKE2B f8bacb84a3c340a528576f56b52026fefc97792b9d5a136150bf348e378cd60b9ea702101b8e9443a320ddafe5a21d646f98a4a3434661adb39f595e2e9dc52e SHA512 b0c359393b70ee6a808e254a8aeb58d7bea25307fc0f957696369e74d82eced2d7b3edcbc18dc0c3be0b45016bdf331183bcf8fdfe853b292861ea28238aad2f
 AUX libiscsi-1.18.0-fno-common.patch 386 BLAKE2B c87a1e2c2b582277b3146a592cf385520a20513cc349a6244cba8e55f4a8f3e7f830cf16160564b07756899cc982993fff45900f512c0cb187340ecbb7bd1e4e SHA512 fc1aae874619ba263f404da0cbb4009fc09b907c2f9a65e29e18874b18daff7f0bc243b9666f19430d5a52e30adf5c784d380162c2bb65f1c79c9084981e2c8e
 AUX libiscsi-1.19.0-fix-rdma-automagic.patch 1049 BLAKE2B ec194008113e2ba1f06666d8e8538fae9dfabb227884fae7f79a1512bcfab55f65c03c4bc10cb997e9aad32e6dfcf605c53e9efbdba5f7faf2fd75c8243113f5 SHA512 80c950ca0925109322fe45ba6296ea7dc4117e06a6e4de18c0dfe1405bc2768d137eeac786be8f6672f17d0e8423e9a922dc6b7e1865ec8cdf7a514013dde047
+AUX libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch 1151 BLAKE2B f3e4c14db9e523251de64fda11e1ae938977a0d60a8c16047da3fc54181f29922133ae054bfc4bc27f4f661870d618461954738f99d18b25a2a55f90712601ed SHA512 b566596be01822149c07c16148584c862b24268399b3606febca1081d0d0359621eba9d0a711f6845183f7691e6f0b485ae2246678a0e86c40cd03b4d7571097
 DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda69274c6361fc0870e8a46eb032d46a5029080eab8061f2e1d06b41f0e98606aeb2444d3deb6da2a188dd6882196512c SHA512 9869fd86f8ba237d71256b16d0f94ef69fb67fac315bb7a596c4d8d6ed3abba710edf9b5f5a27f5777f7b5d2feb33c09764c27a4e6c56e38dd2566836cffe36e
 DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4
 DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
+DIST libiscsi-1.19.0_p20230208.tar.gz 293283 BLAKE2B 8dafcdd87d66c8addea8734af264b1ce70ec7cbb7925becf1946b616821a94a0d22ed9a903f5f24c03d9b647353fc76a708cafed0f6482199a45cb628c143fff SHA512 d6416833b4e1352e91d869ae753fdc01968e303d5ce7de52f27692ce7f8d7ca4f648931d54f0ebfa1323f8b43531bfc81771ea0468af4dc9ad53df02c8bad55f
 EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
-EBUILD libiscsi-1.19.0-r1.ebuild 1189 BLAKE2B 194ad7ea6756fa09f937ca14305efecc354ad9fde09f4f7a75dc57ad371e754c6db54f1f86a3935d7d94b357d66922f05c1526c47a132970c14183db324da06b SHA512 dd1d745621a4cba756caf9d24edb19bcf060761c0db05277227b11c4b4dae3b5c6ac5b5d618770c1917b824db5a898a09c6cccee30d810cf607e1e4cde4cd4f7
-EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
+EBUILD libiscsi-1.19.0-r2.ebuild 1382 BLAKE2B a49a22f4475a06fca6be78cadf73271eb5c1edc3cb59ddb881cbf13b0daf96181a9f2771e954f9d6bbe6365139789a36ea6fabc14a2111eb9ce118d5d3bb70ca SHA512 cbdcbf900be41a74a5dd070b1910231213fafc5d1adedd92b258dfeae766e9424961b863d26067eddf676b0d71e2d42b02cc4f87447268d4e5c98ded22eb3f2f
+EBUILD libiscsi-1.19.0_p20230208.ebuild 1379 BLAKE2B 3703023cbdbf65ff64e4e8b4c6c1917b1a6a90378371c89319fd60fd382f3830b01ca9471e69a23dca28d7b97bbde1a0285e9336ab841a321443108cbd2e730b SHA512 1eac24a0a26232c6b9700e667b7c2465136f9ad4334efae2172b6889ba1db2eb3c9f80cf18279e818f45ea066fc2e329e109962d40e138219a96680db4712a90
+EBUILD libiscsi-9999.ebuild 1379 BLAKE2B 3703023cbdbf65ff64e4e8b4c6c1917b1a6a90378371c89319fd60fd382f3830b01ca9471e69a23dca28d7b97bbde1a0285e9336ab841a321443108cbd2e730b SHA512 1eac24a0a26232c6b9700e667b7c2465136f9ad4334efae2172b6889ba1db2eb3c9f80cf18279e818f45ea066fc2e329e109962d40e138219a96680db4712a90
 MISC metadata.xml 353 BLAKE2B 3c729c58e8fe95f38a6f5ea14eba047ebb50b2b80819d53acfaae83d81f51510b652b618c3a7c59d16fe0d1a4e397246c5ea6b0b6807197d580a61f3784cb79f SHA512 070979945abed956dd34ae0d1cc93ea45d30a9eb555262de9f767107d2f3323260df6377c151b8705de5fffd001febd21b9bb3d8fc278b56e52ddb47a081add9
diff --git a/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch b/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch
new file mode 100644
index 000000000000..89d91c5c5ebf
--- /dev/null
+++ b/net-libs/libiscsi/files/libiscsi-1.19.0_p20230208-fix-rdma-automagic.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -166,6 +166,8 @@ if test x"$libiscsi_cv_HAVE_SG_IO" = x"yes"; then
+     AC_DEFINE(HAVE_SG_IO,1,[Whether we have SG_IO support])
+ fi
+ 
++AC_ARG_WITH([rdma], AS_HELP_STRING([--with-rdma], [Build with rdma support]))
++
+ AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LINUX_ISER,[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <infiniband/verbs.h>
+@@ -173,10 +175,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <rdma/rdma_verbs.h>]],
+ [[int ibv = IBV_WC_SEND;]])],
+ [libiscsi_cv_HAVE_LINUX_ISER=yes],[libiscsi_cv_HAVE_LINUX_ISER=no])])
+-if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then
++if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes" && test "x$with_rdma" = "xyes"; then
+     AC_DEFINE(HAVE_LINUX_ISER,1,[Whether we have iSER support])
+ fi
+-AM_CONDITIONAL([HAVE_LINUX_ISER], [test $libiscsi_cv_HAVE_LINUX_ISER = yes])
++AM_CONDITIONAL([HAVE_LINUX_ISER], [test "x$with_rdma" = "xyes"])
+ 
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <rdma/rdma_cma.h>]], [[return RDMA_OPTION_ID_ACK_TIMEOUT;]])],[AC_DEFINE([HAVE_RDMA_ACK_TIMEOUT],[1],[Define to 1 if you have RDMA ack timeout support])],[])
diff --git a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r2.ebuild
index 851b26691c45..f0879dde5e86 100644
--- a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.19.0-r2.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
@@ -19,11 +19,18 @@ HOMEPAGE="https://github.com/sahlberg/libiscsi"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-IUSE="rdma"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	rdma? ( sys-cluster/rdma-core )"
-DEPEND="${RDEPEND}"
+IUSE="rdma test"
+# test_9000_compareandwrite.sh failure needs investigation
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.18.0-fno-common.patch
@@ -42,7 +49,12 @@ src_configure() {
 	econf \
 		--enable-manpages \
 		$(use_with rdma) \
-		--disable-werror
+		--disable-werror \
+		$(use_enable test tests)
+}
+
+src_test() {
+	emake -C tests test
 }
 
 src_install() {
diff --git a/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild
new file mode 100644
index 000000000000..b1a76b05442c
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.19.0_p20230208.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		# The S path is too long for the test suite otherwise.
+		inherit vcs-snapshot
+
+		MY_COMMIT="22f7b26567760921fa1aad77cca642153123ea8c"
+		SRC_URI="https://github.com/sahlberg/libiscsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="rdma test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	test? ( >=sys-block/tgt-1.0.58 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.19.0_p20230208-fix-rdma-automagic.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #906063
+	rm tests/test_0600_ipv6.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		$(use_with rdma) \
+		--disable-werror \
+		$(use_enable test tests)
+}
+
+src_test() {
+	emake -C tests test
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libiscsi/libiscsi-9999.ebuild b/net-libs/libiscsi/libiscsi-9999.ebuild
index 9d1977923e12..b1a76b05442c 100644
--- a/net-libs/libiscsi/libiscsi-9999.ebuild
+++ b/net-libs/libiscsi/libiscsi-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -9,29 +9,62 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+	if [[ ${PV} == *_p* ]] ; then
+		# The S path is too long for the test suite otherwise.
+		inherit vcs-snapshot
+
+		MY_COMMIT="22f7b26567760921fa1aad77cca642153123ea8c"
+		SRC_URI="https://github.com/sahlberg/libiscsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	else
+		SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="iscsi client library and utilities"
 HOMEPAGE="https://github.com/sahlberg/libiscsi"
 
-SLOT="0"
 LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="rdma test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	rdma? ( sys-cluster/rdma-core )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	test? ( >=sys-block/tgt-1.0.58 )
+"
 
-RDEPEND="dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.19.0_p20230208-fix-rdma-automagic.patch
+)
 
 src_prepare() {
 	default
+
+	# bug #906063
+	rm tests/test_0600_ipv6.sh || die
+
 	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--enable-manpages \
-		--disable-static \
-		--disable-werror
+		$(use_with rdma) \
+		--disable-werror \
+		$(use_enable test tests)
+}
+
+src_test() {
+	emake -C tests test
 }
 
 src_install() {
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index ea9356ca11cb..149a23c602c2 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -16,6 +16,7 @@ DIST boring-sys-2.1.0.crate 3362027 BLAKE2B 685cfe031e31c0a708a334a7f5acc4b5f344
 DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bumpalo-3.11.0.crate 80945 BLAKE2B a740a674d0922794cc71b87a8bd686f677f8d0b38d88cc43467b7f8f6d1368ef5cff99bf10867d3c8af9b79b71deca7e5bfe78670b7890b04e468359780d8c76 SHA512 f747b5743bd2825c62c363ec49f1eccc492d7cf8cca8101aa9733f32489685c1777344dc6183f83c772f1067f9648b953d3ae1034976a14295f252f1ee7788fa
 DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
+DIST bumpalo-3.12.2.crate 81706 BLAKE2B 50aa1e5f8f1208bd50b8fb0580bb5c5a7baadf36c0a0d8ad041c48b127896b75437118decfb1138e694964b89c8c0f66144cbd44037a67ef376fed312e08ebe8 SHA512 a0571501d2b2cbe25b862197295fddf14dbbbba7472965ab6006fb7cfcdf0f76df3b5e505888c0f1a0be99870b87afe5881a80df4f75756d2d9b65791d94d566
 DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cast-0.2.3.crate 11446 BLAKE2B 70003625a66e1f505d81cb324992f38388762686def5f6edd8023d55425273b9aad36a2d1c7f429799565c02a0c9d6db1a869137aec9c8d1e2fe12b228e4c8c4 SHA512 2afdba50989aaefd64b2cd1274dcf8812f69e7b2d8ed783a261fe9d3805bd7800e8e0b30beccc64f640df1a869c012d35c7cdac5ef976829a53dc82e73048ae0
@@ -71,6 +72,7 @@ DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a
 DIST js-sys-0.3.57.crate 78605 BLAKE2B 260e2fe94a213ea169d9296dc8f5639fe62f47ce69eb69f2ac2f9b1f409c3f2dc1b26fef56cda5cbfbb775a7f85d2b6d866bd4e30cd6041feb337b744e57358f SHA512 797865ba4c40bdd338ea3b980d6f7139b580a12057437319d3427da6c5045455e0612461289ecbd6ed445e8b675369a8ce77ec8ac0383c8a800a7fc84606ac2b
 DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665
 DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16
+DIST js-sys-0.3.62.crate 80156 BLAKE2B f2b1537dce3b419af68626ec496ddfaf8b0ac605162380275109bf246f2662e57afc96e0ad59e3114e315fc7ccfee12a48678c557dd0399948e7e94aa2b05663 SHA512 7c9ce02e69db7222395e36b9a76e43c39f1052f862c712839d253d21db6cfcc1ae5f1d79f687eafc908447ffcb6d059dccb419fc78107f92a6409f5d198dc5f3
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
@@ -78,6 +80,7 @@ DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cd
 DIST libc-0.2.134.crate 603330 BLAKE2B afca337bf7120e933c56745a51261156f4af7cc58427f623b9cdf1b2d5fc67fb2bc7c078ccab3cf232024e5013e8edcbbb0baab6a8a3762f9b20d975ed92411d SHA512 fcc142061df7b363b2dacec5fb3c9a19e63addd8210678117f681b8e1b62e5784cb78067639df464f32e22c9ab4d0932bbe1c01cc992348cc0fad4a46cc7b1c3
 DIST libc-0.2.135.crate 604591 BLAKE2B 195f342d1136f63c308371f001c9fc270e151fbda7b316321d319b57bcd46f206bb8b06196f5e9cf8a35b0c397d909f370aef8b119f4bc0eb75b9e245d8e7b4a SHA512 dc8e8fc918c5184de6ae7414b523b06ae91cde252e837e863f8477e9722ccb206a0b27762ac204830e8d09071413029c03802a3ed93bff274c33b2a4055e7806
 DIST libc-0.2.140.crate 669153 BLAKE2B f4269549f6b450a3da3196ecaae52afe178d5b6905666fae04e2879f975f0129788898ca2ccd214d721af42a8b2fa86b26355d6baa0a81c223b56c658ee66dd5 SHA512 f450fe619ea2f45e4ada2567981987f19d35a9f13f88a0ce3a53e1751c6fbff708ca69fa6a64d807cce5dfe18b08751f0695d8a01e68e269da1aafc831528b7b
+DIST libc-0.2.144.crate 682092 BLAKE2B 1f699cb880a65baf9210527789abb35fe8be9565828d061e12b5c76330e21babab67b21e9a44be6a706f643f3c8b98503a3b40482183188b49f33f96a2489a68 SHA512 576da68e3845a7149f64bee425529ffec4bbb8df0272790182e49c8bad5b9744de21ffb5c1206753b57b7fe45af02c6c429e16522b72a77e5262482d64df5692
 DIST libloading-0.7.3.crate 27378 BLAKE2B da36353819cbbc85dbb3196585970b431eb5570140978fed8a6b5e46bec2560b373e20fc108b9520589bfd1f804eea57a524a0cb497620d4a8fd11030e9c4818 SHA512 58da6e73f86aa05132949939507a128188ec2e26e2245e23b1534d90673c9909c7d5220aa4aeab2c16249f7433b4d0f98f20c94b8b1f7434c7abadc8b8039ae9
 DIST libloading-0.7.4.crate 27580 BLAKE2B 491faef2659270b10bb88ac46e0453f747f35e78d7f28b7d6d9151177b4c7a7aec0a1efdf702eda0988c31e9dafff2990eba4e6a9b0b695c535ea9086ccf36e7 SHA512 34439d9eca68bac8fcbe2bc94a70e07550e7e95d713ab74ed60ba6736ec807fd9c9135c178d436fbeb39afb074b2a9b05775d953340845c088f5f8712f5f56a1
 DIST libm-0.2.2.crate 113226 BLAKE2B 126ff68b4ccc7c4e3043095c84ef010bffdc1f76d3c0c871441d1ecaaa044534506844fd6accf145f94cfdbb611fbb1fb13ce976521911dcfe77d57c3c81463a SHA512 5aed180dec326ed9ee2fb90dfd94127ee5f75804f7ce7fa0ed5c7e1f0533215690553551da44c055f9ad47170ca32971467fb378f7328a3c22930832388eed75
@@ -111,6 +114,7 @@ DIST plotters-0.2.12.crate 3194754 BLAKE2B 21035d561321bc66b47cd3a1d3374f4e11d49
 DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST proc-macro2-1.0.46.crate 41954 BLAKE2B 3bdc274c8ada8bf1a84d4480b25e0348f4ec5bfacebb74da144a36d4dc0efeb341fa24525e7e8408c3589013a048563a46f1e094944afc1726e594534e2455fa SHA512 1c2ae8dc4bebeeaa4af02f8edce18b3d159109a1639d8e9f26be2b7023ade9d09824ee0f2a60ae034967d982158196826fdb989d23a4b3bc81188a9a63e18cb9
 DIST proc-macro2-1.0.54.crate 43485 BLAKE2B 24d0948e1e3662dbb3f9a548ffeac2be629134018bdc4a49d6e071d7a1567fc37aa5f795a853ef6b97d4768a9a4b7d72ec407f6f172cc295fc68a40825ba37fc SHA512 e900e0f287aec10eea4287c63e328252284e88a70f111ccec5e42edca21131a63ec37f111b435b39428c2f522fb11eba1aa8330fc56400ae981256727e7e0a6f
+DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03
 DIST qlog-0.7.0.crate 20584 BLAKE2B 122f4b5b669f1c658e408d48e4e4f5c9cb76a117ee361022c8b7da3d818e7821f352d6690d338ab702243c949ea710fd312257048fec80f927d0906673d99bfc SHA512 ed6435a38f77c6b9d13d35569395f1b50d04e85f2b2f8afa05ea875c6a0bdc24d160d1b5c04a5c8c1c975dd62ec201f19d1c512f3f98646d4f9db88738ba4361
 DIST qlog-0.8.0.crate 20596 BLAKE2B 263e63cedd99eda5f591090d47e70ecb5098bcb6f2be2ca5c518b9256b10cf30750fafd87c23312d1e5a7b7fe064f9bea08f7f4facb5572e25010b6ee0cdd46c SHA512 66ec87691d4d3ae5ae5aba48948106c82523657601da1229f3b86a6a846fe8ee7c2c159fbfeba96c98e0633bedd4b5d6ad30757541f57fa62573558987c2a744
 DIST qlog-0.9.0.crate 20776 BLAKE2B 538dae847ef048897c8e8f413ccf3296f894743bd2ac2948aebb93327ae6be2c1b03477b256bb4ed31ac865bd2c9d3db62583282e95a0e496f5c6e288984a7ed SHA512 f03c8a686245930fe5f2901a270b40f90139bc6641a347045b2f6f88c4c92805f2dc58d72942599adcd66c4acf330b4128fe93e2f109a0e3ce4a3721c206b24d
@@ -118,18 +122,22 @@ DIST quiche-0.14.0.crate 3616806 BLAKE2B 7379c6aa83dafd8948820e4ed93409516daf133
 DIST quiche-0.15.0.crate 3663943 BLAKE2B 9c99326efbaaad7296f758cb63f86b7710b7e684602085ffb11361b9140fdcc47dc8b6c9113151af07bd8cab774683a0d26215106394b528bf9c22b8c13dd510 SHA512 1bacdd7e7a346379ea0a50aff77d27df0ca5398d4035e2013782e0c210d5e0e73c41f223eaa5001263c5ead897cf402fadbd69ddb271891c1640f437d9b0de2a
 DIST quiche-0.16.0.crate 3665045 BLAKE2B 4c5af3021e16ececcdf788a18695547bebe0ba56d8a0407f52feede1ab55ebc5804dba80760a7ce49a3e905fad17dde1ab5c1bd781b90bed4e9c8d87b4b8a5b8 SHA512 b31c1acd09684d1fc14f089f4b4eb61a68fa0edb405929722b6f608a9b3204da187a6d9b86e7e8caa94f3db58ba0e81f26ac62cfa3b5f31b5704b944b784be24
 DIST quiche-0.17.1.crate 3677481 BLAKE2B d7e39952308f0e0e946f3923c663b2684f0a10413f070bdba27128b905607c4750e05c8d76c28cadab27b2ae4de5f9d8709f7a67a39c5f59128e02b09ab54150 SHA512 a75c43ef4f7a4ffc0f8d33a76cb62f8131abd3d8a62f9ad15efe3f137a02f4ee6d30e267fba7467aa93901c32d7e4affe5e8eac2179fd70f25645076ff064304
+DIST quiche-0.17.2.crate 3679915 BLAKE2B 316c854e8d15d40c5e76a042bbc40f8a9c507850f7ed38ff30c8fbccd00a3cc00b82bb05013240599e8041b83f8f0f71e17f04f3a924932d878e1da4a3655f28 SHA512 2b0a56a6e03b9c521ceb4a456aeedb7a1edef3cc477ac569ba3d22c2913429bca155427a1341119ca4cadd605afb896cf2fd0145998afb45054fbfb9b3f79479
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
+DIST quote-1.0.27.crate 28416 BLAKE2B 68715000ad56f93c573ebacfbad0987054ef7716e10144cc8de47636812271060e3aa8f0754d105abef46a27024cda03a7054f11cbdecf110735ef845dc59a31 SHA512 5fb5802aa667c60d1a721766081b01bfd6cd929db7a5d71cb74627c2325f7108740752e514db73fb3612c163840e60ef2d4bde31c41978f3d77605418bdf2b4a
 DIST rayon-1.3.0.crate 143294 BLAKE2B c52c0ca7f3424eb6c251f91a4a8f556ff40120889b91fb0e4dce36401cbc653310c16393c12b73b29d56eb04846e06c04942b7fd41173cd8fcd8dc11046163f7 SHA512 176af1a8148026954e271ece820c67b215223cdf11b80ff4e3229e4871ad87ce9c21c0b5b5c9f1c9e8063102ed0722c3e5194c13bbe77d8688fdf81e0ba8a599
 DIST rayon-core-1.7.0.crate 58306 BLAKE2B ffcff7e465267a5c360fd92089787281fd1dc07af05cc49b62dd2030267fccb31ea7590509d2af8b7e7a87df9f23167358e91044bb61062bdfaef790d2a4684d SHA512 7bacda8330518c137b433ac1f7f65f64aaf7939d7fdae1c8263bdaefbdf6734003054a1fc7acf73d4e323f27e9f152f273ffb7388abbf6cca0fa2357f1362e2e
 DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
 DIST regex-1.7.3.crate 239886 BLAKE2B 8d9413178b626b09243e18a1c5e0336cd41e05659128d4026bd551df0c34b9e141e36c3134f3b22200b18828ef89082a08515047159afb4f4960e5fa840fd54b SHA512 f7e8dbcfaa10c2443b9a6dfa514edf0e149d33f1a135e4a828adf97dbb0f1af5a4b58a2bad75ea8cbecb9641f499b30ed06b8ba60c7eaba79409ca18ede85e4f
+DIST regex-1.8.1.crate 248412 BLAKE2B 4f1355104def09ec8f7a7d604fb08d0a39af36cdbb5160c63329e8c06ef2d2ad1063fc7280c90ba3748e1766b65f52fd6da24e439d5262209a6137bcbe2eda9c SHA512 fe83c2497b786314cbd9ead0d85a39ca87ae92225e444a41ba381fe80aa381a88806e2c20e1c468b8b59503fdf1c2b7e5bf6eaae0ddf9f14a70c1ca2773e8830
 DIST regex-automata-0.2.0.crate 315947 BLAKE2B 0edb12b2cfbd4525e2d71edf8348587315b2355d4effc9d9a40c156b527ee99e54171ac476c2d83bf44035bd8b52a3ec4c1c1b59c58f56993a12fccb49967768 SHA512 9af74b3efaeb65a06fa1dbb848354c7a2a236821fbcdf842e7370834f92db25ce16137f62301a23ca2d809591daba721172f7823575978bce1e564f91d4fff98
 DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
+DIST regex-syntax-0.7.1.crate 339705 BLAKE2B 59dcdb9e0f5a2008db491756fb353745bf4dbaba0d3a8a6782960c990065e1870cc120d7a7e220991b78f89053aa63b1a9c326f5ae3526d47679e4ae30ae5e66 SHA512 ff61e4a075550fce3a16e516f8222a489dfe2bdf9431220c98c33b1f9e6b19da7bc1ca6bf34031235d6f1ad06882b63d606874a14d2e27c615701ecc2f4cdd9a
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rust_decimal-1.23.1.crate 113153 BLAKE2B 2ab370f5999aa5fe60bd3cdbaf9f7b4a4286090f5e047acf6075098a71cafe16b4740b3c30847833c91f31815868132f58825d1fa4b269c1e4ddf1be30e150e0 SHA512 1283af81b2641d393d6be6bde33bc71d8e6708e7da8e59718512047c9439fdef566232e6a806a1de6f3ce87c4d74cd91b1da538497fb8b93b7a110c237d2659b
 DIST rust_decimal-1.26.1.crate 117921 BLAKE2B 0b6bb3f33dc10e63341b1fea6d893a2b6fccb7d10e900cb758ba8c138d07836e9fbb97615b5c805ad33a4723ba10cb9a321dbb5eb717291da6f1c5779c9eabbd SHA512 776051a651af1c7bed2cc393c1538fac1900ed947e21f6846480b2f93b1ac651b6a4b45c601f1a8b33c6a8d255b798c4bbed4a1cdd4e79ddd0c0246d03bfa46e
@@ -147,13 +155,16 @@ DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
 DIST serde-1.0.145.crate 76568 BLAKE2B 2d38e4ced18d204d8c36122ad09fc00f0378c7e9014d3bc67fb7c3e5ab0f923aeabb6a5fefc8699e80e220b12601d01dbe3ae5267a124164bee2e4d9897aa0fd SHA512 8146c39249ad54028717bcfd916fa5abd8b1ddaec54c4d0de485bf10cb6a85676a53068a07b9563e1717fedb4746ef672ae0c285a8998543cf92d7a157f2d442
 DIST serde-1.0.159.crate 77014 BLAKE2B a377be7b7a0624ca9449d962693100d4ee892a252b4fe1326dee2057a214029ecacde05aedb7f0adcebc9815e6b4ea7ec2096ef4db4c55526defdef88a20cc25 SHA512 4e5373b940b5328fabca35759e8a02816c89692b83996c6224be39365b6409688ef2db0eef24219381003133a31da93a41b500a76aeb1b84c05df9a91ff4844d
+DIST serde-1.0.162.crate 77030 BLAKE2B 27e6a9bfabcd66a2250be36ac9987ec12a864c15eabea4bb793f796a19d85db097bf46426462fbdd22ccde24af3581638c2e14634701a0b14a3bfcc624c40a8d SHA512 e9b112999b69a14f1d05cce985448378c889a497dfa00f86e0c611b17d98fe7d942e9142fdf8c95c6d0a32e2016b3f384b52efae3bd75012c12299b02d055578
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
 DIST serde_derive-1.0.145.crate 54860 BLAKE2B 0c80f1b8844e044bce28c3fd8e46ac732de21736622fd7b2235c41d9a909d7ad224e8e7ba5fa3e5de2cfba5e48a4116f97e9b7eb31b0201c01bc98d40a78d16d SHA512 267389f8cd6d3a7b7d4a4d3226346999294e2fbef7446ff1cd1183dfb4fd17409f5891f6c2cae113b79cffdaca07f2037fd2f4108f93723e6baa5153bb9a61c6
 DIST serde_derive-1.0.159.crate 55039 BLAKE2B 6a239fe8b045c5d61e3503186325e2e4fd3cdbd13e6727e79b673f894f5fdd0872419b0b0f6dae97b9c3dbf737b41bb4816e92fc6a0efa0487350bdb0a8dbb7a SHA512 ee05d53cc4e7a36ba6073cf0be235ff4606e26430ab2a25379a6b915378c8c76584ba77b2fef8125edacf4effffa37adce8e51109e3f5bc6f418987de90fa574
+DIST serde_derive-1.0.162.crate 55076 BLAKE2B 1d83bd6a397b27c412f07462e4898e4aad2f724acf5d2d3a295efa3b311bd94186aefb2bd2ce5b5ca74e779814c87e694b005ea25a65695388d4a30bce00ff32 SHA512 edd1bd42b130df0625cd762a827ab44ee49420c704eb581205f6010270550a9f22eeb3b658a52645877537d29b81b324ec209f21aa3bcd09a2749007b27cde4a
 DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
 DIST serde_json-1.0.85.crate 144635 BLAKE2B 03d2de5563c8b8e9150b656b62329a87a5dc42c1fe389e40291a3b2a7232e2342b6e52f6625ecfaa8cde4420017a0db82b2ef332f82f2fc1caa50b98e544031b SHA512 b9ba5c8f5e5c977d31c720995317c99486897a064993784e8abd4e35e0c9ccf20d421552b4436cd88420b5e6fe1d7ebc411bbc2e803cf1732e133c29365834bc
 DIST serde_json-1.0.86.crate 144680 BLAKE2B 666aa0fd8956966aa4bdbfcd88699ae3ab31ec4ad3041c4c3c7b66a86b79829c17d937b0d558a0c34754e10b15cc2100c10e5479302b4af3efda73df73287845 SHA512 86922c40ce32f03c5128e899ce161e186dc35decd3e0672ed347a82f59452f2a3ba0284c342548b17e4b8dba7b13a3d98749ae8981c725ee853537f6e6b40092
 DIST serde_json-1.0.95.crate 144618 BLAKE2B beb05d7c37fcbacf4cc7dc04380e818a144a81e20e09ac9aecf6488bc18b142713bd1e9c7bc2ff4d10dd2385ccd280207cd992380bde4616db54f0852141eb0f SHA512 ff9f3f9e9a0e07956923bbac02288915c31f5ee24fc618808bfd4aa4b36ec40ec8d0e4426d926bdbcd019c9a4a6608dff5a651bf92dc5663eaf69c7c060223ba
+DIST serde_json-1.0.96.crate 144652 BLAKE2B 2754e63479aa07507015dcb0f989d6447f5b2c01e5f02cf8a843d90c90c6fd0acd3ecb68d80d76c249efdabe0bd0670649a9e576269928d2276ba00a3153131d SHA512 39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e
 DIST serde_with-1.13.0.crate 108768 BLAKE2B 62725ef3df86036e10607ba28aefd69acc07476c82e3cdf78240fab0d89f185c33beefd06170998f52cc7097a928c349735f8069d2b55240690641d22cc50a1a SHA512 7dbd5278e51167e08fb0a07c3aec7a90101042f088ad3b27bb15c4bb56481eb0e51d0283ae7f07fe8154c11b0bd7d44cbe8e4dcb8db1295a2d4f18ab7f82f1df
 DIST serde_with-1.14.0.crate 114325 BLAKE2B 5681438f6e9ce0032a0b0bd224dd4ee9680a6b4818a93cd8e7990e2e88b1425f81540de6dfe71f5162b8ea516c44458d5f095f815e86079e3dc011880968c685 SHA512 643183189980641b904fd181a699faeebb95ce1eea4805cad8ac72f32a2d47dd4aaaf146f7489c0a062f7867076860cae1aa73e12cb96d542fb0991231a51923
 DIST serde_with_macros-1.5.2.crate 21426 BLAKE2B c20e198b3657516b30601dcc8d9a1eca54111644f42922ea18542c16ec8084a6b31bd318b1de9da3181ebe9050f58d119a95daea05b375d87ee68def69213bf4 SHA512 4619ce9f35b7659f5641eb3b3891910a7780c76911968b53cdae9fc6b03ca66643157707c67f6ac5d16f657d7f3332671430e828d111d7fc8968683523b93fba
@@ -172,6 +183,7 @@ DIST syn-1.0.102.crate 235699 BLAKE2B b29d1b0ab878eda45c486bce03e1b341eb2c697182
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST syn-2.0.11.crate 240090 BLAKE2B 1ca46012558a3f532fd6c6decc269a289cc39c408809e3e94e36e305463710fa475f61a38022ccbcec4f40103e06cbd5ff6cc1d79d360cd7bf49730eb2b8af17 SHA512 8a32974cebcac800f072eb1212752299b61ef591ceace3bbdcc570f2e2264193467636bf98176360555e19e59a5d3e5fdec8dc44ad29bf1fce346effba3c9e50
+DIST syn-2.0.15.crate 240785 BLAKE2B ee2a2250e7083770f8fcb5ac0b387a28bab041e56dc9a835bdc366d39830cbd464aec156b47947331864220d78856f74e94c24061bd0c4fc908584efd355bce6 SHA512 19520d13b417ad2cabaf7e31f45271d41f26158607d0ab21e76a04e824133c64f4acba0f8c044c675028832563ed7cc73fd88d519520ef3834008dbb3d04663b
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST tinytemplate-1.0.3.crate 24781 BLAKE2B a965579d9551968f5134e2892595abb01950346fe083a32234fe7184d86b1003ed1a71800a1ddfb2eedd2f3a56baafd05eac5a34a4adcdb1477f5cf510027fe2 SHA512 bb3941d197e3d3f98709d2dfee977a35040eb50217fb017487aebec6d75e53d08cc281ead712bffa2ac606a8bdcb9e5e064993c2bf6e0fe66b1bd3d401ab5817
@@ -200,22 +212,28 @@ DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032
 DIST wasm-bindgen-0.2.80.crate 164576 BLAKE2B ee581f812bdab9dcf23c73ce25afa6aafeffb7b9c70d5a64539487548efb290bfcb94cbe5af6e12b5a5912548ae0fc6cc3168de4a5ab63b3823b6b071d41161c SHA512 928fd6575217909a46f23ea8147caa438efed8eef31d1e0d75610fc380c18d7cf51cb74c7d5c83136d36433fd19bc9256b6566c2624a4008daca1b3e155aacf1
 DIST wasm-bindgen-0.2.83.crate 169618 BLAKE2B f6158596c80a0385bee0a05bd9cf0b3beee83a7958efb40244956b4fec2c83baa1a1b4605eb604f313db3508a7911c78f645acbb19f6fc93eef27e9f7f0ac109 SHA512 ec93d1334417d0329e113d5f2da7f16c0f1209d71e5cbd21a2dc9278d877e70ca2327ff7863b40505504883ed51d6bf20dda98c22ef44011a47c604a7b44e82d
 DIST wasm-bindgen-0.2.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d
+DIST wasm-bindgen-0.2.85.crate 174067 BLAKE2B d357495b027af755c5dd3246547dd104d5a21c7210666673ea13749769dfcd1230c92f74228d3e93de56d8b4a6fe0a5afe2f8b2db87a5bdc5696a96675a7d8e7 SHA512 694b44a2f20a6a6be5a80bed28a0ac15cfe34bb4f1953f34a79d3ae65cb53603d85d4b803082f809adf560d019297fbcab133a91e724a74682b607f6b386ad34
 DIST wasm-bindgen-backend-0.2.80.crate 25741 BLAKE2B bac730f41a17aa963bdb005bcbce76e988b0c163fdf1b117cb3bf838d7186b732f81ce4edc068c6e3d2934802c974e19f1d8588ff71310462a189b3e5b9d4653 SHA512 20c33664f194dbc5998093831d8ed0eae82cfa6c90b8c3b9338c4f32104594a8864c68a51ee3e39fca1eba166b241a9a8e508d5f942791d727deb2decd9056d2
 DIST wasm-bindgen-backend-0.2.83.crate 25620 BLAKE2B 3cbba20a2f5344c0ed2791de7b04ee294746606289ba83a9c139b53b56edf31eab8d3b3802cec309d5395e2404bbd75b7fab5d748a9961b36906fabeb0e66493 SHA512 dd1b65733e4d0a198d61a5287bb75db3e03ef738d2c2dcd3ce3e873c27d41c90cfcbb775ad40b2a546190db8d7213e5866f8e3f9913c28fe4b43a49054bfea44
 DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058
+DIST wasm-bindgen-backend-0.2.85.crate 26795 BLAKE2B fd5806707e8422c13afcb031c66325767b37c3e7c8ed5286b8ef23ae3e6c227ed9e8502a4bce5841862f458b3febb4e0305760e36b5bda9e62802d33ad41b673 SHA512 8209be40cbbd5018f4740e3d927e7ced03136eba13d72739700928d51e840952b6180164809bd0273c66b8c39761b34cdfb9c51cede0177092dba9dcc6f88b7e
 DIST wasm-bindgen-macro-0.2.80.crate 11805 BLAKE2B ce070eac93a0cecac6d2e303f40b9f9784489133da2cf7fabbadd57afdeff5966308481276d4375150f0950fdbee165f466b4b099f0932ce26dd02ce6007af10 SHA512 816922762591e7ccd07d9bab1f089d1d0484c04ca4d8b9060d432fabe4ca28a6b6f0e701129f6d0a3fc341b845115c2dd1bea3bb67493234a73f7cd2bc0c66db
 DIST wasm-bindgen-macro-0.2.83.crate 12075 BLAKE2B 3b358ba7c2a3563840f54f11170cde78044a8f087659daa7c784fa252f5dd4b7f6200eba425d95b568e50fd43c04c32a509994ddaf5248120feaa67586402150 SHA512 eb83e06f998e858cf25494c1d171984269e72db798147d4d1d8aeeb25ea7a35c5986b882011e131968621742ceecff976430856b4e8b7d7fd7f1237767cf01b4
 DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43
+DIST wasm-bindgen-macro-0.2.85.crate 13884 BLAKE2B b5567f7989248c131ab910759661d6360acf8db6c7232c6ba5f31644dd25e8ac28120b81a22597af62f9789cafbe7996c48c3a040c6d7802652934e846359eb1 SHA512 e670134adb61191deba5dbdc062f7d236bf7f39b6b6b676e2bf274738406e388ad17dc29ecd47eaf5daf7603009e51770c67a0420a327c2f1d2d8ccbf233e829
 DIST wasm-bindgen-macro-support-0.2.80.crate 17857 BLAKE2B 9f51e4193f64088d95079a105164c75d2397f07846bc8fb29bf7f9dd3747dd7d4d6f3b340cde219fbc3b181199c8f1aaf62317ddd3ce8e7f25f68b2d5ffbd514 SHA512 8d4a68c363dde93d9644f30ab69ef28879e8c354e41e6ed1d1598beeeaba5bb6c8e6769fac5404faf438a90d87fbdaf9bc9b4d082dd7b1986f789d739f7b5108
 DIST wasm-bindgen-macro-support-0.2.83.crate 18530 BLAKE2B f305c9fc1f7bba5bee65a1c76fc2216c98aa306a072286e1ced048ab191f49e7e4436bf2f67d4c1fff558f59b2cef5e9b40e9e940268128ab1ebeb3c64696107 SHA512 804014c75ae5f8c1c7f0fad3f3209887fa346d74029e5f6e1830e44f7318719e65c4a643c71d87cf388f131fd370af40d536bbc15fc11c25b91cb785f56a908b
 DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5
+DIST wasm-bindgen-macro-support-0.2.85.crate 20028 BLAKE2B fa01bdd55368c6da2035304a29a374580f0845dc4acab245e3626168572b2a14e72009c2530ac87c3088bfb89b80b3a9f7e1c2e0fe334cf208981583bd63bd20 SHA512 5e828cce1d57b4d39cb8d7436398d9eabf76a4865b0d2f9d9d28f9c86393aa481cdeb3d82c80053eca19f4482f17c740b6ea43c41280c92466aecc6aeb480832
 DIST wasm-bindgen-shared-0.2.80.crate 7204 BLAKE2B dd955b920bb74d96734b58c3143a10182c64ff5d4c1cbcdcba909521b45c0f97422c3aca2894722d96a226884a7c334b06649ca7c1cb2e7b08c2cac5acf53dd5 SHA512 c170759d46e12edd41dcafc908caa887756a811006a178b3bf5ae73f73556d51fa13fc4a0844e28071d21c177a1d98e1e2f6dcac41dc240b972b697d36d74203
 DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 4dd1cffea1edc98dcd4993bf6fdde8100fe00d1e97322ce8bc0bdefd0c659047c8c726e5da27b59fd7a6621c1e5385c18204e834c6c6fd1fb9de52f95b40e40d SHA512 2bfc1a068fa41a9ecacce7bda494fc0485c57ccb102c1d76c87a42e00ad30b944b0cb788642e8339d050a0e831ce8306844a77292ab9f79ed765b65cdb4765e7
 DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010
+DIST wasm-bindgen-shared-0.2.85.crate 7246 BLAKE2B cbe821f0723271aae74f30812e21f5166ac10714f4b2397fb9a149b514f3297b86a718197369a6bdef82294881a2e2efc41469e0aa019ae994f490a71cd2d4c0 SHA512 eb281e105946e3657c0bc8657839cd7e9777711dec54a785480cdf1099fd0818c35899899250497afeca41e87f692f573f5926af075a60438754b8d9f5ddac34
 DIST wasm-bindgen-webidl-0.2.75.crate 36412 BLAKE2B 28f31c6d56ebbcc3f6efa8ba81e9402b813d75a1626f10de4202083b5f77d5e05ff8db1ced914fb888f24b4e4cf69ea159d9421f0e7eee040aaf15df9bda060d SHA512 65e51312cdd3c8ffed9b1ced0809c6f46f55bb188ed6831fce528e49af2780b8b5fc19210fa3aab254baabc3bee5778e5aaded42ef0b59da1cdec3c0fb146d3b
 DIST web-sys-0.3.57.crate 686563 BLAKE2B ddb687a252181a9198bc96da3feaea007ff188641996172293772257cffd748a79f306c24d9eb619c61a5ddcec4bb6e423288a831ff14c7b5ec6b37839b52508 SHA512 144a481ff7562ff5f96145c7db64ecc704863e2fd6c0c9afc87fe87513e5be660fcadec6b1114ed2c86da36ccd97024ce601b843c8768dd8b5c53c71daae9800
 DIST web-sys-0.3.60.crate 700485 BLAKE2B 13942a583dd8462b0591a19759a41f41fb17d2356b3bcd78402e420fdf5726782e5b4ed211c3716a81c1cdf64ce9b8adecaa3fa22756a3ec84eb7c3e12e3018c SHA512 d883363f99300e2d50bc5bf198f0fb8d6c53e5a778217e340573560ac07db26a71c98419fa2ced32820472126d6f97ad5773ad082521be0a1c9a374af9d61df9
 DIST web-sys-0.3.61.crate 706333 BLAKE2B f57cb14032e2ea01b5e0ffcef0988ee3e8227c1da7d27ef8799583f64cddb4bcfbbb145f5ea1889006fc9ff61d42b1c02d4b278d67371c9d914827113f5e4128 SHA512 dd8c93a92295a9cd94a4a4cac4a81d9fa41c2c0bc885c1861eae5cc317a0d55e1a9d34b97b91999bf617a071f7f8acc39bb0d4a684b40543519f0cad6b82a25c
+DIST web-sys-0.3.62.crate 719388 BLAKE2B 210f5dc9b098dcfb32eec229a07f37b3f3cfdb38eadbd022d9fb1bf14ad01931bed1bc1f7bd61314090fe7a55cece0b50d16101747634091e1ddb85e7bd01ea6 SHA512 9af591bb9de54016ea17a127f0360a3faf5b9e30880e4a398b11dd859b52ff07d2594524dc0c27ba5724fc10ee2680ddc11011cf3ee35bd40c4fd56a41a8c025
 DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -243,5 +261,6 @@ EBUILD quiche-0.14.0.ebuild 4813 BLAKE2B dc4626b68bf895f48089d35a8003f98ef6c5f6c
 EBUILD quiche-0.15.0.ebuild 4816 BLAKE2B e63aec2b4428810b778b9ed9abd55979fbbf4c496f3159497651477d1e94618a27558be2e4b0a65679e818e543fc0c24722930c700de62964bc592102bbe5dc5 SHA512 36273bebc26619edbca7ae159db767e1ddd12e09ea4657efa24ef20e0a17cd594a21653f76d0a9645cd1daa78bc1ffe7f8211513202a28fae4db7f59cb07123d
 EBUILD quiche-0.16.0.ebuild 4816 BLAKE2B 1070b477e723806302584c28001aed68717950548fd8a3d197bcfcd189923dba81ffb23ca97b48241589f3c136cc8cec693bccfa821767b1ad224ff38d190391 SHA512 062eefefe6d476a018217f02461bc4907a17f73a3f827fb41f765682583da9b8bd256be06f28895cfa52e842c8851c6d62a84130e1102144893fb3d227938a6a
 EBUILD quiche-0.17.1.ebuild 4914 BLAKE2B 1ee232217e7d61c7af545d4970b09c652d4c2a4172c7522bf1c82ea5295c1305929e830bd99411db344545bbd312f8622c241743e2cf0f433522bf30105550fe SHA512 9c9ec497c6f68d568be6d77c06a8b3a18c17eebd9f24edef06a216b77fe391658bd5b88dde3e11614a54ff6af76da978beeba81365dc25f6bc4fb69c70fde667
-EBUILD quiche-9999.ebuild 4914 BLAKE2B 1ee232217e7d61c7af545d4970b09c652d4c2a4172c7522bf1c82ea5295c1305929e830bd99411db344545bbd312f8622c241743e2cf0f433522bf30105550fe SHA512 9c9ec497c6f68d568be6d77c06a8b3a18c17eebd9f24edef06a216b77fe391658bd5b88dde3e11614a54ff6af76da978beeba81365dc25f6bc4fb69c70fde667
+EBUILD quiche-0.17.2.ebuild 4913 BLAKE2B cf9bdd9585175c7a73cb1626a5533c2c3778bb8615a3ece5ec1450a83eed1d3a56f3c175b644859ecbda0d6e659c4ee222eb7392cda02f9f9c886929dcc26312 SHA512 5002304cdf1ee73071b5dc52a4a2f132fc54132d5cae035815d8427322056ea5e2cd5c97ebb3f56c61e64020167b81dac588b84673171da71a8c1c55ea170022
+EBUILD quiche-9999.ebuild 4913 BLAKE2B cf9bdd9585175c7a73cb1626a5533c2c3778bb8615a3ece5ec1450a83eed1d3a56f3c175b644859ecbda0d6e659c4ee222eb7392cda02f9f9c886929dcc26312 SHA512 5002304cdf1ee73071b5dc52a4a2f132fc54132d5cae035815d8427322056ea5e2cd5c97ebb3f56c61e64020167b81dac588b84673171da71a8c1c55ea170022
 MISC metadata.xml 331 BLAKE2B d0c7e9933d0377d9aa5c8c4249c3171ed475025e74cb36354ffea5e184acd2ca7239b577335c86bf48a456bbccf777ff4c4229f5c676f35bf3db41c52cdc0637 SHA512 3604e6eff391505fb81b215004b6e8ca4b240ee36413fc96b76e044dab63cdb1df2dcb55783a37e828c4a330679297fd6f58e4f53da66c29d966e8949ce85093
diff --git a/net-libs/quiche/quiche-0.17.2.ebuild b/net-libs/quiche/quiche-0.17.2.ebuild
new file mode 100644
index 000000000000..84965a5e45d5
--- /dev/null
+++ b/net-libs/quiche/quiche-0.17.2.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+anyhow-1.0.26
+ansi_term-0.11.0
+aho-corasick-0.7.18
+arrayvec-0.7.2
+atty-0.2.14
+autocfg-1.1.0
+backtrace-0.3.37
+backtrace-sys-0.1.31
+bindgen-0.60.1
+bitflags-1.3.2
+boring-2.1.0
+boring-sys-2.1.0
+bstr-0.2.12
+bumpalo-3.12.2
+byteorder-1.3.4
+cast-0.2.3
+cc-1.0.79
+cexpr-0.6.0
+cfg-if-0.1.10
+cfg-if-1.0.0
+clang-sys-1.6.1
+clap-2.33.3
+cmake-0.1.50
+criterion-0.3.1
+criterion-plot-0.4.1
+crossbeam-deque-0.7.3
+crossbeam-epoch-0.8.2
+crossbeam-queue-0.2.1
+crossbeam-utils-0.7.2
+csv-1.1.3
+csv-core-0.1.10
+either-1.5.3
+darling-0.13.4
+darling_core-0.13.4
+darling_macro-0.13.4
+data-encoding-2.3.3
+env_logger-0.8.4
+fnv-1.0.7
+foreign-types-0.5.0
+foreign-types-macros-0.2.3
+foreign-types-shared-0.3.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.1
+hashbrown-0.12.3
+hermit-abi-0.1.19
+humantime-2.1.0
+ident_case-1.0.1
+idna-0.1.5
+iovec-0.1.4
+itertools-0.8.2
+itoa-1.0.6
+js-sys-0.3.62
+kernel32-sys-0.2.2
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.144
+libloading-0.7.4
+libm-0.2.6
+log-0.4.17
+matches-0.1.10
+maybe-uninit-2.0.0
+memchr-2.5.0
+memoffset-0.5.3
+minimal-lexical-0.2.1
+mio-0.8.6
+miow-0.4.0
+net2-0.2.37
+nom-7.1.3
+num-traits-0.2.15
+num_cpus-1.12.0
+octets-0.2.0
+peeking_take_while-0.1.2
+indexmap-1.9.3
+once_cell-1.17.1
+oorandom-11.1.0
+percent-encoding-1.0.1
+plotters-0.2.12
+proc-macro2-1.0.56
+qlog-0.9.0
+quote-1.0.27
+rayon-1.3.0
+rayon-core-1.7.0
+regex-1.8.1
+regex-automata-0.2.0
+regex-syntax-0.7.1
+ring-0.16.20
+rustc_version-0.2.3
+rustc-hash-1.1.0
+rustversion-1.0.6
+rust_decimal-1.29.1
+ryu-1.0.13
+same-file-1.0.6
+scopeguard-1.1.0
+sfv-0.9.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.162
+serde_derive-1.0.162
+serde_json-1.0.96
+serde_with-1.14.0
+serde_with_macros-1.5.2
+shlex-1.1.0
+slab-0.4.8
+smallvec-1.10.0
+spin-0.5.2
+strsim-0.8.0
+strsim-0.10.0
+syn-1.0.109
+syn-2.0.15
+termcolor-1.1.2
+textwrap-0.11.0
+tinytemplate-1.0.3
+tinyvec-1.6.0
+tinyvec_macros-0.1.1
+unicode-bidi-0.3.13
+unicode-ident-1.0.8
+unicode-normalization-0.1.22
+unicode-width-0.1.10
+unicode-xid-0.2.4
+unicode-xid-0.2.3
+untrusted-0.7.1
+url-1.7.2
+vec_map-0.8.2
+version_check-0.9.4
+walkdir-2.3.1
+wasm-bindgen-0.2.85
+wasm-bindgen-backend-0.2.85
+wasm-bindgen-macro-0.2.85
+wasm-bindgen-macro-support-0.2.85
+wasm-bindgen-shared-0.2.85
+wasm-bindgen-webidl-0.2.75
+wasi-0.11.0+wasi-snapshot-preview1
+web-sys-0.3.62
+which-3.1.1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+windows_aarch64_gnullvm-0.42.2
+windows_aarch64_msvc-0.42.2
+windows_i686_gnu-0.42.2
+windows_i686_msvc-0.42.2
+windows_x86_64_gnu-0.42.2
+windows_x86_64_gnullvm-0.42.2
+windows_x86_64_msvc-0.42.2
+windows-sys-0.45.0
+windows-targets-0.42.2
+ws2_32-sys-0.2.1
+"
+
+inherit cargo cmake flag-o-matic rust-toolchain multilib-minimal
+
+DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
+HOMEPAGE="https://github.com/cloudflare/quiche"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/cloudflare/${PN}.git"
+	inherit git-r3
+	CMAKE_USE_DIR="${S}/quiche/deps/boringssl"
+else
+	CRATES+=" ${P//_/-}"
+	SRC_URI="$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${P//_/-}"
+	CMAKE_USE_DIR="${S}/deps/boringssl"
+fi
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 )
+	|| ( Apache-2.0 MIT )
+	|| ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT )
+	BSD-2
+	BSD
+	ISC
+	MIT
+	|| ( Unlicense MIT )
+	openssl"
+SLOT="0/0"
+IUSE=""
+DOCS=( COPYING README.md )
+
+BDEPEND="
+	>=virtual/rust-1.66.0[${MULTILIB_USEDEP}]
+	dev-util/cmake
+"
+DEPEND=""
+RDEPEND=""
+
+BUILD_DIR="${WORKDIR}/${P}"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+		tar -xf "${DISTDIR}/${P//_/-}.crate" -C "${WORKDIR}" || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags "-fPIC"
+	local mycmakeargs=(
+		-DOPENSSL_NO_ASM=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
+}
+
+multilib_src_compile() {
+	BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features "ffi pkg-config-meta" --target="$(rust_abi)"
+}
+
+multilib_src_test() {
+	QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_test  --target="$(rust_abi)"
+}
+
+multilib_src_install() {
+	sed -i -e "s:libdir=.\+:libdir=${EPREFIX}/usr/$(get_libdir):" -e "s:includedir=.\+:includedir=${EPREFIX}/usr/include:" target/$(rust_abi)/release/quiche.pc || die
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins target/$(rust_abi)/release/quiche.pc
+	doheader -r include/*
+	dolib.so "target/$(rust_abi)/release/libquiche.so"
+	QA_FLAGS_IGNORED+=" usr/$(get_libdir)/libquiche.so" # rust libraries don't use LDFLAGS
+	QA_SONAME+=" usr/$(get_libdir)/libquiche.so" # https://github.com/cloudflare/quiche/issues/165
+}
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index 75f375163aa2..84965a5e45d5 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -17,7 +17,7 @@ bitflags-1.3.2
 boring-2.1.0
 boring-sys-2.1.0
 bstr-0.2.12
-bumpalo-3.12.0
+bumpalo-3.12.2
 byteorder-1.3.4
 cast-0.2.3
 cc-1.0.79
@@ -56,11 +56,11 @@ idna-0.1.5
 iovec-0.1.4
 itertools-0.8.2
 itoa-1.0.6
-js-sys-0.3.61
+js-sys-0.3.62
 kernel32-sys-0.2.2
 lazycell-1.3.0
 lazy_static-1.4.0
-libc-0.2.140
+libc-0.2.144
 libloading-0.7.4
 libm-0.2.6
 log-0.4.17
@@ -82,14 +82,14 @@ once_cell-1.17.1
 oorandom-11.1.0
 percent-encoding-1.0.1
 plotters-0.2.12
-proc-macro2-1.0.54
+proc-macro2-1.0.56
 qlog-0.9.0
-quote-1.0.26
+quote-1.0.27
 rayon-1.3.0
 rayon-core-1.7.0
-regex-1.7.3
+regex-1.8.1
 regex-automata-0.2.0
-regex-syntax-0.6.29
+regex-syntax-0.7.1
 ring-0.16.20
 rustc_version-0.2.3
 rustc-hash-1.1.0
@@ -101,9 +101,9 @@ scopeguard-1.1.0
 sfv-0.9.3
 semver-0.9.0
 semver-parser-0.7.0
-serde-1.0.159
-serde_derive-1.0.159
-serde_json-1.0.95
+serde-1.0.162
+serde_derive-1.0.162
+serde_json-1.0.96
 serde_with-1.14.0
 serde_with_macros-1.5.2
 shlex-1.1.0
@@ -113,7 +113,7 @@ spin-0.5.2
 strsim-0.8.0
 strsim-0.10.0
 syn-1.0.109
-syn-2.0.11
+syn-2.0.15
 termcolor-1.1.2
 textwrap-0.11.0
 tinytemplate-1.0.3
@@ -130,14 +130,14 @@ url-1.7.2
 vec_map-0.8.2
 version_check-0.9.4
 walkdir-2.3.1
-wasm-bindgen-0.2.84
-wasm-bindgen-backend-0.2.84
-wasm-bindgen-macro-0.2.84
-wasm-bindgen-macro-support-0.2.84
-wasm-bindgen-shared-0.2.84
+wasm-bindgen-0.2.85
+wasm-bindgen-backend-0.2.85
+wasm-bindgen-macro-0.2.85
+wasm-bindgen-macro-support-0.2.85
+wasm-bindgen-shared-0.2.85
 wasm-bindgen-webidl-0.2.75
 wasi-0.11.0+wasi-snapshot-preview1
-web-sys-0.3.61
+web-sys-0.3.62
 which-3.1.1
 winapi-0.2.8
 winapi-0.3.9
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 39720a7e322c..89c38fd3c8a3 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 58074f637ba1..465df0a0dde4 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-05-10)
+# sys-cluster/ceph not keyworded here
+sys-block/tgt rbd
+
 # Sebastian Parborg <darkdefende@gmail.com> (2023-05-08)
 # media-libs/openpgl and media-libs/embree only supports amd64 and arm64
 media-gfx/blender embree openpgl
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 8f8ae5b1c7e1..9a41708780b6 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2023-05-10)
+# sys-cluster/ceph not keyworded here
+sys-block/tgt rbd
+
 # Sam James <sam@gentoo.org> (2023-05-01)
 # media-libs/libjxl is not keyworded
 # bug https://bugs.gentoo.org/853628
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 0891cb8df2c0..e8befb84ff71 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-05-10)
+# sys-cluster/ceph not keyworded here
+sys-block/tgt rbd
+
 # jinqiang zhang <peeweep@0x0.ee> (2023-03-27)
 # Sanitizers supported on this architecture.
 sys-libs/compiler-rt-sanitizers -asan -lsan
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 254cf12ccd2f..bcddd722f560 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-05-10)
+# sys-cluster/ceph not keyworded here
+sys-block/tgt rbd
+
 # Sam James <sam@gentoo.org> (2023-04-14)
 # Needs dev-python/sympy which is not keyworded
 dev-python/nbval test
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 73b89c809391..917d329c9fb8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -464,7 +464,6 @@ app-editors/nano:debug - Enable debug messages and assert warnings. Note that th
 app-editors/nano:justify - Enable justify/unjustify functions for text formatting.
 app-editors/nano:magic - Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
 app-editors/nano:minimal - Disable all fancy features, including ones that otherwise have a dedicated USE flag (such as spelling).
-app-editors/nano:split-usr - Enable this if /bin and /usr/bin are separate directories
 app-editors/neovim:lto - Build with Link Time Optimization (LTO)
 app-editors/neovim:nvimpager - Install nvimpager symlink to less.sh macro
 app-editors/neovim:tui - Build the neovim unix tui
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 2927aaae48f4..4a495fb63189 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index e162afe66aa1..6ee82125d9f5 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,10 +1,6 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
-DIST xwayland-22.1.8.tar.xz 1273668 BLAKE2B ad1f3e0a6a3782b271653864380d0beb0db60293fb96ab8f218caaeef245967ad46ca505fb516a936115c9d49e6a32bffb725bc6c95dc98a6c4c24521c6022df SHA512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a
-DIST xwayland-23.1.0.tar.xz 1286056 BLAKE2B 19f3cee10f9b86a1ee4529f91de3125c303a771ddb00ab1d76764fec2d8d2639e20585de777741fc3706ec6e2f03a1295024cd9c582c1e4a744fa1a43d8997e6 SHA512 984213a193b903e6023ecb3144a15f483dc3e9ec7cb02c36d8e67c6859b501b8b3e5a6e1ade9cb245450ad93002322f392b81d9286377ac34350cc3ea1f9679f
 DIST xwayland-23.1.1.tar.xz 1286460 BLAKE2B 2f0095510a15eab4096696fcfdbf0cfe6814b48bd5b5666701a61bc942ce2fe00555a7d5a45cbaec2066bbbfd9b863909e0398d3d6aaab1dfc0e78d1ea913080 SHA512 21c386847135c5cb4ac884926b0fbeb6ad21c9ee54752e0cdc8418e31a72872d81032159c1d91b8afb915aaaf65e80454342461d676996b2f3c535a37b0147f0
-EBUILD xwayland-22.1.8.ebuild 2148 BLAKE2B 18cef7685e1060f847a7af995453fbdb2944a3aee5a0f516362cda8abc919c2b4b703781f0caab9cc09ea86cf9454854c349467460a1ec11b35ef03d27039a60 SHA512 0d559bb84d07b6a4d16b35c268174dfd0d4eb5ca15eef5fe0ce64187d17f9842decf40ae61d73ad8983046e66f548c698b4f10f4741d6344727402f49b0c5b7c
-EBUILD xwayland-23.1.0.ebuild 2185 BLAKE2B d3db88021aa4a3347de59b409e3a68f12ac4064ddfd6af941b96d7f7f2d5278581fc59ac2b0cc25d542723c757a0de8588028e50ddfe27b680fe20815f1c3870 SHA512 2788a3592698f906b211d237da3b20acff26050a233600e1e63a4e2c16b4c674b456368164e16af040a5bf88c02e18cbaa48c3cdbd49a78b7748bdbde86820d8
 EBUILD xwayland-23.1.1.ebuild 2179 BLAKE2B 228f4234a40c45b54699176b0165902e968021e75b284bae5afff110a3e7eb4437cd8ef651d5a98d4e47226ba87e49186118eb18a412a68906f28c25f80b60fa SHA512 2d5b47ea010a3cad00e89d914a76004bd14c001e5cdaa324ef1438a47951da51c6aab34dce8eb46dcdbbcb6f08ea1acd799c3d5cfb052d5f112e24be0c620d5a
 EBUILD xwayland-9999.ebuild 2252 BLAKE2B 33c7487e426507767c262dcd0d74aa3384bb63c2cbaf6968a57c7c259a213bbd72d4d4b6f276132f8764fd2dc42f13a9db7eeab4ae78e5e570d19cf4386f0d6b SHA512 2650874f3f640d35b8f93e73c5b3463893d1b718d713fe9c7af3a9c18c8b9025b942d96335b16d88eecdc47885bb2876ffe84726a66765515be6a675237d15cd
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.8.ebuild b/x11-base/xwayland/xwayland-22.1.8.ebuild
deleted file mode 100644
index 9fd1ecef3f80..000000000000
--- a/x11-base/xwayland/xwayland-22.1.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-23.1.0.ebuild b/x11-base/xwayland/xwayland-23.1.0.ebuild
deleted file mode 100644
index d7e53ec8adcf..000000000000
--- a/x11-base/xwayland/xwayland-23.1.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.28
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.109
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2022.2
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 4c312d8c5686..db7f9b300767 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 966af4526911..25b6a683fca5 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,4 +1,6 @@
 DIST grub2-theme-preview-2.7.0.tar.gz 203112 BLAKE2B 6279ece40999cea94c04396b4b6161bb90b060b5cc2d7573367d52d42321c9d598a839e9c6cd263b8aef5022a6296d9c5ae5919b0a228456b85e027ec059cc8c SHA512 4ea79b598342b60d1ff1f54eb27b1c4c92fa2a74c874a7107b6dad0aa0838a41e9e033a0f44a87307c0a5022c782b2fc51fa15f8599a63d2d5e10ac4e5b137e1
+DIST grub2-theme-preview-2.8.0.tar.gz 203315 BLAKE2B 1599438dd24dec2e4ea82d3a6253c3b374afebdc1cac9ab666776b7e076b45111845ccfeb683a3ca851065459c8ce6a5fa5009cc2c809a4646048cdb25c38b96 SHA512 1df944957859f87fafd8cac445191e079d6e60d6513273dacc5a18e7959b1e57045fb6ebf6acb57407dc5ab5f7cc9278f8bfc6029b11c7f42721f1a8221c4a98
 EBUILD grub2-theme-preview-2.7.0-r1.ebuild 798 BLAKE2B a7d58e107e8a5b9e9e699db21e94fd4ed0f69ff6f2f0ab82831cdee241387592cce57284c4c51f036a71c2b2ebc4117aec9c1dc8e5f0d4338885550db0a7ea2c SHA512 42538aa217e1ff6e9203b7718d9cf3b7c197220c70a64bc3f0fc48ce772ea04b34d661b7244cf2a5b40f61d73e92d1981cbf7db9fdfeed1b2ac2e9e325cff117
 EBUILD grub2-theme-preview-2.7.0.ebuild 766 BLAKE2B 16485f0f5bed807f52f5f8caa1ce72fa46e983cededf1380e798c86578849852e4ecf6d23b112b8cc436e869832d36f9d82127d4cb92f50377e4b784eefbede1 SHA512 4cc1f85e12540ebacb82d658165dec36d3eafe48aabd54f363976e96abfef99bc276d04fa4109ec48f6b0f395180691cf828566f8546525eb32b069c9677539d
+EBUILD grub2-theme-preview-2.8.0.ebuild 798 BLAKE2B a7d58e107e8a5b9e9e699db21e94fd4ed0f69ff6f2f0ab82831cdee241387592cce57284c4c51f036a71c2b2ebc4117aec9c1dc8e5f0d4338885550db0a7ea2c SHA512 42538aa217e1ff6e9203b7718d9cf3b7c197220c70a64bc3f0fc48ce772ea04b34d661b7244cf2a5b40f61d73e92d1981cbf7db9fdfeed1b2ac2e9e325cff117
 MISC metadata.xml 343 BLAKE2B 182b8001e5b2011d194d3e7780503bbbcae133841e50bfa3baefb3849c8eabec23075ce12417022f72bf446ea2917283f4ab307aa4acfdb6a9f4f1069e8b5848 SHA512 98c787f18776b403641b87ebba496bf87e607640bc78cece91702f723e21ce3cbd45ea80b13d56876748890c822be47a804534664501d34c9e03418feacce898
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
new file mode 100644
index 000000000000..e5b2d0432704
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="grub_platforms_efi-64"
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-fs/mtools
+	grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_efi-64]
+		sys-firmware/edk2-ovmf
+	)
+	!grub_platforms_efi-64? (
+		sys-boot/grub:2[grub_platforms_pc]
+	)
+"
+DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest