gentoo auto-resync : 09:09:2023 - 22:34:14

301 files changed, 1834 insertions, 6107 deletions

diff --git a/Manifest b/Manifest
index 362d1d57c175..e8b6dcb33062 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29280 BLAKE2B 270d1ba36497f6a54dedc34fe829498fc2c8be35113af791a8919b2ae3320b602b7b364c13b52b7ae9b3a20d4ad9e67f987a2adc458814caf9e1e10c8448d945 SHA512 ede77f9785a216520fa9a1562ef1f77fbdd3ff2d3c425b1187a3274adb0b4b372fd55e4bdbfd4da03fe7a1991173af662da33d8e87ac3e5b2f83badf1b158b1c
-TIMESTAMP 2023-09-09T15:09:46Z
+MANIFEST Manifest.files.gz 29301 BLAKE2B 018e67089a784e6a48288b952d061862fdea5b7bdcca8f8f3042f86f495eda3f4ce8b99879e547ba3b1e9322dbbe60aa4a7145c2df8d52c2f128112e62f736fb SHA512 bc39ec330c2fde4132fd7b6d23d76ce02aa983125e886150c155b917cad9ca16abec757bd6b06fcbc04e879ec33fcaef7a539dfb58c261dc5053111f8bdbfa19
+TIMESTAMP 2023-09-09T21:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmT8irpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmT83xtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBGxA/+PVjfjr3N1ZEilxXL9F3J4a0441S+cYP09IaBT24wr9KXDBUHhl5GDlYc
-2FZbTls61uatamJEzen75HrK0bhG/mthAQDOdC64j2grBXMwdgjGDv5gprs15iR6
-RzMKwUzzHeZ1KLBTlqng6/6Ikzf58l0EAeMcW8J4zx6Tz9GRDEuHBc+U5TOEPAOt
-7L0zvylD0LlKYJVPuVsxZTEpSHQSbyBUghFYqCrqsAFPBm5OX4pt72u35cJ/l2XL
-IEFlsTll0TW2Bkm70eY3jIcbSyrpsyhM6NBEX/pA3lnfSgrYWzswpl3Qwvqote6A
-BimFx2qsUdq12zddmqXjGQ8nuvIc6AmnEj2X6HKGzbiR0L9e0Ev7Roo1h1fVrqKS
-EV7WK/Z5lrzWR+bWAmddpf5+qC0/8mgmjzlQBjGBerlculGhjPiRI0Uo0SAaZmhL
-65TkBn0ZEAAaczrx2i5+a8DbH25mpaeEOrUzukONmA1IaNKUydvSsem6ocfFw4qC
-KHr5YTIjJQups/mpWjXfhVv6yUKiNyfglcsLZhqewGt7Pvkhbppuxah8kYwW5Wn5
-xMBicqSKrN7EHn6rott9D8aihsY7WO0xF7HrWj1EXOW0oR9XghZZJkM7ZahNsY+B
-JCP8C6M5N+xHBC+9VQvpVTPyE9StTz3gXjeJtevXSd14X/quR7w=
-=1iFy
+klCk0g/+ONPw3HXdOjVOfQ5vsFwtUbxfB+PuVl4Kfp+uxtpEFUk8tqk/17gBiQUL
+Uj18GPy/cmm5EIyZ/puIUxwZ0BRclRjL694cOquj0KLI+bAWtAgJaqR6UFtnmbSC
+mA6Hn4+oYoFUJIvovFoQbBaWxRLv4LRByNX/YxsNN5Jc/c5bOfSdlEfbfHYeZWmZ
+2UTO4Iwrcd00DcQqYV9+u5YVvS32bSxXGMlVhP6IS7CEqD1jxjIq/QDjWo+N1o+O
+/g+aWqvfe4k65FKVaLSSOgJt+4jxljGeH94WJ9selo+oFFSmhriRVBvbJSzkzceU
+JUTxot2PnonikcAatwQLN5Xavyx7sdR72DhT879MM9C/KyocoNwITzcT1rkCMwye
+sWWgPheNGUhbaYpntBt8CIwsGXbKcKUknzKM46EnG3J35ASRCckYz8CB7nFyaZCa
+/Tv/nVg0pnK0U14eqP77n77B2tZM0ubEMkdaqyffpEBEqw4tbwmSTCJ3BxC8vPqe
+T5zYILdVWOmloIBao/95y2pvQqfz9M3eULfmnECoDkmt9cWrgXqRi/i3+RvheJkJ
+YKhme6Lwt8VUwgcnZ2SBzEh5Qsnw0EeAhRs/dM/ioQerKPnJTBKfw8x6Xkv4nPk3
+Pi5VK/eMXAz0vFLbSra3WtVdF80Rdb4YLESMj89a/1ViSqb/MUE=
+=7GMQ
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 56dc8c4bf89a..b39c407de8d2 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 48cddc080915..70ed5d851029 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 15bfb31ac17e..9d4ea081b870 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -3,5 +3,5 @@ AUX p11-kit-0.25.0-fix-C_GetInterface.patch 1410 BLAKE2B c15a8950a73cd9b0a656df2
 DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
 DIST p11-kit-0.25.0.tar.xz 958940 BLAKE2B 6ffce977f86c516a327afe50f4cc5a36e86ba7f43c6cb555db419d9e4ba7543a9f1847ba83da348cd6d7bbebe55dfa26cfe3a3aaa3e1d5420a4b8dc6cbbff088 SHA512 e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe
 EBUILD p11-kit-0.24.1-r1.ebuild 1667 BLAKE2B 75be06aefb5adde36d1009778e221f09a3a1d6b2fa24dfe364b7b04c514decfe3473a998114a2ba6f3d9d3c96cfca7de1f2a2179cb441ed3bff11ebc13c03909 SHA512 3fde1185e77d1a04b268bb270c62b00829984f1f2a8ce9f0ea704efb4bdfbe4bc1be2750bf210724cb2bb46775eab03a8c881cdc397afb37173ae125fa038683
-EBUILD p11-kit-0.25.0-r1.ebuild 1433 BLAKE2B 20ab41a51f607759ccada59de661667f766f515ced1ba6927f50f52866edfc22a95a7dc790b2dc3721f6e989161fa32cbd91787ce8cfe86c1751353dcf589d0a SHA512 3f954712703ce1f85c231e9a1177bbb235c0f0f58e3e6c561bd0dd5be89752b105a60b2c3fb467cc476ad6d866b31cf8ded37353b472b9759125675cb5c7320c
+EBUILD p11-kit-0.25.0-r1.ebuild 1425 BLAKE2B 9e9b0b01a2befbfebb2e6c9bc3be306478b730174f42b9a057c497e45bc7944994b292ba6ccc2e4e3b7e62b7e081507ee7e578f708facd3de9d5d1c63a34943d SHA512 444036cc4a421b8567ec3a2b4d08484dd8484249d7c4bfda4fd567f261c6387a3ab87d32e7de4c1347cfea3c57d44d85c4387f25b9fce067eb053b5de0cd687f
 MISC metadata.xml 382 BLAKE2B 9ed935e598f60088af1877e443371ccb2c70fc397b21702cb4c47a971132c8a912763bf6ab0d27a3b1a387df39542ac7c5f59345a123808476578878633ed938 SHA512 97c120c9c10d8ee73162beb9970f07153f10b095199adee814459754a3df1414f25b8faae036a19f165a45f8ed4ad0a3087272139d69326018450006b75047a1
diff --git a/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
index 5f825eca4cac..f1af80bcb047 100644
--- a/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+libffi gtk-doc nls systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index c377b29c2da9..054b92c7b4aa 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 5d3369f4a640..abce00c08214 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,5 +1,5 @@
 DIST featherpad-1.4.0.tar.gz 1105701 BLAKE2B 31311a9862f64554d57bc6c0688e5ec551a331f6f016b0bd3ab53225afd050347cc6758199ad17ebb5d7aba44b88a971f1e754d8ccd925369e09ed6639eb0131 SHA512 eb3f13dbad799d3a55a8c048a94c2acb2b9286775e75aec482f475c792e2b74078fc4d5cc43def8ba7b4f592ecb5b684c5890629edca5a488ccac336021cb7e8
 DIST featherpad-1.4.1.tar.gz 1109511 BLAKE2B 127f0b18252ac020d6f66e315090968825e7a67309e3b5d66b8f119975f91b273973c9ac1b8a8c1bd46d2eece43df649eddb7b838d79fee0f5ddc2d4caae3fb2 SHA512 485d6e731ad5927bb6fd4499536d45b40319eff5bfd8a9b1cd9acc063dcb5fb35ced033e2e5aafa60c6bb87426fb1cb95fe5d78ffb5a2f361702d23320508ef8
 EBUILD featherpad-1.4.0.ebuild 769 BLAKE2B 0c3e2b01cd05356f1bd3823524a254393f063c09cff421a746278e41a578a01f037757ddfc4caab3deff193d6aa3c711fdc99ff76ecb6edf36027723c47eb33d SHA512 8152b35f8e1a66dc7e1e225c6c14130da5df5072bb239cf19a267772e07f26ca1f5a250441b113d0c0e5b4bdc715f58378afbdcce58dfa2ae5065708d3581d14
-EBUILD featherpad-1.4.1.ebuild 997 BLAKE2B 260d5929803c8f25c927be9b8181a10661a263988f6cd1121cac534b54b70851ea3c7b1a5c6925978e3ef943caf7a47a92215de3bad5c38da341be490da53209 SHA512 b94acf6c35ddfb61f4e3abc0c09ce02c6348f25ba232434b9913dfb3f9e47c0df7c2fc99b47360df69f03ca7eddc48240bb7918c98f67c784d08b8dd55360608
+EBUILD featherpad-1.4.1.ebuild 965 BLAKE2B 1b6bdb36f2f4680b56234165f9458a871cf4c8da7ffd7db5c3cff090c8ee80ce96f03b79d936831cf4cffdb4e5c12912245fea3c96bb9654a399c6826e35a51b SHA512 a793dc2c49c55533f6e85c6c1b8d1f672ba096223983ff7b60e988231ffb92907c52406cf081835a71338dd66a14fe6b8f521f65e42cf370755641f19c68de86
 MISC metadata.xml 829 BLAKE2B d6d60de9902f49b8f04e15818d2da71a30e9b54fa6c73245eabf33bdfcbbb193f017e0b3967512578bd538c7ac718b26276442e411fe934a75873fef05fd3a67 SHA512 218c520af75da8a59b2b75cf2d4dbaa3f67c63620afe69221c854c2e5815518dc1514cffe54e57e4bca29529d99b95ca83a7879713552b9e0635aa27069f500e
diff --git a/app-editors/featherpad/featherpad-1.4.1.ebuild b/app-editors/featherpad/featherpad-1.4.1.ebuild
index 69a1e0841b09..f39d1be78c82 100644
--- a/app-editors/featherpad/featherpad-1.4.1.ebuild
+++ b/app-editors/featherpad/featherpad-1.4.1.ebuild
@@ -13,12 +13,11 @@ S="${WORKDIR}/FeatherPad-${PV}"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+qt5 qt6 +X"
-REQUIRED_USE="^^ ( qt5 qt6 )"
+IUSE="qt6 +X"
 
 RDEPEND="
 	app-text/hunspell:=
-	qt5? (
+	!qt6? (
 		dev-qt/qtcore:5
 		dev-qt/qtdbus:5
 		dev-qt/qtgui:5
@@ -37,14 +36,14 @@ DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
 "
 BDEPEND="
-	qt5? ( dev-qt/linguist-tools:5 )
+	!qt6? ( dev-qt/linguist-tools:5 )
 	qt6? ( dev-qt/qttools:6[linguist] )
 "
 
 src_configure() {
 	local mycmakeargs=(
 		-DWITHOUT_X11=$(usex !X)
-		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT5=$(usex !qt6)
 	)
 	cmake_src_configure
 }
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 5aa3078e5d88..66cbec3c7952 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/lice-el/Manifest b/app-emacs/lice-el/Manifest
new file mode 100644
index 000000000000..a3c27a06e2ec
--- /dev/null
+++ b/app-emacs/lice-el/Manifest
@@ -0,0 +1,5 @@
+AUX 50lice-el-gentoo.el 96 BLAKE2B 85aafe59deed0b7fde44bc4cdd10a9a3b17fd64a35d42a9618f4e6c350543e0fd09e520eace4a822c341a11fc47155aba56491417a7e8f456d58391d6034279a SHA512 94a21da466422c4f57cf35b9bff680e822f46f258ad92e1856b4d5a7873454abbeefbce92c12018c235efa3e5c696d1b3df641e18567db221bec43c036d0a7bd
+AUX lice-el-0.3-siteetc.patch 379 BLAKE2B 0056e31198185c57c1c95a34ba408795e9f009384e1b973f6334bc4decd6030c41e3a42aa71230a411c6fba0ef834d915c391bb095e888cb465a5e75ec848bc9 SHA512 ab59b71df477ef83e3c6824ed8522c9724dfe7997b5a4c3a8c7a3ed90c2c03ecb8b56241da38dd824a4a3ca4f6f6fe72da702c19d48c3de0750a2df94d8573c3
+DIST lice-el-0.3.tar.gz 18587 BLAKE2B 5bf04f3aab3a1cc6f2729978f6d4b95af9fece7df0d44ae49e61a98277552b26ab2fca567faf8daa6e38eb44d7b446b60c4b02cf178ef6d9f8b5e744c783ecd8 SHA512 a00b68b1c54848588c432f5120f8b45edf3ef9933fc8d2e38d798222adf1fbc34dc7fe34216b12c8b42815dcb68865dafb75efbd07ec7a69f23c235c8648d634
+EBUILD lice-el-0.3.ebuild 762 BLAKE2B 811694949fdd8a86f22c96099195fc1263a81da0af3c7266d09a0348d55858a0f13fe9bf536084b5dd74327662b9fea60af6521dbb8915af2442134994b12f64 SHA512 edc3086b87d7a280044620774349084b9dff71d966507496fd9950c29d11b484b9b47d8ce3547d4da3fb39b49d77ccbd253cd5164133288923d72513367164e9
+MISC metadata.xml 423 BLAKE2B e38ff90d3ab113cfc7fcc8f162e8fd2cda0dbe462b213eecccc19899c1ebb02ff5d3191fe7a36163ad7a46cb479c9c890ed219e7d8ec750b0c2a9a345a884d05 SHA512 13d93998ea35f389f3a708eebcb01652e989fd77a6928546f6750b7ad1d99acb2ec1772e454c90c31a4b599c7d929b2f1c72b1e40c71a2eb0916a581f731917b
diff --git a/app-emacs/lice-el/files/50lice-el-gentoo.el b/app-emacs/lice-el/files/50lice-el-gentoo.el
new file mode 100644
index 000000000000..c249663fc2fa
--- /dev/null
+++ b/app-emacs/lice-el/files/50lice-el-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'lice "lice"
+  "Insert license and headers." t)
diff --git a/app-emacs/lice-el/files/lice-el-0.3-siteetc.patch b/app-emacs/lice-el/files/lice-el-0.3-siteetc.patch
new file mode 100644
index 000000000000..264bb1828100
--- /dev/null
+++ b/app-emacs/lice-el/files/lice-el-0.3-siteetc.patch
@@ -0,0 +1,12 @@
+--- a/lice.el
++++ b/lice.el
+@@ -57,8 +57,7 @@
+ 
+ (defconst lice:system-template-directory
+   (expand-file-name "template"
+-                    (or (and load-file-name (file-name-directory load-file-name))
+-                        default-directory)))
++                    "@SITEETC@"))
+ 
+ (defvar lice:custom-template-directory
+   (expand-file-name "lice" user-emacs-directory))
diff --git a/app-emacs/lice-el/lice-el-0.3.ebuild b/app-emacs/lice-el/lice-el-0.3.ebuild
new file mode 100644
index 000000000000..6cbd1e127c7f
--- /dev/null
+++ b/app-emacs/lice-el/lice-el-0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="License and header template for GNU Emacs"
+HOMEPAGE="https://github.com/buzztaiki/lice-el/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/buzztaiki/${PN}.git"
+else
+	SRC_URI="https://github.com/buzztaiki/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${PN}-0.3-siteetc.patch" )
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" lice.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}/${PN}"
+	doins -r template
+}
diff --git a/app-emacs/lice-el/metadata.xml b/app-emacs/lice-el/metadata.xml
new file mode 100644
index 000000000000..049a47d44e2d
--- /dev/null
+++ b/app-emacs/lice-el/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/buzztaiki/lice-el/issues/</bugs-to>
+    <remote-id type="github">buzztaiki/lice-el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index bacc660b1dc9..b1019be2e10b 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 2085181454c4..669d9413297e 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,7 +1,6 @@
 AUX README.gentoo 572 BLAKE2B 1284e49ac0bde0e1c1ad32b7dc200848c0837378224daed628036b5835998c9649574e2b91b4891a610188f01900922d3b2bb23fd6381682c3486bc83be9a9ef SHA512 d7312c11154b3446a66af5e11a9d8e1a30c29e42867b51a073f4460078c9a1b7acb94cea6d38bcd7fdafbb4384856cd11093f41eee1941ca43303a5e21765b03
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
-AUX xen-tools-4.15.1-brotli-gcc11.patch 1283 BLAKE2B 846d0d3b687f576bcc737a53afe2885d9e8a261e3a23ee18a5871af2bafef6fa4208f1eeb557c843140021b2144d8c51c3e9682233dcff6a0b4148122eacb9ee SHA512 2c3426573db4ab27eb48aac5736c5094c7160893ad318ebf69a6caf64e20881a526658ff6f72cacc357b615c8795a777ebc897ba586f28fbbc08dca28caaaf0f
 AUX xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch 1044 BLAKE2B 684171bc305782058c34f22a658f63ba7a7e7dfa378c4fea6ae6e1f068bf8c828f76ddd809a4188c369076dd568bb4d82672b478a8720644ddf91afa79c0712c SHA512 0442a734555475dbad75bd0a4b57a94a81b93b7ecaf41e0773c8081e78be7851d36b299a62c5a2d2486af8263cae485cc52e5fd830dd179ac31425275576b5f9
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
 AUX xencommons.confd 109 BLAKE2B 6a2023a95cd1e411abe57c321e1c5f13096b51299817ce547e8ff042cbdbf859a5c1f50135e946fe650e0ec9221db3389ff50bc23f6d88d0c0fd1805b64786be SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17
@@ -21,15 +20,10 @@ DIST brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz 512229 BLAKE2B cd86c
 DIST edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz 15245558 BLAKE2B 33876c08040fa876b4e3741fe859d113654013c948fa8a8b391955226e6215bbbe26fc484e56ba5b399d2c4e4d198900f2de42eccfbac6901e01cd73a80e803b SHA512 7d71ec3d98c652b86194607dbcab767160c708991f49f69eda1f5d844ced0c4842e849d19bf99ea09b1db523b91ced1e5552a4ddcea32b94b9db6b8f6f5c5931
 DIST ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz 3962725 BLAKE2B a8084abaf93a4ab06ba170427a66dab08e68ba1288f42ea744e2cbc66d6bd2294bee82f6d0994260d2cd60daf6a6068e40eb74fdeba2bccaa432d090d81fd9db SHA512 4ac1d07ce879a3a8c6c260380258c37f5e4ecddc880b27fb59afc38fbf3718e81b04a4dda2b58fe7a438a23175e00b6179fc067acbc4a75e33d93c4b85ff5d68
 DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490c6c136377f6dccf02c88100b0644bc13d210b4a517a8be6002d5671b0fba77120a2aca3a9bafbad5e88d037e40 SHA512 9daefcfb1c9edda4462a4b080c9bac552154d577ae19703a914928e43005e7a52edd86869c6507e94a7f0c61ce8b3e6f5dea38cd5146628cb138a130947c522f
-DIST xen-4.16.3.tar.gz 45003057 BLAKE2B 6092cff33bffed1b6133daf8d3ce53c57204297e66df6ac58266b2da8d5585df62ae718cc8afaad36ebe6dabdce65b9979b0d13b88e60f2b23c01be21ae4db8e SHA512 b8cbd6f95681de5f824ada2d3cbe0653a38514a18df0dafcf811fb255219c7abec96f46217bdb0c83e1119f685da9a6af7194eeaa94f1cc3c892702782133b4f
-DIST xen-4.16.4.tar.gz 45008515 BLAKE2B 6637cbebe76e48ca6d2ea885b9c52244efe2fa8188c1649f6a5444fd980a8bfcff5508c8496b89b8a31ba1c4e06f47047b7289513cf22fb86d2b76a77b3cfd21 SHA512 1b5a167a9f5537b5311ef1cb56e0e6ffda0e4e569ef0534e47b4f4a528067bda46fb58b2a01abc02e8c38b2b70207fb201a5d4d10274fba70135eaa8e318e055
 DIST xen-4.16.5.tar.gz 45023770 BLAKE2B 1371bd4cdf7431c16a575d4f911cec7be25a6358bbc47648aa542c6dcb27b733a8de63f9226a9290096a84df4d602186fcfdf6d255c43140d8e9373323fa53e9 SHA512 2f370787b72b2cd9d81c0b5f138133e676d2b9c8c76e31e6439649d7145242a6b7be0d51a7ff4f4197a99e3f6b24ac50e63d2fa49368da440d3f555e70c4ebd3
 DIST xen-4.17.2.tar.gz 46498038 BLAKE2B 44bb7b39dddb1dbd266a31f6e67f49e981946b78a83580ec068e02687780695d33868781b563dfb77db8ad3ffdc6fe7431ca8243650d9a08823312c430cfa5cd SHA512 0bc475483676e4aa27735695f9a8d2821059e7a55984adb8a29badb5c09a4e7cf8ea29cbc9691be616cc0d7a5ee6b6dacc59ba29c2b16e0919ebdf7dfc54201a
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-0.tar.bz2 4474 BLAKE2B aa367a4ccf96a61c04c52e415d7143ca946323d7d50d6ab16ad7a917279ad4b1aac802e35e7e306c3a244317db713e913dc8d6343717b2307ccd049adb956a0d SHA512 debba71b17be7b1bb9a70f01782c12c3c053cc2fb1f4ad95829356ee365878aad68430055d4b8c648ef1ff54cb9e3e7c03d40d14c560d51f8ac4fce2b8f82190
-DIST xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 60151 BLAKE2B 5c8a8f772ba6be5f776b3270b9f1e64df35c2be7b4e238262eb4ec6b4859576b3ecb448880e1e05ad53dbdaa71643e678978151b10d0d47c901ab3e3518b7eb0 SHA512 b33a9b2f602f18165e048ef6a339bc5bf3f800fb1f2449e2e1a6090774ce3ef07b1d7ea8e9e6449fae7b91afcc1a6e281c1bb218a56bca74ba7f12b491fab186
-EBUILD xen-tools-4.16.4-r1.ebuild 15926 BLAKE2B c45d18379d69251ff77aff43b2bf8799478811cde932ca94f7c40ae1ee93128c72ed61bf02ae19b41f6a03a30b0a788115885e3735600fe33e582ff50e5a1574 SHA512 595a9d2e72be12bd9e6feb0fb28143acfca5e3efdc70f73b5021fb1573ae851e348f2df772995cd630ff507eca805a9182750c8011251c0819cac8732651aa78
-EBUILD xen-tools-4.16.4_pre1.ebuild 15834 BLAKE2B bd4cb2cacdd47d0f20b7e017a2b741f734116b46de8e37dd8d358ec1f836dd093a2d3f656fb37aff2e8dcee516e1810ac9cd355e421a4db27bdc695bf9a65ade SHA512 71c63f2ea46678eaa385600b11586e10d178c356cc5eee8789a1b03ecf17b92863bec21a99e774959f94b3a912f3c00333f8c34e92fc218c4793022ed7d5f6a5
 EBUILD xen-tools-4.16.5.ebuild 15827 BLAKE2B 3a139b203b7d2ba1738beb285069843eef94c72fe894c6eb5edee9d3b1594a64686a2f6eda18b6df0cb2cf037bbadb2e449eae8e67028cfc05ded2ee16ec52c6 SHA512 61ef1cfc786c9c9a57cc586758e6e6b3662d7bbb0d3a8b49396ef41cf250b915063b803b32f9c0a215fb3c6027a16f90722315e05aa67055c46c9d53a1fd4cae
 EBUILD xen-tools-4.17.2.ebuild 15848 BLAKE2B ac5ad586ea0330cc45d6ecb0b6351739ae1372822679b0d3375a3f480d42ca132e66dc112b259cf326f69dee2b7026e7b3e8bb5f28240c66dc074375583048fe SHA512 165082ee5d99967bd20376d056b576ad49f6f2e6a151e07e74dfa0c3c114e3499474ffa15c5ba61ccbca4470643a86cbf80191d0289a5b415f2e8f7baa9aa20c
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch
deleted file mode 100644
index c30cb328460d..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/c/dec/decode.c b/c/dec/decode.c
-index ae5a3d3f..7eee9688 100644
---- a/c/dec/decode.c
-+++ b/c/dec/decode.c
-@@ -2033,8 +2033,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands(
- }
- 
- BrotliDecoderResult BrotliDecoderDecompress(
--    size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size,
--    uint8_t* decoded_buffer) {
-+    size_t encoded_size,
-+    const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)],
-+    size_t* decoded_size,
-+    uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) {
-   BrotliDecoderState s;
-   BrotliDecoderResult result;
-   size_t total_out = 0;
-diff --git a/c/enc/encode.c b/c/enc/encode.c
-index 8d90937b..0c49c641 100644
---- a/c/enc/encode.c
-+++ b/c/enc/encode.c
-@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream(
- 
- BROTLI_BOOL BrotliEncoderCompress(
-     int quality, int lgwin, BrotliEncoderMode mode, size_t input_size,
--    const uint8_t* input_buffer, size_t* encoded_size,
--    uint8_t* encoded_buffer) {
-+    const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)],
-+    size_t* encoded_size,
-+    uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) {
-   BrotliEncoderState* s;
-   size_t out_size = *encoded_size;
-   const uint8_t* input_start = input_buffer;
diff --git a/app-emulation/xen-tools/xen-tools-4.16.4-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.4-r1.ebuild
deleted file mode 100644
index 32cc545f43f0..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.16.4-r1.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-	SEABIOS_VER="1.16.0"
-	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
-	EDK2_OPENSSL_VERSION="1_1_1t"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
-	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
-
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_GENTOO_PATCHSET_BASE=4.16.1
-	XEN_PRE_PATCHSET_NUM=
-	XEN_PRE_VERSION_BASE=
-
-	XEN_BASE_PV="${PV}"
-	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
-		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
-	fi
-
-	SRC_URI="
-	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-	)
-	"
-
-	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
-		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
-		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
-		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
-	fi
-	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
-		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
-		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
-	fi
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://xenproject.org"
-DOCS=( README )
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	lzma? ( app-arch/xz-utils )
-	qemu? (
-		dev-libs/glib:2
-		sys-libs/pam
-	)
-	zstd? ( app-arch/zstd )
-	app-arch/bzip2
-	app-arch/zstd
-	dev-libs/libnl:3
-	dev-libs/lzo:2
-	dev-libs/yajl
-	sys-apps/util-linux
-	sys-fs/e2fsprogs
-	sys-libs/ncurses
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	selinux? ( sec-policy/selinux-xen )"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? (
-			|| (
-				sys-firmware/seabios
-				sys-firmware/seabios-bin
-			)
-		)
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	arm64? ( sys-power/iasl
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	doc? (
-		app-text/ghostscript-gpl
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-		virtual/pandoc
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		dev-util/meson
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		dev-lang/ocaml[ocamlopt] )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-BDEPEND="dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_EXECSTACK="
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-storage-daemon
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/libexec/xen/libexec/qemu-pr-helper
-	usr/libexec/xen/libexec/virtfs-proxy-helper
-	usr/libexec/xen/libexec/virtiofsd
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch"
-)
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
-		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
-	fi
-
-	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"
-	fi
-
-	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
-	# collisions with app-emulation/qemu.
-	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
-		tools/qemu-xen/include/net/net.h \
-		tools/qemu-xen/meson.build \
-		tools/qemu-xen/qemu-bridge-helper.c \
-		tools/qemu-xen/qemu-options.hx \
-		|| die
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	if use ovmf; then
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
-		-i config/Paths.mk.in || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	# disable abi-dumper (Bug #791172)
-	sed -e 's/$(ABI_DUMPER) /echo /g' \
-		-i tools/libs/libs.mk || die
-
-	# Remove -Werror
-	find . -type f \( -name Makefile -o -name "*.mk" \) \
-		-exec sed -i \
-		-e 's/-Werror //g' \
-		-e '/^CFLAGS *+= -Werror$/d' \
-		-e 's/, "-Werror"//' \
-		{} + || die
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--libexecdir="${EPREFIX}/usr/libexec"
-		--localstatedir="${EPREFIX}/var"
-		--disable-golang
-		--disable-werror
-		--disable-xen
-		--enable-tools
-		--enable-docs
-		$(use_enable api xenapi)
-		$(use_enable ipxe)
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
-		$(use_enable ocaml ocamltools)
-		$(use_enable ovmf)
-		$(use_enable rombios)
-		$(use_enable systemd)
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
-	)
-
-	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
-	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
-	use amd64 && myconf+=( $(use_enable qemu-traditional) )
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	# bug #845099
-	if use ipxe; then
-		local -x NO_WERROR=1
-	fi
-
-	emake \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		HOSTCXX="$(tc-getBUILD_CXX)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
deleted file mode 100644
index fe02ab612336..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
+++ /dev/null
@@ -1,523 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-
-	SEABIOS_VER="1.16.0"
-	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
-	EDK2_OPENSSL_VERSION="1_1_1t"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
-	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
-
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_GENTOO_PATCHSET_BASE=4.16.1
-	XEN_PRE_PATCHSET_NUM=0
-	XEN_PRE_VERSION_BASE=4.16.3
-
-	XEN_BASE_PV="${PV}"
-	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
-		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
-	fi
-
-	SRC_URI="
-	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-	)
-	"
-
-	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
-		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
-		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
-		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
-	fi
-	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
-		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
-		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
-	fi
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://xenproject.org"
-DOCS=( README )
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	lzma? ( app-arch/xz-utils )
-	qemu? (
-		dev-libs/glib:2
-		sys-libs/pam
-	)
-	zstd? ( app-arch/zstd )
-	app-arch/bzip2
-	app-arch/zstd
-	dev-libs/libnl:3
-	dev-libs/lzo:2
-	dev-libs/yajl
-	sys-apps/util-linux
-	sys-fs/e2fsprogs
-	sys-libs/ncurses
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	selinux? ( sec-policy/selinux-xen )"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? (
-			|| (
-				sys-firmware/seabios
-				sys-firmware/seabios-bin
-			)
-		)
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	arm64? ( sys-power/iasl
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	doc? (
-		app-text/ghostscript-gpl
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-		virtual/pandoc
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		dev-util/meson
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		dev-lang/ocaml[ocamlopt] )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-BDEPEND="dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_EXECSTACK="
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-storage-daemon
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/libexec/xen/libexec/qemu-pr-helper
-	usr/libexec/xen/libexec/virtfs-proxy-helper
-	usr/libexec/xen/libexec/virtiofsd
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
-		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
-	fi
-
-	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"
-	fi
-
-	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
-	# collisions with app-emulation/qemu.
-	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
-		tools/qemu-xen/include/net/net.h \
-		tools/qemu-xen/meson.build \
-		tools/qemu-xen/qemu-bridge-helper.c \
-		tools/qemu-xen/qemu-options.hx \
-		|| die
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	if use ovmf; then
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
-		-i config/Paths.mk.in || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	# disable abi-dumper (Bug #791172)
-	sed -e 's/$(ABI_DUMPER) /echo /g' \
-		-i tools/libs/libs.mk || die
-
-	# Remove -Werror
-	find . -type f \( -name Makefile -o -name "*.mk" \) \
-		-exec sed -i \
-		-e 's/-Werror //g' \
-		-e '/^CFLAGS *+= -Werror$/d' \
-		-e 's/, "-Werror"//' \
-		{} + || die
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--libexecdir="${EPREFIX}/usr/libexec"
-		--localstatedir="${EPREFIX}/var"
-		--disable-golang
-		--disable-werror
-		--disable-xen
-		--enable-tools
-		--enable-docs
-		$(use_enable api xenapi)
-		$(use_enable ipxe)
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
-		$(use_enable ocaml ocamltools)
-		$(use_enable ovmf)
-		$(use_enable rombios)
-		$(use_enable systemd)
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
-	)
-
-	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
-	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
-	use amd64 && myconf+=( $(use_enable qemu-traditional) )
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	# bug #845099
-	if use ipxe; then
-		local -x NO_WERROR=1
-	fi
-
-	emake \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		HOSTCXX="$(tc-getBUILD_CXX)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index fe6af6b6cc30..0183afb58411 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,14 +1,7 @@
-AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf1b5a75f061e55b961d767972456803b8c9aa15120b2b2497651495e903925bf93b04c483e0713d9117a9 SHA512 7ec52fc65b5b8a22877c941f0ab6f249ba1d7b40ad7d50d8f0ac793069cc0eb85b1e5394ce81adf60fa23b01ecc8ce983e6c508b8e0d22189dc46e2c1ad8c1b4
-AUX xen-4.15-flask.patch 400 BLAKE2B 68ee04b8b0923cbe7e2b93b834a23b465c9c8e63ae41bea98c8b4bce4ff59374534294b8c5cd5be30ea64d7c66caec54de0bc1bf70d80275d027b3a082ec2003 SHA512 146c6a161d3def5ab947264d6ac5932066f3124e25be14185ebd75eaa18932adcf35daf21edd051861cacd28b950b6a3ee5c5ac335ccc1d0e27b3242da5c4441
-DIST xen-4.16.3.tar.gz 45003057 BLAKE2B 6092cff33bffed1b6133daf8d3ce53c57204297e66df6ac58266b2da8d5585df62ae718cc8afaad36ebe6dabdce65b9979b0d13b88e60f2b23c01be21ae4db8e SHA512 b8cbd6f95681de5f824ada2d3cbe0653a38514a18df0dafcf811fb255219c7abec96f46217bdb0c83e1119f685da9a6af7194eeaa94f1cc3c892702782133b4f
-DIST xen-4.16.4.tar.gz 45008515 BLAKE2B 6637cbebe76e48ca6d2ea885b9c52244efe2fa8188c1649f6a5444fd980a8bfcff5508c8496b89b8a31ba1c4e06f47047b7289513cf22fb86d2b76a77b3cfd21 SHA512 1b5a167a9f5537b5311ef1cb56e0e6ffda0e4e569ef0534e47b4f4a528067bda46fb58b2a01abc02e8c38b2b70207fb201a5d4d10274fba70135eaa8e318e055
 DIST xen-4.16.5.tar.gz 45023770 BLAKE2B 1371bd4cdf7431c16a575d4f911cec7be25a6358bbc47648aa542c6dcb27b733a8de63f9226a9290096a84df4d602186fcfdf6d255c43140d8e9373323fa53e9 SHA512 2f370787b72b2cd9d81c0b5f138133e676d2b9c8c76e31e6439649d7145242a6b7be0d51a7ff4f4197a99e3f6b24ac50e63d2fa49368da440d3f555e70c4ebd3
 DIST xen-4.17.2.tar.gz 46498038 BLAKE2B 44bb7b39dddb1dbd266a31f6e67f49e981946b78a83580ec068e02687780695d33868781b563dfb77db8ad3ffdc6fe7431ca8243650d9a08823312c430cfa5cd SHA512 0bc475483676e4aa27735695f9a8d2821059e7a55984adb8a29badb5c09a4e7cf8ea29cbc9691be616cc0d7a5ee6b6dacc59ba29c2b16e0919ebdf7dfc54201a
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-0.tar.bz2 4474 BLAKE2B aa367a4ccf96a61c04c52e415d7143ca946323d7d50d6ab16ad7a917279ad4b1aac802e35e7e306c3a244317db713e913dc8d6343717b2307ccd049adb956a0d SHA512 debba71b17be7b1bb9a70f01782c12c3c053cc2fb1f4ad95829356ee365878aad68430055d4b8c648ef1ff54cb9e3e7c03d40d14c560d51f8ac4fce2b8f82190
-DIST xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 60151 BLAKE2B 5c8a8f772ba6be5f776b3270b9f1e64df35c2be7b4e238262eb4ec6b4859576b3ecb448880e1e05ad53dbdaa71643e678978151b10d0d47c901ab3e3518b7eb0 SHA512 b33a9b2f602f18165e048ef6a339bc5bf3f800fb1f2449e2e1a6090774ce3ef07b1d7ea8e9e6449fae7b91afcc1a6e281c1bb218a56bca74ba7f12b491fab186
-EBUILD xen-4.16.4.ebuild 4413 BLAKE2B ac9e09a43a8a8d592ec6c49500f03192d291b377fbca306677419d6d4840612fc613b9895fcc4bdf074e6cda4947922371ae033b9f60576113b6bd64c9fab52b SHA512 b9d4da75c9d8973c7c75cb28319a5d006df20681b0193df2de6b4a645f83465b709d20e0b51201c4d31c8b64165a6eba9f01c9ec86a1138bf8374cab84f344a9
-EBUILD xen-4.16.4_pre1.ebuild 4419 BLAKE2B 1efafcac7cbafb193f110329ce739d7bb7ee8df72613cea88b0d8e29ad3633a0ef1f2c23f479ecd643c05e8d02e0e252b7d3ce3454278fcd749d18685beff00f SHA512 ec5da510e09d960e7b46b8337e84267342f0aa59a30f80ef1c5d5cb0ad16ed9ac1231537a27f276dfa8c0bde032c941e977d6f3614f089941e97704a7bb304d3
 EBUILD xen-4.16.5.ebuild 4412 BLAKE2B 17df79bb74c2c24347a9379241c106e0e311b6c8c972bae56a4bf35ccc6c19ff13adffe6b71c2a8a8e7795a5552530f98b41262e84a3571b67527b17d2ffdeca SHA512 11ff3cada1a464e0a93d5de9f910bd69ef44da86f61aed953bfbe46239d978fffc38f2c68826788348d6ab4eaf0c6913ebe07a8ef6b2dd8c8756b9719a3b94b5
 EBUILD xen-4.17.2.ebuild 4511 BLAKE2B ba0554fd996690e27a24c92c92c6c6ed9d51eba3e346bedccf95af656e8cf447a6efefac91825e0d4ee4b222b53114d35b1433877c1a89c85f27a36c16e6bc74 SHA512 3a7f4fea5e26b69c4db6d55ab7973da6c71db4c3b1a4fca8e4a86f8f3532640adef5f1bea39c8bb091048522941b2707f0d745d39cf38a0555278223bd11b77d
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/files/xen-4.15-efi.patch b/app-emulation/xen/files/xen-4.15-efi.patch
deleted file mode 100644
index 01133e98dde3..000000000000
--- a/app-emulation/xen/files/xen-4.15-efi.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/xen/Makefile b/xen/Makefile
-index acb2d28..b9dbd9c 100644
---- a/xen/Makefile
-+++ b/xen/Makefile
-@@ -272,9 +272,17 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
- _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
- 	[ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
- 	$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
--	ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
-+
-+	if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+		ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+	else \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+		$(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+	fi;
-+
- 	[ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
- 	$(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
- 	$(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
-diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
-index b6567c4..0320a4a 100644
---- a/xen/arch/x86/Makefile
-+++ b/xen/arch/x86/Makefile
-@@ -123,7 +123,7 @@ ifneq ($(efi-y),)
- # Check if the compiler supports the MS ABI.
- export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y)
- # Check if the linker supports PE.
--EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug
-+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug
- XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y))
- CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI
- # Check if the linker produces fixups in PE by default (we need to disable it doing so for now).
diff --git a/app-emulation/xen/files/xen-4.15-flask.patch b/app-emulation/xen/files/xen-4.15-flask.patch
deleted file mode 100644
index 7dcf91b30fc1..000000000000
--- a/app-emulation/xen/files/xen-4.15-flask.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xen/common/Kconfig b/xen/common/Kconfig
-index eb953d1..78f058c 100644
---- a/xen/common/Kconfig
-+++ b/xen/common/Kconfig
-@@ -198,7 +198,7 @@ config XENOPROF
- 
- config XSM
- 	bool "Xen Security Modules support"
--	default ARM
-+	default y
- 	---help---
- 	  Enables the security framework known as Xen Security Modules which
- 	  allows administrators fine-grained control over a Xen domain and
diff --git a/app-emulation/xen/xen-4.16.4.ebuild b/app-emulation/xen/xen-4.16.4.ebuild
deleted file mode 100644
index c868fdb34a15..000000000000
--- a/app-emulation/xen/xen-4.16.4.ebuild
+++ /dev/null
@@ -1,174 +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 flag-o-matic mount-boot python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_GENTOO_PATCHSET_BASE=4.16.1
-	XEN_PRE_PATCHSET_NUM=
-	XEN_PRE_VERSION_BASE=
-
-	XEN_BASE_PV="${PV}"
-	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
-		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
-	fi
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
-
-	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
-		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
-		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
-		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
-	fi
-	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
-		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
-		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
-	fi
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://xenproject.org"
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+boot-symlinks debug efi flask"
-REQUIRED_USE="arm? ( debug )"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )
-	flask? ( sys-apps/checkpolicy )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
-		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
-	fi
-
-	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"
-	fi
-
-	# Symlinks do not work on fat32 volumes # 829765
-	if ! use boot-symlinks || use efi; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch
-	fi
-
-	# Workaround new gcc-11 options
-	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-xen_make() {
-	# Setting clang to either 'y' or 'n' tells Xen's build system
-	# whether or not clang is used.
-	local clang=n
-	if tc-is-clang; then
-		clang=y
-	fi
-
-	# Send raw LDFLAGS so that --as-needed works
-	emake \
-		V=1 \
-		LDFLAGS="$(raw-ldflags)" \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		HOSTCXX="$(tc-getBUILD_CXX)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		RANLIB="$(tc-getRANLIB)" \
-		clang="${clang}" \
-		"$@"
-}
-
-src_configure() {
-	cd xen || die
-
-	touch gentoo-config || die
-	if use arm; then
-	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
-	fi
-	if use debug; then
-		cat <<-EOF >> gentoo-config || die
-		CONFIG_DEBUG=y
-		CONFIG_CRASH_DEBUG=y
-EOF
-	fi
-	if use flask; then
-		echo "CONFIG_XSM=y" >> gentoo-config || die
-	fi
-
-	# remove flags
-	unset CFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-
-	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
-}
-
-src_compile() {
-	xen_make -C xen
-}
-
-src_install() {
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	xen_make DESTDIR="${D}" -C xen install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
diff --git a/app-emulation/xen/xen-4.16.4_pre1.ebuild b/app-emulation/xen/xen-4.16.4_pre1.ebuild
deleted file mode 100644
index 805cef3cffc9..000000000000
--- a/app-emulation/xen/xen-4.16.4_pre1.ebuild
+++ /dev/null
@@ -1,174 +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 flag-o-matic mount-boot python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm -x86"
-
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_GENTOO_PATCHSET_BASE=4.16.1
-	XEN_PRE_PATCHSET_NUM=0
-	XEN_PRE_VERSION_BASE=4.16.3
-
-	XEN_BASE_PV="${PV}"
-	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
-		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
-	fi
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
-
-	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
-		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
-		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
-		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
-	fi
-	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
-		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
-		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
-	fi
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://xenproject.org"
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+boot-symlinks debug efi flask"
-REQUIRED_USE="arm? ( debug )"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )
-	flask? ( sys-apps/checkpolicy )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
-		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
-	fi
-
-	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"
-	fi
-
-	# Symlinks do not work on fat32 volumes # 829765
-	if ! use boot-symlinks || use efi; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch
-	fi
-
-	# Workaround new gcc-11 options
-	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-xen_make() {
-	# Setting clang to either 'y' or 'n' tells Xen's build system
-	# whether or not clang is used.
-	local clang=n
-	if tc-is-clang; then
-		clang=y
-	fi
-
-	# Send raw LDFLAGS so that --as-needed works
-	emake \
-		V=1 \
-		LDFLAGS="$(raw-ldflags)" \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		HOSTCXX="$(tc-getBUILD_CXX)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		RANLIB="$(tc-getRANLIB)" \
-		clang="${clang}" \
-		"$@"
-}
-
-src_configure() {
-	cd xen || die
-
-	touch gentoo-config || die
-	if use arm; then
-	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
-	fi
-	if use debug; then
-		cat <<-EOF >> gentoo-config || die
-		CONFIG_DEBUG=y
-		CONFIG_CRASH_DEBUG=y
-EOF
-	fi
-	if use flask; then
-		echo "CONFIG_XSM=y" >> gentoo-config || die
-	fi
-
-	# remove flags
-	unset CFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-
-	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
-}
-
-src_compile() {
-	xen_make -C xen
-}
-
-src_install() {
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	xen_make DESTDIR="${D}" -C xen install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8b499e5d1eb6..6973ad6e6696 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
index c806c55dc5a3..7db928a96f02 100644
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@@ -1,3 +1,5 @@
+DIST reptyr-0.10.0.tar.gz 33216 BLAKE2B 4dc30f377588ff5ee74460440c1be7067969ce6ec387cb7379b60c2256467a0f2c9f0689387d38ebcccd73d84ed733fc713852b628fc6e4818195482ace64c25 SHA512 5bbf22a93ceb69489c1370d1a80fdf0916cb057346f8d83a8568228622a0e58ed8cfb374bc69e090219b4d69903d2ff400f0bf4ee2f910eb9301492fe69af78c
 DIST reptyr-0.9.0.tar.gz 32589 BLAKE2B 2673128d90f302a5591466314446257b654f727efce24e2c1a68a2f876a7b385905acb5a4648945ce15e90e2419b4aee5a8a88377dd8229f3b130ba5ba858e46 SHA512 a59670449cb597657dbb244228fd4246142190615ce1a6369f11b8c99cb12d8e2bedb4efd7cdc301a4f7c18d29e8799eea8f14d062a8ad7b7c025034cba66ac7
+EBUILD reptyr-0.10.0.ebuild 787 BLAKE2B 536840350e1d57b3f4afbadcdcc94008ae2a2e28bfd2ff016069386acac4ca8ca7fc796f4d23af84a70e682b9f5ea09bfb1d0b9ce45870b0c22ac20671fce9f6 SHA512 a5780acbca571df64b63b5249d448717cd9a77a0fcb9de77179214b329cfe0600bfd0ecc4e28b55aa9ce58bb23e4959e144b08f51cf001d8225b4745d04cbe5f
 EBUILD reptyr-0.9.0.ebuild 785 BLAKE2B 4b333037570dc132b6ec94afd9b63e633de15d66b034b0be3af3d1290ebd45bb663ca3958e7eef8c5a8c32a817c25efe6482bc47daba8ed650d820458c0962eb SHA512 3db41ba83f56d0a55ae3180ba4b15547fe7e8592f8671604e87ecea7c342312fdc310e328661fb5fdf1222e0d22490acc00e49208087180d70c891963772bf4d
 MISC metadata.xml 355 BLAKE2B 67047538548ad5ef407f8c888726911621e53b66e826e5256cfec97a6b13b99f71bf7e902e9c8f83bfc20311451a3fbb921bcaed594c43736ca6a4bde59c078f SHA512 6b153c764391595c74666a82569d1fb16ab33731d258a5b73ae6e537c3c5228b29802902a2e18b5a271a0195f8e42a45df558aae6e5e548e8f6cec5efffd8b31
diff --git a/app-misc/reptyr/reptyr-0.10.0.ebuild b/app-misc/reptyr/reptyr-0.10.0.ebuild
new file mode 100644
index 000000000000..4d4df0b48378
--- /dev/null
+++ b/app-misc/reptyr/reptyr-0.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 toolchain-funcs flag-o-matic vcs-snapshot
+
+DESCRIPTION="A utility to attach a running program to a new terminal"
+HOMEPAGE="https://github.com/nelhage/reptyr"
+SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# respect CFLAGS
+	sed -i '/^override/d' Makefile || die
+}
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc ChangeLog NOTES README.md
+	newbashcomp reptyr{.bash,}
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 02ce4612a19b..fbbe7cab0fe6 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 6618b5de3955..884143fd20c7 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -2,6 +2,6 @@ DIST Sigil_User_Guide_2022.05.17.epub 8894634 BLAKE2B 8a7c5b5add54d87dfe791a0dbb
 DIST sigil-1.9.30.tar.gz 26602897 BLAKE2B 554af2aa4c26994c065023839ea29b190eea501cac1183d58dcf2439ebca89e0a56848aaec1d668cfb84555c6830eaf6d32efdc82b08e0c94d7b6ba95dd7ff8b SHA512 80dcaa9dcee51c36a42bcd57fc87acda94002af74602d934c7e9bfd275339d9ac200cd1f141fb9e2709ac054569bc22f1869623498ce16c636a3fab8dae4e70f
 DIST sigil-2.0.1.tar.gz 26778961 BLAKE2B d2bdd3c24410285eea3e3655638f2aa2ec8b84b60b8dadda9ad2e40a404e61eebf93ecc188b0aa08967aef42e34c83c884853cdd782a7bc8c5a0d6d235058cfe SHA512 9ba8fd2e844288eae01be9e65e3fc210eeeb096e54c83ebcea5c95be9c1ce44054f19589c294e812f8bc6bb489aebdf237670121b254e9b1c55cc10622f03f81
 EBUILD sigil-1.9.30.ebuild 1847 BLAKE2B 12165185ecf9888f9d3087ce8782aa707dddcc709f06211bebe3cabbaa61fa076acd05479ee7d026f7f8504a73faa2e0b8f808307dade7a2cced5c97a49cb9c0 SHA512 fdcb6426bd7aea052c3e36aa0fb92f900f39e8bca28caa4022b8b6f4979b999c8e54f175a0967d3b797c69b0f5097719b8dae80cddb37cbfbbf57980d01d084f
-EBUILD sigil-2.0.1-r1.ebuild 2408 BLAKE2B 1513c246ef9c1948ce87f73b4a763ee9939c2ed4d4bc05240fd730cc88db23f8029105165008fd981544c3082d9459943c3d6ecfe92f5e0780b0dcd46c069e29 SHA512 30975455c7306f38c29274cc9e6ab766859e3cdd86b404f776fe79dd6a106c386ec198cd8dae5960b967818b34f954bbb6e9c9f9e8758567df04921bf922775f
+EBUILD sigil-2.0.1-r1.ebuild 2392 BLAKE2B 54b0abf6461c9556c0db47ed6b52226b66ecc8ffde68554f9ce6433a135d8fdce0f2942de08ce80d243d346d17aacb47662fbb8cad25d1e188e7dfcb71d0e923 SHA512 8b8ce5972ad3d14a1db1c303336c05ca064d921b4d448ee1014d105fb6213355ab52db5c8d3f49682ee524f72d2f6ec0d68ef91a857cb7d571fd7fdb73f71b6e
 EBUILD sigil-2.0.1.ebuild 2123 BLAKE2B 9ff699ed320b7a883048056dc239f506bb4f36792f343f55b3bddeff24f8626925c01bc9e5342407478ae247a67d8588b2feb7a827c1d42d1d9ba9406d592cba SHA512 74692aa47d2b9d83e2d5fddd572796714b0a3baee7d97158c2abf2f1133a6005d72eacf90094228d9c1b6b296756e7d9416febab8948f1c6f38bafdee15fea59
 MISC metadata.xml 706 BLAKE2B 394811d292869d61297ed01ce36223cd0eb33b6ea21db9cfe6e87911d7f30801977f8b66663085a289bf9f6870fd64d72c1d706c7b9516d2e09585783772a4dc SHA512 a98d16ad1760d359f9ab915d472747fe3f1dc229f41b10980f1ccd3436091f8dec0ee800fed7e531413eb77826a7873ce3e2e3bf8c2d478b4d1ec1ccc16e5b68
diff --git a/app-text/sigil/sigil-2.0.1-r1.ebuild b/app-text/sigil/sigil-2.0.1-r1.ebuild
index 78d881ce3a7f..d278bafefa92 100644
--- a/app-text/sigil/sigil-2.0.1-r1.ebuild
+++ b/app-text/sigil/sigil-2.0.1-r1.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="tk"
 
 inherit xdg cmake python-single-r1
 
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-IUSE="doc +plugins +qt5 qt6"
 DOC_VERSION="2022.05.17"
 DOC_FILE="Sigil_User_Guide_${DOC_VERSION}.epub"
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
 SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/${DOC_VERSION}/${DOC_FILE} )"
 S="${WORKDIR}/${P^}"
@@ -20,7 +20,8 @@ S="${WORKDIR}/${P^}"
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE} ^^ ( qt5 qt6 )"
+IUSE="doc +plugins qt6"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -37,9 +38,9 @@ RDEPEND="
 		dev-python/dulwich[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]'
-	) )
-	qt5? (
+		dev-python/regex[${PYTHON_USEDEP}]
+	') )
+	!qt6? (
 		dev-qt/qtconcurrent:5
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -58,9 +59,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
 	virtual/pkgconfig
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
 "
 
 DOCS=( ChangeLog.txt README.md )
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index f894ef3ecb4e..b2101729cc0d 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/xsimd/Manifest b/dev-cpp/xsimd/Manifest
index 053620038a7e..04442dce7292 100644
--- a/dev-cpp/xsimd/Manifest
+++ b/dev-cpp/xsimd/Manifest
@@ -1,4 +1,4 @@
 AUX xsimd-11.1.0-c++17.patch 1429 BLAKE2B 23be29fdd74ed37632bd1fba0ffdedf08af48f14985494f5befac4afb34622bb44e294e954d9d4e57a07ee6e9d988a48a93dd1b66a6f6206b79bd7c0cb600cc8 SHA512 41a474a6d768aec39e6760d4ff60017a5e3d5c4349bf244d3de1464bd9b06022d6cadcd4f91cc17a6630f38f1b0fe0e3aa4fa5a6810b8c57d649f5a8da28c217
 DIST xsimd-11.1.0.tar.gz 219350 BLAKE2B 2bbbc4f7dbe489a407fe798b146c008aba44664efc943c2e1507d5c6e7da2a03ed91abf0d872e5abf9bd94be3e76bef276ec5b47d4e356b42a7b4c680bd6f3d9 SHA512 3a6141dfa4d95a977f4222880dfd06197613d153a78a84653022423279eec037ea9def08ae225aba7231c0b2c434ab7c907c965f8367fb0db9b96113980b51f3
-EBUILD xsimd-11.1.0.ebuild 950 BLAKE2B 43b986ecb164aefb79f822a65623254e3a247c0d4a4cf4f6760e347fe846496b6f3c50749557d524710d804bca742e0d41e56691a54e7cda7464b487f52a18b4 SHA512 75a0808294a188fbd9c876c11eaad0866a2911c03f1898b3e9fa01dae96aaa0ad89e8a1d7a28031175dba7e9b430d4e4e85019d9043bc6cd25639cd6b01d9df1
+EBUILD xsimd-11.1.0.ebuild 957 BLAKE2B 5355da302d6e056bb3a781c476d27ffc1acb6d381b236430dd103159e9ad94a344a9f5f53c2405494d2914bc99af47e97378ba18eb19eed49911e088f134a57e SHA512 906a983cb6daa846fbce506ce4e91359dca706fdf87051862031c6d40b3ee196c9e91bdbb0cabb0454643298a4b0abbf591514efdac8f2f3d343564747ce9ec1
 MISC metadata.xml 385 BLAKE2B e22c7622c338c277eee7dd048463a2d3244fffcd255b1a9dd9652a1295c3c1f0043e67fab28b084b3f10b03b5fd5e36b4f713c040ddc168ac6be9287af14e031 SHA512 5826eb1e62fa79c1e355668ad83a9e4e113b3cf154535537181597062f952ad436c56c8d9dd9f3599815307e33f4e1366b2a9b109d27c53bc112fe0a4c62d885
diff --git a/dev-cpp/xsimd/xsimd-11.1.0.ebuild b/dev-cpp/xsimd/xsimd-11.1.0.ebuild
index 10772611405c..828aa5acb40a 100644
--- a/dev-cpp/xsimd/xsimd-11.1.0.ebuild
+++ b/dev-cpp/xsimd/xsimd-11.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/xtensor-stack/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b48990f898dc..3584cc1a6f7c 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 365fa1db6fef..4f278266dfd9 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -24,6 +24,6 @@ AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac212
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
 DIST mongodb-src-r4.4.20.tar.gz 50883098 BLAKE2B 3ef2fddc4d926e372033449a14b0a71c606b6f8a9bb6767ff32c8da5a9287bf2972fae9dd83eab3ad934b1341c3edeed7708afd46f9a096819e9eca48aca40f5 SHA512 70b264b6a6f3ec16c8b0750d47026928f6250cb7a1a64d980c400ffbcc3af1b9c6301fe098d209fb8461cba4534b7c2edffdcdeb0548e627da107cc23d9a6b9c
 DIST mongodb-src-r5.0.16.tar.gz 56217257 BLAKE2B d78704c0cff4f8c1da20fdc5e083634c6dbe539136de58410ae6b86c9c5cd8044926425545ae07a7011a5febec5abb6f67773b8e539a4ac16daa1ad0ffc6a070 SHA512 d5fccd6cd3ee3f70457bd96a8eff66ca9872df37e196f1baf26993b6c080297d77504020e5554eaf3a2e92bb2730a467226b4bef47ab7fdc4de247d91c0143eb
-EBUILD mongodb-4.4.20.ebuild 5163 BLAKE2B d16896702139ef2f6a575fabf89ac14e599702d5c789ef6996511f92ad99c5a5a7fa9de1a4baaa88eddfa97dd6c429f47e5476e752189108ae0f19e57c8f0815 SHA512 72e79072c1baef203bc5f669152b2511dbc9a1f0f877ffb640faefa2dc2f458e8999b375b58a3f6e8658de32b04270f17a93eb22c449185fd5e48cf765c5641b
+EBUILD mongodb-4.4.20.ebuild 5203 BLAKE2B d7bbda27bf8b75cc2c713b8af735fd0cb6bd23e67866a05859b924a17a2688c241260a4cfd4d96adc78f8dc156bcdd4ead63f48dfd780b6517fa5931e15eb169 SHA512 564b9e79d32f6df720a46ad1f37622730595f2079e2a9e8f387eab765b94d64adf08bbd094b97c7b77716009b0e4677893c8388903eff98f33bbf5466c91b183
 EBUILD mongodb-5.0.16-r1.ebuild 5620 BLAKE2B feeb6349867a9780bd0c1e6ba3102de8710603fa112be5190250196923db48a4c076b6ab9df2736265eb66c95f01557d465faa3a9e6629946f3da092f4f7770b SHA512 75c7be0ab7e4f3f270a3b55f2254fc879bee54d949576f309c0a662a64a9c7a3a3388c290ee7903d896bbc51bfd070c9f0a304008ee3eb17f3f8e0d498a51ca1
 MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda
diff --git a/dev-db/mongodb/mongodb-4.4.20.ebuild b/dev-db/mongodb/mongodb-4.4.20.ebuild
index 46848e0dcb81..4dc301c49f07 100644
--- a/dev-db/mongodb/mongodb-4.4.20.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.20.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
 	"${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
 	"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
+	"${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e165b258f76b..7891ec2b6177 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 2eefacd75343..63803cbb2f3a 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,9 +1,7 @@
 AUX R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch 380 BLAKE2B db9fcf9d0c73aa5352110bc27f5881db4f793c963e8f9d46b8681101eb7e062f5f1bf50fd06c53aa392994cd455f6d8cffc680f81a06487694c860297e5e06b6 SHA512 380c6489520c60016cef730822ff973a63460b40726b6c84a9c4ba69d75f93bc8eeb6c45dbb64bcb3277fe2ffd8b1d1fcc40ae668d77269acb4fbc5babdb686e
 AUX R-4.3.0-no-gzip-doc.patch 354 BLAKE2B 81f20b830ac99494a921b635a0d280dd90045c7dd3d1ed02f1fbf46a717ec3b13e7c730c9d4c87dd8d55d5f366db1a60671718511852d134f8dc91fddfbb8505 SHA512 f3f7bd438eac7637b969206c5134f0638ca79c862a6d432545b126422903248e5badde5ff893b4f44e14104734419372c2414380034d17748001f0dfadb5c7b0
 AUX R-4.3.0-parallel.patch 415 BLAKE2B e996c72c167b529765c82c8880bc3ea704d3c6e34b7fe09dff4fa93a8e42f8551dc723f44e0ab0638de84ce0f7fa60d4476e297d06eb3d6070d8daf5f79b9dba SHA512 6d36a2eb5df1ec8fa4230bfbc693cf53c95b41bb9269cfa473cfaa6dc8a42681e81a006f03278b86e8636e904bba188f2475d27d06599fdab86de8743401f5be
-DIST R-4.3.0.tar.gz 34821768 BLAKE2B 3505c8357419355fddb8aadbf0952c492e3e38d649d6261478d6187c94ff71110089ec0933a31dd2f7258e58a1d0864a68cb4d7b6cdefc54e5add55d0d62db10 SHA512 7f9bc8360818d7fdf05e26a4213df01468669514a4c2ad62dee358f53dcfa05a71ee72241db91fed59574c26d7caee5d3e0717637e1666daec99446e42c07813
 DIST R-4.3.1.tar.gz 34899964 BLAKE2B 7aaacad01ce59e2faa46c4b830c10d2df8e4a3a1d4f11cf2aa622ceb53876f1e702dff94a820ca954ec29f53d58fa7e135ef15e8257602c50f2642b0a0c0a86a SHA512 f571c378dbdd675e267ef4419bb1141198924dadc08297c93c8dff58504994604918b3e045bb7139ba473972a063a68ed1c7426f37d4e8208b79358561d34d77
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
-EBUILD R-4.3.0.ebuild 7103 BLAKE2B 5c188c762bfd37c676f563b125937c5751c7072d9015f4baa9969deee7533f12239df2de4dfb4357073420d98fab06045ddaaf9cca490b537dca2e20c7d94a34 SHA512 541259d1f53aa8b2e97581971bf87de2b60f6bdedeb87d65a92dd89c6cdf605b7fc63b812131ed71478d67035b4529c49b8f8ceb1a02d643b4e43339a63ecab0
-EBUILD R-4.3.1.ebuild 7148 BLAKE2B c37f6f9cdf0fd5faef8448157d180f2c5dd5039eb7a311910cd6ee91dfb82605e388f14d06d680de1137466df234ab3f31c5a78c91d1edddbc3701e8248886fd SHA512 b871f348cafcbe3f427f3eb6a471d85c056f94f2151bf9b83fc43f3f90ae17fae531880dc6ad3737d2ce3cb7493f42bcfb4a677c8b3f89b4ea875bd6691d8448
+EBUILD R-4.3.1.ebuild 7146 BLAKE2B 7977fa761df7a3c0609d8a117515a633486e723094f01ee2deb878bf375137007146f49b9c4e6fff45bf45dd96cdde88eb93aae6a0634ec5a0305634329cac0d SHA512 602a2d17788ba3b732d05e534425ce4204f0960c2896dc018d8267a0839cc090fab696e9cadce34961646c5b06d26717dc2ae32e33ac998e007ff0d6639500cc
 MISC metadata.xml 1316 BLAKE2B a8a90f88542428b61a88977d2bb4a82b4388edaf96da7d52bf1b2db04cef3ff1fed61530de4389b823d90fca98f4b137616f736bb3169a207b4c38303b5f86bb SHA512 190fde3e0b0a7c09ca6fc16e035f4f25ecf058014ba27846c231475e4d2152032ceef911d16b6770035d0a4e68b14625b41a619f5cf21c922654c8d36716094d
diff --git a/dev-lang/R/R-4.3.0.ebuild b/dev-lang/R/R-4.3.0.ebuild
deleted file mode 100644
index 54725bb77495..000000000000
--- a/dev-lang/R/R-4.3.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
-
-# latest git commit for R bash completion:
-#   https://github.com/deepayan/rcompletion
-BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6
-
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="https://www.r-project.org/"
-SRC_URI="
-	mirror://cran/src/base/R-4/${P}.tar.gz
-	https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ~loong sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
-
-REQUIRED_USE="
-	png? ( || ( cairo X ) )
-	jpeg? ( || ( cairo X ) )
-	tiff? ( || ( cairo X ) )"
-RESTRICT="
-	minimal? ( test )
-	!test? ( test )"
-
-# At least one package installation in the test suite requires TeX,
-# and will fail without it (bug #718056).
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	app-text/ghostscript-gpl
-	dev-libs/libpcre2:=
-	>=dev-libs/tre-0.8.0_p20210321[approx]
-	net-misc/curl
-	virtual/blas
-	sys-libs/zlib[minizip]
-	|| (
-		sys-apps/coreutils
-		app-misc/realpath
-	)
-	cairo? (
-		x11-libs/cairo:=[X=]
-		x11-libs/pango:=
-	)
-	icu? ( dev-libs/icu:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	kernel_linux? ( net-libs/libtirpc )
-	lapack? ( virtual/lapack )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:= )
-	readline? ( sys-libs/readline:= )
-	tiff? ( media-libs/tiff:= )
-	tk? ( dev-lang/tk:= )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-	)"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsrecommended
-	)
-	test? ( virtual/latex-base )"
-
-PATCHES=(
-	"${FILESDIR}"/R-4.3.0-parallel.patch
-	"${FILESDIR}"/R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch
-	"${FILESDIR}"/R-4.3.0-no-gzip-doc.patch
-)
-
-# false positive, the linking step fails (as it should)
-QA_CONFIG_IMPL_DECL_SKIP=( iconvlist )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	# avoid using existing R installation
-	unset R_HOME
-}
-
-src_prepare() {
-	default
-
-	# fix packages.html for doc (gentoo bug #205103)
-	sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-		-i src/library/tools/R/Rd.R || die
-
-	# fix Rscript path when installed (gentoo bug #221061)
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EPREFIX}/usr/$(get_libdir)/${PN}\"':" \
-		-i src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (gentoo bug #273957)
-	sed -e 's:\.\./manual/:manual/:g' \
-		-i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-	use lapack &&
-		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	use perl &&
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-	# don't search /usr/local
-	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-
-	# Fix for Darwin (macOS)
-	if use prefix; then
-		if [[ ${CHOST} == *-darwin* ]] ; then
-			sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-				-e "/SHLIB_EXT/s/\.so/.dylib/" \
-				-i configure.ac || die
-			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EPREFIX}/usr/$(get_libdir)/libRmath.dylib:" \
-				-i src/nmath/standalone/Makefile.in || die
-		else
-			append-ldflags -Wl,-rpath="${EPREFIX}/usr/$(get_libdir)/R/lib"
-		fi
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	filter-ldflags -Wl,-Bdirect -Bdirect
-
-	econf \
-		--enable-byte-compiled-packages \
-		--enable-R-shlib \
-		--disable-R-framework \
-		--disable-R-static-lib \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-system-tre \
-		$(use_enable java) \
-		$(use_enable lto lto R) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable profile R-profiling) \
-		$(use_enable profile memory-profiling) \
-		$(use_with cairo) \
-		$(use_with icu ICU) \
-		$(use_with jpeg jpeglib) \
-		$(use_with lapack) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with tiff libtiff) \
-		$(use_with tk tcltk) \
-		$(use_with tk tk-config "${ESYSROOT}"/usr/$(get_libdir)/tkConfig.sh) \
-		$(use_with tk tcl-config "${ESYSROOT}"/usr/$(get_libdir)/tclConfig.sh) \
-		$(use_with X x)
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}"/fonts
-	emake AR="$(tc-getAR)"
-	emake -C src/nmath/standalone shared AR="$(tc-getAR)"
-	use doc && emake info pdf
-}
-
-src_install() {
-	default
-	emake -C src/nmath/standalone DESTDIR="${D}" install
-
-	if use doc; then
-		emake DESTDIR="${D}" install-info install-pdf
-		dosym ../manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	newenvd - 99R <<-_EOF_
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}/lib"
-		R_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	_EOF_
-
-	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
-	# The buildsystem has a different understanding of install_names than
-	# we require.  Since it builds modules like shared objects (wrong), many
-	# objects (all modules) get an incorrect install_name.  Fixing the build
-	# system here is not really trivial.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local mod
-		pushd "${ED}"/usr/$(get_libdir)/R >/dev/null || die
-		for mod in $(find . -name "*.dylib") ; do
-			mod=${mod#./}
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" "${mod}"
-		done
-		popd >/dev/null || die
-	fi
-
-	# Users are encouraged to access some of the the R documentation
-	# interactively, through functions like "contributors()" that
-	# tries to open the "AUTHORS" file. Other files can be accessed
-	# by name with RShowDoc(), and the documentation for e.g. license()
-	# and RShowDoc() suggests a few of these names. Here we try to
-	# collect as many names as possible that a user might actually
-	# try to view through R, because if we don't decompress them,
-	# then R doesn't know what to do with 'em. Bug #556706.
-	local INTERACTIVE_DOCS=(
-		AUTHORS
-		COPYING
-		FAQ
-		NEWS
-		THANKS
-	)
-
-	# Other data sources that are shipped as "documentation," but which
-	# need to be accessible via their original unmolested filenames.
-	local INTERACTIVE_DATA=(
-		BioC_mirrors.csv
-		CRAN_mirrors.csv
-		KEYWORDS.db
-		NEWS.rds
-	)
-
-	local f NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
-	for f in "${NOCOMPRESS_DOCS[@]}"; do
-		docompress -x /usr/share/doc/${PF}/${f}
-	done
-
-	# Finally, an extra copy of this started showing up at some point...
-	rm "${ED}"/usr/$(get_libdir)/R/COPYING || die
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-4.3.1.ebuild b/dev-lang/R/R-4.3.1.ebuild
index 19b9f109ee87..54a13af61115 100644
--- a/dev-lang/R/R-4.3.1.ebuild
+++ b/dev-lang/R/R-4.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~loong sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 39b3889457b1..0bc66c1e4802 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -11,25 +11,17 @@ AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd235506
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
 AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478c388ed23603ad1dd4d17b63154d535a3e4c2db04fe27fb22a3d7e1335e368ffd383ed24647ac53ac05170ec3e1beb75 SHA512 d37815ea529167d4959aef056a3a0be6902ee4cda809a48c24299b05ff6477ee82e8ed8dcf49051b8e74ba5c31e3985454591ea751d4550df3d2e3639ec0d616
 DIST php-7.4.33.tar.xz 10420144 BLAKE2B e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef SHA512 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
-DIST php-8.0.25.tar.xz 10802888 BLAKE2B c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb SHA512 43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
-DIST php-8.0.28.tar.xz 10801568 BLAKE2B de03f5ad262e830c70d24b9e2dd997897e5613d8bbc998ab7e59df703db89d587c6c8955e6f82f0cf6630eed82f33e21567ccf7a873ca07f4d0659f7bf4bd974 SHA512 d66e41cdccc332fccaf03bb24356652b17be5267cba5a47d80f1b74732b674f6a23c91e4a151ca442e629de8e8bcf6daecf0b34cbcbc9e33f53b8da9f06dc6b9
 DIST php-8.0.29.tar.xz 10803592 BLAKE2B 6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac SHA512 5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
 DIST php-8.0.30.tar.xz 10821076 BLAKE2B 9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925 SHA512 fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
-DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
-DIST php-8.1.16.tar.xz 11760948 BLAKE2B ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1 SHA512 4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096 SHA512 d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.21.tar.xz 11862320 BLAKE2B 51195859c23a3216247a66f39e76bf4679f0365d390f31c7dee7437f22f45cee4e4f4de8cf42706e030355d9ec66b471d61fafc1b30da2eb65b339d99ace93c7 SHA512 aeb62947e12646a530b6f61efe9350e4a3632d421ee0bec6a1d26dc2fd680c782e12cbad06496f2d4ffcddf5182aa3438c19a59b0d593fc43789271241ec0383
 DIST php-8.2.9.tar.xz 12035468 BLAKE2B 8b537fbd080cbe1e2b627c34110f41a13549ad6bd118803214bfeba3bb8564eef0c1d0d2ad14a500efc488078cd0e521e3a883865b4a79c2c4213cad670e334c SHA512 26c53dc737d6144cc0a3ce9134f92f59eb29f62c44b7d6159b92a25bdb0fa80239d7f6b6b663adfe444e57e98b202381df9b35532f40168ea093ac56d4bced19
 EBUILD php-7.4.33-r4.ebuild 21345 BLAKE2B 07cbf045eb598131ca13920582d0fbfaac23d78c387bb831409ccbfb4e839b79ca4d48b66e287fab01e9ded7d548467629838c6bc52cbc7afd2ab9859ec3e2c3 SHA512 329cec6bf3a0f3fd4e07df911efa6f7b1ac062605dff603a42abc456b6c3720ecb15224e27628a49a736cf05199f91f49100cbb4ddf6ea028cf989dd1cec211e
 EBUILD php-7.4.33-r5.ebuild 21533 BLAKE2B 2246f60ecb54284555e74ac458551729e9a98000c21c5200df2db511e35429c907f0e1a22fa1fccaab2a99215ab8ee40e17c29843d2a703e0e50745b2ed828a2 SHA512 03bb839e682daa74e1a1cca3ae0843ea61e7b57836302e2726710b5ab2dcf11862e52c5b8012dd6178607d7f62343116e75e5e0d243b29631b76e0570faa7456
 EBUILD php-7.4.33-r6.ebuild 21502 BLAKE2B e8e5f58105088783b8ed435f4705ecb3891ad8ea17ecf63c9bac6b911a256f4615964325df7af2d63a925e842a57ee8cf2c7de1fb4bc1d11a2afbf9b5fa086cd SHA512 98f75d9ac14141407a8b8fdbc94bcf06b7b0325a0feb90acde5fbbdbdf669b1e5208f293eb43bc3ba58332f8b5fee29972884e4fbdcd941625cca78b96778bfb
-EBUILD php-8.0.25.ebuild 21880 BLAKE2B 966f8b33f46767a4456686cd788f0b3c1b8fd4049f2022b1136a8530ef3a5021efb393db45de6ce60aa77ba029c384858838e576a6d2799808246fbc2645730f SHA512 2ba7d167b4075b89e6aac2feb387103ae3fca4dc0be4d6791d23995f4eeb1ca65941664374c52e48b07a8815ccdc7bf1c79b9f2da910bbae8c7c3c373b856ab5
-EBUILD php-8.0.28.ebuild 21883 BLAKE2B b0c23c162b11e652a57ec6218a26b6792baf81190168a6ac6c279d682bfa4a7a36b02598d063f9fd69f503bf463a97660b7c6ccdcfe637dc8a24cf097909f459 SHA512 2c8326ec110c74729a8daad7cfcb1a3c58d86ef741d6164e9248d68519dde26739e5c2c1bef89819fa641ed4c07f7566dfced4361ece573789a5752a3b9d9136
-EBUILD php-8.0.29.ebuild 21850 BLAKE2B 30c89684d086d2562a7b6d16c6c72c9f18ebe4a2e0b96b922c4a86292e845f34ed8047568593c9a078eb3800eedfc90b56725fc13b8a8f9cb66683d98e9c8923 SHA512 342dc912db1e7117044faabf265853fd265178dee671a23e9fa00d3cf49a5350d15fa02156a19f964230a5b0e961c415173087e5bb161cf4606c1b01687d8c9a
+EBUILD php-8.0.29.ebuild 21848 BLAKE2B 304c8ed923e338a1bfab922bd8e98e24a5cc38d95126d748d955d022cc39c11d6687c4c9a6b7c9f7d848deba5d9eae100760f54b4fbd95c266707cc006960b1f SHA512 85cf24ec2773412555331bd1d94b7695076b21f3864fba46764f85e1b6722908d439fec1ea773a748f0f4ce68be59f65612add14b19b1f3a17ec7f7110033b49
 EBUILD php-8.0.30.ebuild 21942 BLAKE2B 827699ea72d9adc7d65eaa24699a40d809ae70e9cc5fb0b2f3e6527644fe9afd5538f74ff4b86773937992b56d52b042d409d4ac9ce6d488fcbf636f463177d0 SHA512 b4b1c5839f67d25bc621f693906f2238acb9203604f5ea78b248cd84f2e8e111c191e7b085e8b8210cbf18dda64695c2d755bb43663cd66296f531ee5365cc2a
-EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
-EBUILD php-8.1.16.ebuild 21818 BLAKE2B 1782dc5c71cef2ac3ca067f4d53fcf64e61850044384dfe9bc0e64a025ab1dcf328a455b2aadbd17dd8c92cc65029337598763e3644f488122cde39a913d3343 SHA512 2215fb5851cfd28ffff620ffe86b0d924f61e9a24ff724fa019be7c788fb7de3c53f23489d21553fd81670887cd463b959f9f9857a53cc872e72f70478e330d9
-EBUILD php-8.1.20-r1.ebuild 21912 BLAKE2B 09c455238617b57c66b9913e85226293f0d6714d5f0831ce352d6dde4b81eba3a48fc5b547aad2cff5638f1ac2c2ca36db2293e9943c77e3f2d029b0ff50a43a SHA512 d76af211f86309094ff21e5e98ff755de96b2eb9c6a1c14fd915385a81f823a1842dd25ef6bd11de094dd62eb8ba0a9d0d5a1960527542af8946fb01911dd749
+EBUILD php-8.1.20-r1.ebuild 21910 BLAKE2B e6a524d34d9a13d561d759ef67a9b5e54d7de24102802deb4446d1caa6d997dd9b5e31960abc0a05a80c5f41d2d10cad1abb5f982e90cc9e80f58ef13bd1eff5 SHA512 45fefb29283621baa9796d454bd104e070bce921f64c1627fa46bc238faf17019d8f9a251222e7f1ef51d1de3fbc61c49a84da0ce93b290852c63fa27463205d
 EBUILD php-8.1.21.ebuild 21996 BLAKE2B cf5c46780aae16a099cf97b803a18e06229976395b96c96781a5c7f7a6678b8f76f70e466e5ab419471f0c83a587ac0d1ea7d0b438cc2c90ff9008335147af33 SHA512 707a40a4ba96d6b8ea5e423a1ebde2b54c9b33eb2a6dc8b1134fb2748f4563b39f38aff96117ec4b27ee9294af03db8a0de0b4d7c41e831839eaef1b3fa2bd95
 EBUILD php-8.2.9.ebuild 24825 BLAKE2B 17fa43e5d68ed2246e1b92488b86c56ac1d8be8b54eafb3daa3a27a51c1a3941214172a28880c488561271a88deb590e0c95979a46c5f5dfb79c94c499616520 SHA512 5632dfd9191cb9ddd2552acb86f0cc51a807041c945b4dee3116e0d10985ac4efc6c2288474f8a87c4e299d71e88c4c482e783ec3af3e2d6e7e9b8fc4d827f09
 MISC metadata.xml 4018 BLAKE2B a2413be53cf35069736693b31b2ef8d4277c25c1cb4ea75d949e3a50809e77b9fae2dceeb8a71bcd0ea4c74131cfcaeaefa09ca67f312bd7eb934c2e07156502 SHA512 ba8385d8596d5e71d6b5cc7e225d2afbbed0cde36ea1b49a43efd16c03141d63baa26b440ddfeb39dea04313467077353c5ac6b8b75307bb64ea0c09fe456933
diff --git a/dev-lang/php/php-8.0.25.ebuild b/dev-lang/php/php-8.0.25.ebuild
deleted file mode 100644
index a324fe5db937..000000000000
--- a/dev-lang/php/php-8.0.25.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/rc}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-	"${FILESDIR}/php80-firebird-warnings.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.0.28.ebuild b/dev-lang/php/php-8.0.28.ebuild
deleted file mode 100644
index 5c7c1a50ad47..000000000000
--- a/dev-lang/php/php-8.0.28.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/rc}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-	"${FILESDIR}/php80-firebird-warnings.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
index c7f33d03fbfe..7a01d64a53cc 100644
--- a/dev-lang/php/php-8.0.29.ebuild
+++ b/dev-lang/php/php-8.0.29.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-8.1.12.ebuild b/dev-lang/php/php-8.1.12.ebuild
deleted file mode 100644
index 44d5665b7da9..000000000000
--- a/dev-lang/php/php-8.1.12.ebuild
+++ /dev/null
@@ -1,757 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.1.16.ebuild b/dev-lang/php/php-8.1.16.ebuild
deleted file mode 100644
index feafb22fd38a..000000000000
--- a/dev-lang/php/php-8.1.16.ebuild
+++ /dev/null
@@ -1,757 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif ffi +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-	+xml xmlreader xmlwriter xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	!cli? ( ?? ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	xmlreader? ( xml )
-	xmlwriter? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	oci8-instant-client? ( !ldap )
-	qdbm? ( !gdbm )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	firebird? ( pdo )
-	mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[jit?,unicode]
-	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.29.0 )
-	enchant? ( app-text/enchant:2 )
-	ffi? ( >=dev-libs/libffi-3.0.11:= )
-	firebird? ( dev-db/firebird )
-	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( net-libs/c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11:= )
-	ldap-sasl? ( dev-libs/cyrus-sasl )
-	libedit? ( dev-libs/libedit )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	session-mm? ( dev-libs/mm )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	sodium? ( dev-libs/libsodium:=[-minimal] )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:0= )
-	tidy? ( app-text/htmltidy )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.9.0 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt )
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=(
-	"${FILESDIR}/php-iodbc-header-location.patch"
-)
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "../ext/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Emulate buildconf to support cross-compilation
-	rm -fr aclocal.m4 autom4te.cache config.cache \
-		configure main/php_config.h.in || die
-	eautoconf --force
-	eautoheader
-
-	# Remove false positive test failures
-	# stream_isatty fails due to portage redirects
-	# curl tests here fail for network sandbox issues
-	# session tests here fail because we set the session directory to $T
-	rm tests/output/stream_isatty_err.phpt \
-	   tests/output/stream_isatty_out-err.phpt \
-	   tests/output/stream_isatty_out.phpt \
-	   ext/curl/tests/bug76675.phpt \
-	   ext/curl/tests/bug77535.phpt \
-	   ext/curl/tests/curl_error_basic.phpt \
-	   ext/session/tests/bug74514.phpt \
-	   ext/session/tests/bug74936.phpt || die
-
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		--without-valgrind
-		$(use_enable threads zts)
-	)
-
-	our_conf+=(
-		$(use_with apparmor fpm-apparmor)
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype)
-		$(use_with curl)
-		$(use_enable xml dom)
-		$(use_with enchant)
-		$(use_enable exif)
-		$(use_with ffi)
-		$(use_enable fileinfo)
-		$(use_enable filter)
-		$(use_enable ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
-		$(use_enable intl)
-		$(use_enable ipv6)
-		$(use_with kerberos)
-		$(use_with xml libxml)
-		$(use_enable unicode mbstring)
-		$(use_with ssl openssl)
-		$(use_enable pcntl)
-		$(use_enable phar)
-		$(use_enable pdo)
-		$(use_enable opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_enable simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap)
-		$(use_enable sockets)
-		$(use_with sodium)
-		$(use_with sqlite sqlite3)
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer)
-		$(use_enable xml)
-		$(use_enable xmlreader)
-		$(use_enable xmlwriter)
-		$(use_with xslt xsl)
-		$(use_with zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype)
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg)
-		$(use_with xpm)
-		$(use_with webp)
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_enable gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl)
-		)
-	fi
-
-	# MySQL support
-	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	if use odbc && use iodbc ; then
-		our_conf+=(
-			--without-unixODBC
-			--with-iodbc
-			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
-		)
-	elif use odbc ; then
-		our_conf+=(
-			--with-unixODBC="${EPREFIX}/usr"
-			--without-iodbc
-			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
-		)
-	else
-		our_conf+=(
-			--without-unixODBC
-			--without-iodbc
-			--without-pdo-odbc
-		)
-	fi
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "mysqlnd")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite)
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit)
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-external-pcre affects ext/pcre
-	our_conf+=(
-		--with-external-pcre
-		$(use_with jit pcre-jit)
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	local one_sapi
-	local sapi
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	local sapi
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi="", sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						# Install the "phar" archive utility.
-						if use phar ; then
-							emake INSTALL_ROOT="${D}" install-pharcmd
-							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
-						fi
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	local m
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-8.1.20-r1.ebuild b/dev-lang/php/php-8.1.20-r1.ebuild
index b04862db5694..ba1bebcdc20b 100644
--- a/dev-lang/php/php-8.1.20-r1.ebuild
+++ b/dev-lang/php/php-8.1.20-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 585595ca2eed..38b48019be62 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 3945f55ca9af..575285273db2 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -3,5 +3,5 @@ DIST level-zero-1.13.5.tar.gz 917575 BLAKE2B f6c015bb194eff386ac5bbb077fcd58526c
 DIST level-zero-1.14.0.tar.gz 927330 BLAKE2B d025d7b6315037e9ae7fa037d3f86781ccb4f5a2736f5f2c8a8aa250eb0fa313c33b481a0a703781f17d0b3162c87b7f4a83d5d4668e79e82ef9a8aa1087f739 SHA512 6eb862492fb25fdebb5c2b93a24c02608f2a5e91a746e49ecdb8f5fa8f5c680644282ff4933fc7f6d15cb1d7db1f55534e5696b70d2553f0f59bfdf5f6ee1788
 EBUILD level-zero-1.13.1.ebuild 633 BLAKE2B cc086dea7cfc67032a123e83e1bfd4ad1edd394418e080469a428e06b8f20f12d97d0c23ece9b7117f0b34f60b7a130588028396eda5f482281f8418d360a466 SHA512 ddb0dd1061a98c8713976e148e700d333c7a35f492dcde7c6241bc21597322d8a498c63097a7493a081ba7b6c400a85fee6a0aaacffef83e9a71ffb8c0ab3e56
 EBUILD level-zero-1.13.5.ebuild 634 BLAKE2B 8780849488c71843451d7db0b9193ece1764b33c0c225de726dac941bae1cfc0180f0be3362f9fead6a9b079f0eb6200be8fa3b3b807ed3f8d9489e7b534bf16 SHA512 89bee1d949d0f73f5d3a1b71f1f07ab2e952a5b325795a9b77b783af34c4a85daa45ff48aa0ae836b0cdb9f43fcf06954b7ad90eb69b97894952947e4a23ffb5
-EBUILD level-zero-1.14.0.ebuild 634 BLAKE2B 8780849488c71843451d7db0b9193ece1764b33c0c225de726dac941bae1cfc0180f0be3362f9fead6a9b079f0eb6200be8fa3b3b807ed3f8d9489e7b534bf16 SHA512 89bee1d949d0f73f5d3a1b71f1f07ab2e952a5b325795a9b77b783af34c4a85daa45ff48aa0ae836b0cdb9f43fcf06954b7ad90eb69b97894952947e4a23ffb5
+EBUILD level-zero-1.14.0.ebuild 709 BLAKE2B 28b166e8b2395eb921a74329b69d6447f9a28dfbd35d2d25ba6a762536899854d4e82deb84af4d555bf4d0a79d4b21edcaf12645f8754754211f2d005d5948b3 SHA512 085b71fca56db41b8f630b13ddb062acf0b856ed3e846ee621bf32a63c24e0772537ac06a610204ca8ba54f504f6e352464e91e11990576201e706632cdd3d5b
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.14.0.ebuild b/dev-libs/level-zero/level-zero-1.14.0.ebuild
index f019194f4f68..5fb383635c28 100644
--- a/dev-libs/level-zero/level-zero-1.14.0.ebuild
+++ b/dev-libs/level-zero/level-zero-1.14.0.ebuild
@@ -14,6 +14,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 
 src_prepare() {
+	# Don't hardcore -Werror
+	sed -e 's/-Werror//g' -i CMakeLists.txt || die
+
 	cmake_src_prepare
 
 	# According to upstream, release tarballs should contain this file but at least
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 176b210cf732..f5a25a3b7370 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -9,5 +9,5 @@ DIST openssl-1.1.1u.tar.gz 9892176 BLAKE2B 5de9cb856e497596ecba008bad6515eefd093
 DIST openssl-1.1.1u.tar.gz.asc 833 BLAKE2B 7a978a94264a14be04372fea39868e9177e8a0b0f24344267702022e19ee0f52e91ad141d7c54da870f7ec0df9b2e43b80939f1d274dd0b44d36da2670e3a468 SHA512 40245d65ace95b2002bf64bcba184c92fec3420b08d9f61f3a709c4842e9478595105d8adce33a08eb98d351d2a0989ec342b08cdd9104498ea0543b6e592d28
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
 EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2
-EBUILD openssl-compat-1.1.1u.ebuild 6554 BLAKE2B 4b25feccc1a7d3a7b7433a76d8edb880ad5a3d556887f1b20ee31b4704a019938216acd683ff785e149f7b68e38fcdd847aadf2c295eec7c784c814d959c43aa SHA512 0a19d0bcb5fa6795a4ad16c1423cab296b1a5335549fbdeeb356a9a01c9f79cd230e4ced83c62f941d59594a710089e78e25d68342673b3299f1464970e54555
+EBUILD openssl-compat-1.1.1u.ebuild 6561 BLAKE2B a0c883a4beec3f92ca582733c089a9bc92fe886e54f4993a4bfbed4f9e1f3011c64c639ccf626bdae39714855ff57de735a2b3f62861c1255814b1f91a413699 SHA512 c49d8da8a73f807b862cc07c5a11e9f3107a701dc6cd673197c362da75f51b5cbc4e14961da2f46ce7ef401bdd12f0edeeb081f2f786c315f601cf30de443b33
 MISC metadata.xml 1223 BLAKE2B db6fe704a4a09590821cd011556759cfd60543fd531fef3bd233378f396ac5e67c7d834eee4e544995c3af02dc9f222ac787e0b8a1c48a6cadd06541c81372fb SHA512 3cd0b3d8ba2c2c31d3240a080c0edf61a3b090adb4bb14c3b79c9cd1f0c0ac332a9c9457b218a09fb9192cc82004dba57cd4cac404fdd5ddfe4f0c7780b596cd
diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
index b56cfacc466d..bd52a17cba4e 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.1.1u.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="$(ver_cut 1-3)"
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d9c1084b9d38..9e3160bef0ad 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index a81533b014d3..fd573344b7a6 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,3 +1,5 @@
 DIST black-23.7.0.tar.gz 586177 BLAKE2B 4bb50b6c7409a97aa277f1048c17101a1c91368b9269cf4c08d3052c036887d2ed6e5f1f2e044c14f41bf2d969d65183413c2a9810f12d96cbf09778c9b1310e SHA512 78d5e87bfef4dcaff007455e8c72dcd45f9374c09da6f4ba45ae7caa980005d1bc984c68fa44d4abf7969a376a4039546e7e8f537c3aa1331d213e13dcbe3941
+DIST black-23.9.0.tar.gz 588540 BLAKE2B f3c94acb1af6c4bf1ada948d4ea7b7cd243184b920fab7e741d9e5ee4a82e163e5570ca1451424ea379362ae1755907e4b5e63b517a4e420d6cbe9d69655a10f SHA512 4d1ae51353c7a0a4113796fcc10824228d5bd9a0f19474efc8c5e3a9b929433a586f058521fd1dae35301e9e33e6d231b0584f81514104ac5c787f8e55cb9fa8
 EBUILD black-23.7.0.ebuild 1411 BLAKE2B a34b33a3cfbf25f22b27e60d26931c86fcb5c8121d02660e7f6fd96fc3fbb0e19199c99f00a51e7a1ad40bcafb0213a59f13104537db38301a128748c0a2c38c SHA512 440d1b59f0fe0f4e1901a6181e819940123886ff0e28db0670c88b72dd57771447fbe5dcb2e815b8bc057690571e0d740106f4dbf7bad08b5e2371ecb71311cb
+EBUILD black-23.9.0.ebuild 1419 BLAKE2B 159bb6253fead0e9868fa730d93cda3942b8bcbdeba595a4ed853a7a5b38de2c1118f7014637adf229fa94faec559d2620093a0d8d442f85771dc13b711947eb SHA512 7891509019d71dd6a88f6b07cbf7b706136f36b20695abb14dd0a75305adec58fffe5ab0f817553e587b61800da15f38146c3779149e23e06b66df4c3c94dd11
 MISC metadata.xml 446 BLAKE2B 7d9bdbc4fdd62c1b4278a824a75dede64ccd3a4d865722a99edbd4e316342879eefa7b249c453668a5d33009e134e2feb4d1ac01976146c3e988f3724749d4a4 SHA512 0a3a912fc1d439a92452e48c9749705cd2307e645bb1274d22265656f6101574edda79cf04c03ae512818e7077e404f79fb1f70fd68d9c7cd3be3417f991700d
diff --git a/dev-python/black/black-23.9.0.ebuild b/dev-python/black/black-23.9.0.ebuild
new file mode 100644
index 000000000000..29726cd5e4ea
--- /dev/null
+++ b/dev-python/black/black-23.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 multiprocessing optfeature pypi
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)" --dist=worksteal
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" \
+		"dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index c54fa1321def..06e663b79823 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -1,5 +1,7 @@
 DIST hvac-1.1.1.gh.tar.gz 317494 BLAKE2B 3a6849a1f41a8e45f436baae3f5e2ba400c4b7cc49b253eca1741d8685d0499a9cfd42d3eaaac330ac949f64b6e9dc66d209df0efe2e9248b5750eedecca924e SHA512 f5de49b33c257ccfcdc662ed269e843d3f76912bc2e773663e72c8425d1ccc317cdc137dc7bb978e0e966bc6248f34953306fc919fba2cc8f97f0a695b5daf2b
 DIST hvac-1.2.0.tar.gz 310344 BLAKE2B be81cfb9b2632da9146ef9153017e478e121a908bfb7a4838169f0a1984b91fe29d9efeb887352e02244136ba96c1ae98618de88ecc238f2f1a6cf2d46b45401 SHA512 61fee19dae22661c8c9aac56656b3038083ff6487773ea7fd62cb9655b55f8aaf60d40760125179c790a02323ea8711829261969695459c67834c4bdd315312d
+DIST hvac-1.2.1.tar.gz 310371 BLAKE2B c7d0f10b7721035d1e474d4d5aeab636c2475b5532e2ef79be1f7e1f5e854363f56fcf8c46ace3b10725fca029d2da0358af321c37842696b6ab5010c481eb58 SHA512 17d0bb485714e85937dc74a96530a921767efb7f10facb211d68e9e0bb39477ca105bdeafbe9979a390d05a6af66a8aabbf1ada75b391bea8e091a62ad1a49bf
 EBUILD hvac-1.1.1.ebuild 1133 BLAKE2B a3015bfa768d9ed942d55d97e028e8128be317b20da9788a008fc3a3f8d1c3c53a475b4b59f3327753447bc7c5b8c8936021960e68531c5d403b157065310e03 SHA512 1c264defdb9d51834570cbed967bfdf6d6321eacf262dac6dc70fd616f9c9268a8555d979b99b40982f42a0d3be96cc173736f0379dcb6fb27f9225f8759018e
 EBUILD hvac-1.2.0.ebuild 1054 BLAKE2B 6942771c811f204a7ae679f509495fabf87682abab365366fcfbd14e792c7b89a3f5a36d47f850ffbf92407daffa0aa1672b18dc67060ea005f95c1af444ca81 SHA512 e68d45b1bbc6c727da245832ec0aaff3a895922bbe41e22286cfd96e598b28506ed44e0c09cf1b163b2fbd519b6f8dc45e9b8fec6fc0e7927c843a0408bd52b2
+EBUILD hvac-1.2.1.ebuild 1054 BLAKE2B 6942771c811f204a7ae679f509495fabf87682abab365366fcfbd14e792c7b89a3f5a36d47f850ffbf92407daffa0aa1672b18dc67060ea005f95c1af444ca81 SHA512 e68d45b1bbc6c727da245832ec0aaff3a895922bbe41e22286cfd96e598b28506ed44e0c09cf1b163b2fbd519b6f8dc45e9b8fec6fc0e7927c843a0408bd52b2
 MISC metadata.xml 600 BLAKE2B 476b3248fc61afcdc6e5c2db811f27218a7fe070744226289706412ae895c46224d179fc5dd3883d5ff08b1b5c21c86fb649641d4a7fe5edfcebf7ae58c75c7f SHA512 f2136ab711c25905347a774cb63471f3308267d102cd2dbae0a69ba50ef2728bb3cb3b4d0dfdc5d079d40e712332f4e62ef014eeaac5523cf47ad03133d02f1b
diff --git a/dev-python/hvac/hvac-1.2.1.ebuild b/dev-python/hvac/hvac-1.2.1.ebuild
new file mode 100644
index 000000000000..143be3d93ea6
--- /dev/null
+++ b/dev-python/hvac/hvac-1.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="HashiCorp Vault API client"
+HOMEPAGE="
+	https://github.com/hvac/hvac/
+	https://pypi.org/project/hvac/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic-version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# ldap_test is not packaged.
+	tests/integration_tests/api/auth_methods/test_ldap.py
+	# https://github.com/lepture/authlib is not packaged.
+	tests/integration_tests/api/auth_methods/test_oidc.py
+)
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index d4c1b970df91..f35f9f093279 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,7 +1,9 @@
 DIST libtmux-0.21.0.gh.tar.gz 267484 BLAKE2B 36d7af1bd90ff5a9639587d79f49643eec1e218d3b1839f5febdd9b6b402886e577b15c920cf458ecb14b4e6d532955b6d71ecf932060e6f8ba32193d6bb0162 SHA512 27000581396d79665e34b67a9e59bf639ca0fbd855ada9648750750e41e732cdcde15a05c6548993f08a8637783ddb478de24b75d5c18a198541c36b4b08b9cc
 DIST libtmux-0.22.1.gh.tar.gz 266173 BLAKE2B 743d43fcebfb0058c9ff13f0fb9ad811403f85bf80dd68dbeead86fe079b4176db15c9bf0a8dd48fae67cb9fa968633595a51e6fcf6091bff54df911d2dd17bf SHA512 f056ecbf793cd90bb60d50252c78eb67a8312eb3eda92d68ff69ed85270f23c9d4489789438fb9d228600320a2afb64a29a70c00a415604b65079167381c46d6
 DIST libtmux-0.23.0.gh.tar.gz 267917 BLAKE2B 55b564ca517b346cdcb81b114cb62d3a10d94aad7be54b5172669a4c42f9d01d54c467ba32d818ec4851ae148bc0cadf174e47f5026a5025d015bc1e294802d9 SHA512 28b2b356e2f774085ffd03a1c63b1b7d6ece24765c54728a3e71fabe7b46b15f61a0a0263366bb67dfc440129c07cb6ff6f6dc6141b8d1f2e9fe96fc05b8b88a
+DIST libtmux-0.23.2.gh.tar.gz 268237 BLAKE2B a5e7aece4d7160f87c48c2c02371c6d6b423aad979d91683561b1d8a7f750c626b522af5d1d97157c536adfd612948750433e77faaeb633343af37648bc9bf01 SHA512 f8952cffa94fcf9b345275d3d5e59ea0a164bbcb93aacbd2820c8127b34526635d7b9a25f5684cd385744b1de626b8bce19d2c735579c2bdffed6a17c9f8f394
 EBUILD libtmux-0.21.0.ebuild 1224 BLAKE2B 0c19dc33639ef451cfe4659aab6b3b1e38d96cb6899f6dbb85aa655a99010be3174ad43c7c7522d3c2d8e597e789048ae8feddc03836d4ab60fd9c5333c9b665 SHA512 9c9e4c7aa82223e54b12bfdd3c088954221f5794723d4766988654d99e3a349eb1928c664cd590021f1a30fc3a854e0811e8f993ffe431394c0fee3839a54b19
 EBUILD libtmux-0.22.1.ebuild 1226 BLAKE2B 33869818384b647487e2b595316882f800a75a819ae93e1744273347f1b020cb96d03d83546ecb48b76f1c4627335db6d84b46e6aad92eced8a8cc2bd3121cba SHA512 ff6dd7967eb642106ef4a5ec353d405b814df2c7d3a90d31b085bb3789155cfe0b92704268c8b3d5a82dde6dbcf700d71182d5b3f63ba7ae346d9f76d3ba769e
 EBUILD libtmux-0.23.0.ebuild 1195 BLAKE2B 227f83d5e181758b32a5cbdb30c6b6acb51e7c5908e7ea31a723a3f49bf8c68a0ad71feaedacf66bdf35c1b177311ed0465c2e47c462d5c55fc69251d780e5b6 SHA512 7c2c351f9b944eadc69941d836cc94bea3256cfed19cbb6233523a3d5081f4640df638b4c3f8f1bc0b4d16fe8204ba9b36313eeff988f834acb848ba42cb9a40
+EBUILD libtmux-0.23.2.ebuild 1226 BLAKE2B 3b20a820caa4b4ac8d6b1707fb0e7e94ddeaa1d2c569c654df2557098b560ff82f2bbca204a1f6e2354267f5ddc97dec9b25eb2f788c6b2c49d1f9282064a4ba SHA512 b948a65bc3bfdcc3eaa25792fd10766953d15a0183200457c9e9335c8023f954c963ed5a7052df9aa8e5615a6c7c90ff93d22820f505a58bf132f0da1107be8b
 MISC metadata.xml 403 BLAKE2B 68af7251349c8999bbdbfb7b55ca4632f8752468d7e478fd985097af86d00afe93b231667a25e3c997a3bc86b708d4e6d6ef5c35a783871cdc83519fc1db1ab1 SHA512 2a88df695e94f1da966bb72f7e90d00f2e343e40fe1924837f8c087dfc9a9a84fe0b2909a98f2f41ba72f6ba01796888a80cbac3f1bf9f05984a06385037d977
diff --git a/dev-python/libtmux/libtmux-0.23.2.ebuild b/dev-python/libtmux/libtmux-0.23.2.ebuild
new file mode 100644
index 000000000000..dccbde0811b2
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.23.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API for tmux"
+HOMEPAGE="
+	https://libtmux.git-pull.com/
+	https://github.com/tmux-python/libtmux/
+	https://pypi.org/project/libtmux/
+"
+SRC_URI="
+	https://github.com/tmux-python/libtmux/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	libtmux/pane.py::libtmux.pane.Pane.send_keys
+	tests/legacy_api/test_test.py
+)
+
+python_prepare_all() {
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+	rm requirements/{doc,dev}.txt || die
+
+	# increase timeouts for tests
+	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
+
+	sed -e '/addopts/s:--doctest-docutils-modules::' \
+		-e '/README\.md/d' \
+		-i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/omemo-dr/Manifest b/dev-python/omemo-dr/Manifest
index 8dacd715a6e2..e33889b0ad78 100644
--- a/dev-python/omemo-dr/Manifest
+++ b/dev-python/omemo-dr/Manifest
@@ -1,3 +1,3 @@
 DIST omemo-dr-1.0.0.tar.gz 152784 BLAKE2B c239d22cda3aab247ad2d5c706f2f15d22529ff9348564e55aa0c780a1c93b169f1cd4c2f8d6ac0fcf69f3d5d8c190627870363d168432e3a2247b7091bc4d64 SHA512 ad1d43936f94d47a01b1f4f3a8e31bf81d16132714b29f6ef5aac84a907a8bec3fd1014330cdc0169cfa02e64f7815d11ff4ec8a2aa3aecd9141748d2ec469b1
-EBUILD omemo-dr-1.0.0.ebuild 557 BLAKE2B 9c86582ebfdebe68a7c9c61db97fb8d573626db31d317d17612659542d09624056200da827c8ee02e688c43293031f3b3229bbc0ed31f731115a12f55f7580a0 SHA512 d8fd7ccd77df83f3547c81fdbb7614be72f19d799b94b66a932da72d54e0baf44eed2c30804bae9040b340a0a56cbdce1946ef104e2cb23bf6c8f2a5b5ada5b5
+EBUILD omemo-dr-1.0.0.ebuild 564 BLAKE2B a0cbda46d0258b9f25d2a397acd1edff7cc591c108732c595735b6f6ed7c331583bf47a993a105ebd7eaadbcb7489b4c422912190760d7d8fa428da7e3f2b851 SHA512 070dcf1400c7508a12cd1fa3caa285400ac0d5e5f647b211310caa4a89ebe68ce629703fe97b2935730aeac12d251d0356a51ad4dcbdd3125d75f3fd7a981459
 MISC metadata.xml 312 BLAKE2B 5f4e3484489b8cdd211c411903657954f40770f2e2a787439c5214502deae9f9e3dec062f6708ff92cc00aaae9a2f2ad91480f5c174dafe00dba48008e8f989f SHA512 e5864f030b211faf2a2f95cae0123750697fcd5785883da1c7c37c86a9bd4dfa075a75e4c26e08a959f6e26b0998cc9d1aedaa98edd43329624cfa40a4929935
diff --git a/dev-python/omemo-dr/omemo-dr-1.0.0.ebuild b/dev-python/omemo-dr/omemo-dr-1.0.0.ebuild
index 86d2c5eda91d..816c6152f48c 100644
--- a/dev-python/omemo-dr/omemo-dr-1.0.0.ebuild
+++ b/dev-python/omemo-dr/omemo-dr-1.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 2b23bff1ae54..78e7b0a54c43 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -3,5 +3,5 @@ DIST pythran-0.13.1.gh.tar.gz 3639196 BLAKE2B 8aba73c68542d69dd2287d7081226161ec
 DIST pythran-0.14.0.gh.tar.gz 3642431 BLAKE2B cd5eeca0c52b0c3d17862b38c176b435a63a1f399e66979b8ac2682625cd0b0e074265e79bfdb6e57db989633954266132752e9b50c601ff43ae5c17c3e34bf5 SHA512 2a485c00b015abafc9ded28bfea8d8a7ae3ce87b5b654c318d5514fe12fd9374b599c05e3c4a2ff911fbae84df2efaa3cec2019c91e82ac1f36e0cc5ddeb2d8e
 EBUILD pythran-0.12.2.ebuild 1533 BLAKE2B c0d06b33214d61e7f6e9699234dbdb2b62cbe7f8e7b8479f3f75317e2934942186ab14340e5153321e0a8266ee5ffccdff8b7de8673a899a538389c4eec5ba18 SHA512 28341e2f44a9107450872b476d1cd45a0e123faa8d3ce61b8dc8257e8f4035d0767b5d0277a6ca8abe1b7d17a8bea06e1f1a221a2d9401ffce746e8db339ca14
 EBUILD pythran-0.13.1.ebuild 1716 BLAKE2B 43e2e3a4390b10627239e7a1143db7775d5355d7fa52effe0463412b8887121a6e49f6ce360e0d1c9989547f08f4e9743caebab853b7c7eb208b5ec2ccf12b8d SHA512 683183b48a35dc55b72976a83f2f2288e2dcf8391bcd12daba9b5bef40dd379d2aad22c1a403909a44f87a0705957e937d11338d9c26266369c8e5fc83cd6734
-EBUILD pythran-0.14.0.ebuild 1717 BLAKE2B dbbbd15f31713fb775302f5a9739af311631e71e8f7c12bf950c6cade3c6bc090d21106b3b73d1b83c9b257b6962772ff0466aeccd95a63bbc075d7726d87360 SHA512 3cca4510a8a210b48d5a47683555b747c1d3ab90234680034d4bebbe9d53e1bb7061ba2cf2ef527ee974d42b8fe31ecfba97e7a897b7d9e686394bf5955eef5b
+EBUILD pythran-0.14.0.ebuild 1724 BLAKE2B 867c890fa341d6c10577a9891ee8d5ea49323b74902a9482d750b33a75d2bbeb79358bbd5c2a8645709b2da4b00115fe336006d6d76b39c9fb7047c0a68f487f SHA512 06ebd7693655a1c800deea647c9be5053f82472d6705774415ac6eca80e85461cc061c61c6a9a77a1048ced58d5240d84132e273e27b938c1cbf39abb0368ad0
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.14.0.ebuild b/dev-python/pythran/pythran-0.14.0.ebuild
index 84bdeee0a19d..2c9f905b343f 100644
--- a/dev-python/pythran/pythran-0.14.0.ebuild
+++ b/dev-python/pythran/pythran-0.14.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index ea0efc7722c2..e06009d843eb 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index e4e3af17f3c1..e7840bd6780e 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -57,35 +57,50 @@ DIST 6.5.2-0-202307080352activeqt-documentation.tar.xz 258364 BLAKE2B 1b931acc4e
 DIST 6.5.2-0-202307080352qdoc-documentation.tar.xz 426704 BLAKE2B ac71925df5cbace81c9256c7ea4f3641432c18bc17a38b2a1eeb200e970c9e9b98d1aa765043adef9183afc65e382031f1933171803202d144841cb0cd3424df SHA512 93d8b4848adb0be7fec7ea6d9b1676ce5adca37295913f3e2b9625f24467ce2b27afeb6b19c2a6fad252438121059726239cabaeffebcc0c285ce357031247a7
 DIST 6.5.2-0-202307080352qmake-documentation.tar.xz 345900 BLAKE2B be10f586db882e36396daa8be15772556bdb97406fe6110d06a4789c7095d5747a9fecff35ff81f7ca83b00dcc674e2fb69d7dab9086d9c340778faee2130cc0 SHA512 7f74cad9f86f42a670aeb94ac34ee08dc59be737ce28761c77a32f3e2af8c12aeb843603158c7f2dc86a926d0095642e125fa019222e9344545c350efa08b0ea
 DIST 6.5.2-0-202307080352qt3d-documentation.tar.xz 5589976 BLAKE2B 8bd90efa42976703e6df542a9c533a5cfd68d5975e0a989f210eb2e2fb4a058e7f916b92fb4f27649ec88af16fc91509606c4e5eb7d59973e1641f740df5c117 SHA512 f420afdbaf72d60b0bcc81e2850926240a9e12d7bcdee2941753a6f41b90789d5faa232b12c346d1ffaec6daec11c395d5fe27fab83fd3e1b29dd6cd6365c0c0
+DIST 6.5.2-0-202307080352qt3d-examples-6.5.2.7z 60331296 BLAKE2B e0d5ee44eb73037f44b124ae3cec3988eb4b88f163728e13c9e66f7e987cfd80b0c6040efdbde9bec330daa72438ee43c1841b9e95180096bc2ef2965dca97c7 SHA512 e84073ee2dc88a621b4929ce877b784ebeb4440078b12e5875c126e0225d2716d70fcd1ae39534723912355358d0504ba1f9d9a0e22e49f2831d7093d628df86
+DIST 6.5.2-0-202307080352qt5compat-examples-6.5.2.7z 27946 BLAKE2B fcd50ebb36ce6dd3e55c8e821bf7b2df08c1882c4fdb4f34d6f4e9af988329e51d8704ed4d46ad8bab793913bb1bd6db9d55e5a1cbd9878ebf5dc9aebdc2e46e SHA512 e727866bac8a305b17963eaf2bef3004c3fafcebc8dfee2c1facab75cad847885f98b98620586b91b44c3dc1c1719e86b1735c9eff0119d39a7840da31f3a071
+DIST 6.5.2-0-202307080352qtactiveqt-examples-6.5.2.7z 19990 BLAKE2B 7a1f0368be09ecc94ebf8136ee056164b23be89416c1405861e8fadc5a96e2e153757443fc9ece841eb6c8968078038d1cb477730e4fde243e966b7ec48fd9a9 SHA512 ce90d90b2c1088de3d16f3429c8c23f07c36fdbd2f270dc261769f2bd3fd84f0550715219cfb15426e78d6f4703ca078d34327f9adc2a409c234eb269c5080af
 DIST 6.5.2-0-202307080352qtassistant-documentation.tar.xz 461404 BLAKE2B 8d24c2eaeaf92bf65f09bf836b08c74bb65b99c9206d5b369df995fc5433822dfb201c593c0047f8dcf3041e2ba2bff1bbca3b6c818650c05166b77db1101990 SHA512 02a2856ba9be24c29028fb0ca14079b474828030869411d72b8612b597b184362dfd8446f47e8d20796b5ff73a27cc3d59b182ab86b63b6e134b7972b74c9f6d
+DIST 6.5.2-0-202307080352qtbase-examples-6.5.2.7z 6004752 BLAKE2B 9048951f26970b20a08f861ddbba97973b186695d126d1ad8b53074ccaa213099891038362662cff5b4dcc6c3a80d957e2894762bd474103fa83f6ae2ee6170f SHA512 568ef792b11985bc013ce7af9a88579399068ab196f148cb64df23b9cb01770d888531dc3c16ef3ce4009b1d3c5ff4d1f4999f83c91d3218b0d1bd778a12d1e4
 DIST 6.5.2-0-202307080352qtbluetooth-documentation.tar.xz 941064 BLAKE2B d5967163788035063b571719b770d775db2033caafcbace6ad2d50e0c147bd78f21f42bdbd80aa8ecdb1db4afc83822c258fd5d623fe50619f3fb6c9cf919163 SHA512 4e911dd2c9970b361a241364679175c1e3c1078df10ac5f06ae4120b410a899b9c8a4660af6b8a8499aadb4969ec37c4b4f84efb1deee06587e030cab10b0cae
 DIST 6.5.2-0-202307080352qtcharts-documentation.tar.xz 8904584 BLAKE2B dbc59ecba54aa1e8fab327bcdc64c14c37b838be38047457df7bbc4d93c3e6bd27cbf48186defdcbaaac886ce1a14ed4b9bb8912c0f176fdbecf4c148e785604 SHA512 f61523b2a59d5936a628b6ab003c395a2d52e1847e81c530917a30d4ef609622572461eda5a7d2505f3b90a52df9597fdca1732cc35dcbd4442f55ca98318fb6
+DIST 6.5.2-0-202307080352qtcharts-examples-6.5.2.7z 162403 BLAKE2B 3b01e2209c213fb877977e2f7198300ff9067f09563d03852322e86babf51048aa855f489c86c9a1fa9370febea04e463027bf5c886721de84e94faef1574c55 SHA512 83ccb3291342f93a0003862ee4d8508c1773ba26f8162ec6d57e07b7d88aeadb54df69bdcf47fa7ba644f9cbbf32f588cdf5a663e2bf3ec8f35babac814c486d
 DIST 6.5.2-0-202307080352qtcmake-documentation.tar.xz 92548 BLAKE2B 7918b2d6795701f1908ddcc4c94aea1a463de4389c994976776bb3e131b55e310ea3179f0eafb203ab837fceae0fafeaa09fcfd3d6910e1d3ce05ead5432a14b SHA512 e5bad6f8f59b9183c42b851659214b53e346ba1f297484473d154e59a774c9fe2da18ca065d0933b11b926d47dfea6ed00752ca8ddabda7f438ab5f58bd28efc
 DIST 6.5.2-0-202307080352qtconcurrent-documentation.tar.xz 185676 BLAKE2B b7a7ddde909ded65a6a1ab884780c1fd2ad9ab9e119af9fd1bd1bf965794a0ef75134c8e8254f0f5618c439cc642d6959c7be6d67e31b3500c84af2c6870dcc1 SHA512 2434e4f0672449ef627e3c31637f43d4671a0b3d3949c2f0e05a8b3f10ec632f6e18a062ab2939e0df1f3a5996347228d4ab5c8742554ab88a33f1ad90fa170b
+DIST 6.5.2-0-202307080352qtconnectivity-examples-6.5.2.7z 323298 BLAKE2B 247c14fa3aab2ee08536277c3bcb90de82a9e91b5b424bdf18fdab6f805b80c51fd599081f3b4ddf42359241763cbb8399936958cb8aaeb9bb1b62d0908f5d8d SHA512 0bdce105c4e12c79584ad5a7ddc689d5fb7057bf4deb01aea7c4e51c4390db90b76c62de6f6283f440ebaeca403359be7b12da65fcd1c93ee4f84378ce3cba7a
 DIST 6.5.2-0-202307080352qtcore-documentation.tar.xz 6968764 BLAKE2B c5d28fff285ee2d57d90020a825dcbf9736e3cea6d0a9ac6b9204a65fe8f969bcf14d7d917c62d4033786b2e8989ebf2347537c886ed8abef9a694bfdcc90e6f SHA512 aa5b5d38ab7d0a4b348b7b75f104151f623b1863141e337a24333925ffc267b77a2e1344af692776f3296f52da87a70eb96a2a65f4a29d8305927b5f585d4a5c
 DIST 6.5.2-0-202307080352qtcore5compat-documentation.tar.xz 319844 BLAKE2B 0ad4a81b730bd366cf073ab3e0638bee2edeeb5af7b5f12c21fa117b54561f93fefdfe2c4dcd76ef79f4286db789151a9b2495b0670c4e19fadf4658b6aad972 SHA512 cb0f316c03e7d4bd389a53df044674cace75656b01b3e2e662ae8ee5e4602a577ed63a567d976cb72ca6ccbb99dc00ced6af63d58b9f3b118364b31f8e64b067
 DIST 6.5.2-0-202307080352qtdatavis3d-documentation.tar.xz 2707304 BLAKE2B f120ece44ebd9f3974e3aaee86a4d0baed467739bf7db80d965dadb11f4551bdfd0c0c71fd76652dff1d081fb8ca94e778981eaeefc263d830f15a4c7f827205 SHA512 7829361017bf88deadcad2dd0ac587fd93b071db96ce2f9bc6832769c41e44ad96091a9d44be99502141d519db3b574f5cdcffc2a57e4075f6e5a828e1579abf
+DIST 6.5.2-0-202307080352qtdatavis3d-examples-6.5.2.7z 2771291 BLAKE2B ad609274f90fb999633b3a26cedafa60b0e1d6d162097e8c365ac5b47bb594cf682d77de6a74bd361bec65352a06588db53a6055b858fc997f969c2f877362a3 SHA512 9bb6dd339be6d3b658f0dd97144478e03c529aa2ac96ad11d31afa1f65f933e5592068a5e67a1b23420a8a93394a3695a984b1ec29e418722bd1acbe0e6f3729
 DIST 6.5.2-0-202307080352qtdbus-documentation.tar.xz 330300 BLAKE2B 41d994ea74ac57f3fccc8ce2e67276bb31131635283f726f5b3a4422c3e7cdeb1c4ff12de3066c7a534a6279976936109ff7c0c06f3eb12c23dc0cd830622135 SHA512 4fa763260da08abd3b3b8f00b1bdea3f020eb876e05e4f8a56e6af4aa514e8a48d2f887b4dce995fec4bde2e11990144c96fda6c8ff2ff3a605167200167c7e1
+DIST 6.5.2-0-202307080352qtdeclarative-examples-6.5.2.7z 14484011 BLAKE2B 519bd431a00987ca05eb1653d192f073452066ef76cc42cda7d021208b45f236f32e1605cefb5718266ee00cb382786497ab567d694d082c99a87e49051308a0 SHA512 b96611ff3c5576b8ec2b47f8197194b0e9d1f052c63c90f985e4d301c871541dfa42b7784ba85b97c2a9853050e5ba36ea332e3fac3367382e1c31a4fda666ad
 DIST 6.5.2-0-202307080352qtdesigner-documentation.tar.xz 3300944 BLAKE2B 94521a57b6625e9e434014949e5deccb83ada46077bc2f995505f020c79b0fcae17374625593f7cc9280c1ea4ed71d15562b90627b38437f3e59c9d53c82db06 SHA512 72cbdfaaef92c9d89372719506ece81e11661a926b861873009564438b7c6c3ad4e41a4be4027864d82583e78a1c72ac99412d51b0cc5137608617542a37e8a2
 DIST 6.5.2-0-202307080352qtdistancefieldgenerator-documentation.tar.xz 149580 BLAKE2B 03b6bceccc087055174a57ff8eac938a23310abcb40897dad5921ab827c7df02dbd2d6c0df5d85bfbdcdc5e78e3ef19e42809edb9a9fdc338d6114ff2000db73 SHA512 a74a2a423001aed05b5e90b7b1abe00d5f59dff0f20da16b127c0a863df5d7dd33e8bdcb63b7ce42882169e48a54ec43a95abb26d08497efbfae888e5aae8b18
 DIST 6.5.2-0-202307080352qtdoc-documentation.tar.xz 13790120 BLAKE2B 793b2539cfffccd989fdfddb57e4a4d658a91cefef6d580ecfb67ed4cff94d756daca801a74bfeb1bc6b4f226e94261ffe387760bc68cd2a1236d3d4d5e021cf SHA512 e0a91bbb0f7cbd338d8a74f97a94b0cfa3de1312f57f4a7d4ca8fcfb795acef0b5651501d77709810477538b6c85257ae632e026ff5bec3b3cd57a588a51f157
+DIST 6.5.2-0-202307080352qtdoc-examples-6.5.2.7z 6983473 BLAKE2B cc09cc358e01767b2b603535a100960767f36df596d686405a252c91ed2449d7af0d68691c3413ea6cd7edc6ebcb8b10b9bcdf7c77bb5901f1c090d363cba170 SHA512 c7380291379bcb9f72369561a412df97fb8c0499216abf8ed950f73a9bf51166363e0744f025107b80c849a98dd0ce555249c617107aa020aa7e0b99736870fc
 DIST 6.5.2-0-202307080352qtgraphicaleffects5compat-documentation.tar.xz 25782956 BLAKE2B c83a7669735ad9b4e8099ca5ad6078383b751729f7a4796c5f0ad7bdf15e9a8872992aff7071381a417ba82f6d07982a07b1c431fb31bfa8b2395509838a81f7 SHA512 b639a1decbcd06765b594e6f975c171950c7e033df7f17eb10f4976bee63d863dd86680fbf691192bb7a2e8c7e5572409c931a38371eddd15bd7a9b23971524c
+DIST 6.5.2-0-202307080352qtgrpc-examples-6.5.2.7z 96765 BLAKE2B d210ec1eec003fc347bdba1d26453c0ebb6e4cd4b93440775e001856a88fabc3439b574642bcf7db596e7967ff09f0bca8297b52b9bda054b8bbbda4ab7720ad SHA512 1e3932e63d412352bea4e801a28012044cbdabe3d2290c82287da5f1a426def43b9d75e149e79247bde88835e31225b56fb25ff1deab4aa2cf2dc39df460bdce
 DIST 6.5.2-0-202307080352qtgui-documentation.tar.xz 6343520 BLAKE2B 9de0745f36d255afb7f5511242a01a5152dc75b579044d88cd40834c5b8773cbbfba6904793306487c46474986484c5df7f208b5a94a9e48b51dae99c95cd4ad SHA512 57ae8cb418061d27fc529c33adea5177c031330950ee47b0d55dbe01a84b7836f526b55c22811d60457219d0c8ffb070f77292cca559e6dc4000eb3912c31d1e
 DIST 6.5.2-0-202307080352qthelp-documentation.tar.xz 211552 BLAKE2B 1453d5067309b3d2f7528ff71fe67ee4a19dc880cc1844c59ceb2796cc78d7af6736bcf78b38bdc7d4df75891c964036b66ac00a21f0284e6c000d2cce51e4b6 SHA512 f3593990f79bd48c47c6431e5b4b4813ccd16a4cf1b3697e9969749ddbec39d55fd2f0baadcf3604f97074b080307a4f4b625b0f2047026df988e982977437ff
 DIST 6.5.2-0-202307080352qthttpserver-documentation.tar.xz 292316 BLAKE2B 6021da427237464c7e4b77addafb8b4619e74ff3bc4b02eccf5f65fd4bdad0824ebe6e04ea5c3fcc62247109bf2e7fa2180bd0151e8299bf63e021bb0528e580 SHA512 e78bbd1f1dc00100b8992161808566cef7dd9d2588f988b77eb1315054c6db5bf911498e8e4db2b5d42065f968c9763b9210ccde174ec242a7f6f87b1f656332
+DIST 6.5.2-0-202307080352qthttpserver-examples-6.5.2.7z 51606 BLAKE2B 9d303e0172b1564b403129c15f007d4e623d98653f8ad1568adb035d922c6a575a895a2822f5bda1b7a0fca7aba81e392a78c39a205f9af21900c8a2da2cea75 SHA512 b58d829e6fb555d78e4f13f045d7ee90d7f0057262cefb2a9f2208719da65cf49ef5c42d6a7717c231e27a0674b5d36a3077e7bd5b1c8f9754578e283c8ad79c
 DIST 6.5.2-0-202307080352qtimageformats-documentation.tar.xz 32140 BLAKE2B 664ed47b9c951177320501d5cb4f086d8aa6a098ad8590830b17283c2841ed850066add12e382124986d6d38285964ffccf96c5df517f62c6381681e2fe0b7df SHA512 fd4808d32f0f4e4873b33241faaeeb97a887e6c888e87474414734bf144933f4f971b36b658b9f4cc4a7b1aa5429e1a1f0e7b6ce5e0f843634be689c23023995
 DIST 6.5.2-0-202307080352qtlabsplatform-documentation.tar.xz 538468 BLAKE2B e1a3f245f06553e94e160f5b17b3ea99e7a4cef4a07ad9c0165bdeca1d8329e5cd3f0ba20c4f0f530cc3be87c08a6205b913f416c99de6d7456993383800800b SHA512 8997fa229a094e3dc22971e3c938f452b041da0520dba9bbd48ffa79296c262728f16a619ce88d6a906a591188cd2c45a6675f16f188207ea6e8b2effdee60a4
 DIST 6.5.2-0-202307080352qtlinguist-documentation.tar.xz 1113356 BLAKE2B 2277c10900f3a76ee1b14cb12fac1cab77060b02c9c43376cdb4a875418bb5991e62472c20291375225dc2f71992664517133dc564d71ddca6d5d7d80bae04dd SHA512 2f4c86bf08465bd9ad7f047b26d061a5741da9f6300fa43c7060f3bac18033eb4fad15c673a877339d3518869edaa2d3df2fc2951bb395f46f09972b92c2186b
 DIST 6.5.2-0-202307080352qtlocation-documentation.tar.xz 2760892 BLAKE2B 48216132d6e171ca77a5afd5cc1f4e0cb45d03944eff71d815f8ff8f25dbf9d9adde82e4d352a80e78b2a1a479a7ff34b27024d885234f2c94ed29c3db8d2e87 SHA512 2a23f621f49245bbae53f43022da886c28c37171caa9ef345f44852763a23f8db220ffb728e3dc2d0e97c24dcb5fe51ea4fea678d55480e3de761372f69e68c2
+DIST 6.5.2-0-202307080352qtlocation-examples-6.5.2.7z 1433628 BLAKE2B a503930fd0a9c7ebe61ca9ce766e757e0b787700e82e343b061756d4a773cc0e434fcd6f56d7e95e85b3037cde85faad501ef96f5d413ed772cc1bd8927b2ede SHA512 9006f15f6bfd789f55cbd31395f14f571b440b77b3b213302a4e664053b52b9cc3cb2bfc81d9246f1e58bdc03077dc23ad7065a94d0af758f7582e98dfd4300e
 DIST 6.5.2-0-202307080352qtlottieanimation-documentation.tar.xz 40316 BLAKE2B 24fc2d0a04d9fbbb8b69d75b39866be8bd69b4c63b47ae7a4e274c9ef0b4a29abb3e33b4f2325209c1464fd4910821425e4ef10119b849b94fbd924c8a8e0086 SHA512 ebfc2c4f002053ac6e59af90bf9e22d4fbfb3a9f8fd5325f9e0bd440cd5df2c98561ef1d4a2235d2f8c0e8043168e00f27c15b4e3c58cc1a149680d31f237eec
 DIST 6.5.2-0-202307080352qtmultimedia-documentation.tar.xz 6166872 BLAKE2B 72c4a02898c5020f91991adbd4088d800649d9874119045e5c5cdf7970090bc2eea757574124d744adb968ea9f37030ef6ad4c203d8e245009586420f1fab132 SHA512 3e0d8e568b259b9179c353423696132eadffdbf9b60d7fd5fa6d221c6cf5a48726495acf3593295546d9a86cafd5097bc6b21cad4d774048c8265b48add32afb
+DIST 6.5.2-0-202307080352qtmultimedia-examples-6.5.2.7z 2383450 BLAKE2B 473624e7dfff9a68f6fda2129927e7c1da728da2c7d962bac611f95f0330024c3388817c77f967194f18af08259675f93492fcf83ca91314b1c986a79529a60a SHA512 1f584a3e1f50dbee3ce23dafa6e4946429385972070da71e2e8d6c89a5d6a94383abbc81155ffcae824763e48d6f6d8429607c180e2f55654829547f55840a1e
 DIST 6.5.2-0-202307080352qtnetwork-documentation.tar.xz 1190644 BLAKE2B 869f983bb5272542b936bab8193191e33ee9e50b7c923a97b5c84fd6fee9ea5cb22ba8121a7675a610721e4130ce4d4926eaef098b5e00453cf76b0c8e416a4d SHA512 b425ef7bc03f4dbd4a1d78cbd8f1280019484f7142d2a03befc51c455ab49f98f47faf5a3ce6c9f7f1038a974937f156a744e7b159906f68a070e8a45edeed56
 DIST 6.5.2-0-202307080352qtnetworkauth-documentation.tar.xz 238556 BLAKE2B 7af225c5e09f8f704b0491440aa182f041ee1580759ef7e190a2f63e9583b4c7a17d7fe87b52277f2dc7c3d7ba242f95aad85a5e7b80c741a5fa6bbf45404610 SHA512 3d37e74b4b142dbc9c66235ffb90f18d9b5b0135b6c9a5d630cd06e9d6eb66f308969a8420a39bb56e7c6228b3efc83b31852dbf3e6dc90666538a24a1043fb5
+DIST 6.5.2-0-202307080352qtnetworkauth-examples-6.5.2.7z 69457 BLAKE2B 91c4395ce50c8e7f533a4b2c6f7baf191079d22d606cc1e63cc912bb0bcf2139beed6298a2f32f98def25408a522fef1d52a165e0b14456858f1c2155977250b SHA512 5f65f7aeb13f903cfd25cb35634550bc5b48bacf18ca9d68fce0fb0a12805122a8539bc9d05212ca7c1510203770b129c4544b85694b150a5724258a47cd7f2e
 DIST 6.5.2-0-202307080352qtnfc-documentation.tar.xz 226880 BLAKE2B baca07bf3f7f7740d2aac379f6dfd0e2456c25c4d832c259669fafb57392382690cc0636e8c11240b8ff4d10bd67d75d6b93356c43b39d94f2d9adf076d77174 SHA512 36fe5d164ace9320def0799565a38683afb0e2b0201270842fd07b4a3adc71d65fe7ff27066d28da7c3c919436e5b823e1f92ed9246e3b8fba0e083cded02b8e
 DIST 6.5.2-0-202307080352qtopengl-documentation.tar.xz 1027560 BLAKE2B a00fa5c0f8059b4444779be7f1241c7aca211897c69dfaed2115bce39d4af00e348a70c8eb7c3e42c78de6beb1335da4661b3b2b0a21faf822862f5570b36077 SHA512 4ff16e0fe646cac00abb9d61e143c050601956a18f728ee88182ec86d261bfbb82a69d03e432564eef78acec044381e63585f40dce28b65fa98dd529f76b3d46
 DIST 6.5.2-0-202307080352qtpdf-documentation.tar.xz 919524 BLAKE2B 0136f34d49d55315e1e39c29c7cba02f85fff8fc6302485e503f3a20ddbae1f07da63de42edec4cc539fdcff361a6dac407bced6690d1227ff3ce303d619623a SHA512 bf220f4332363310cd3d4ebce75b7b1d2af79cab62a9bb3a1fd5db5ea102c69bc6be4d84f82adddbea2c77ea4498b94a51a9a738dd2278d5ddef93c467ae6dc0
 DIST 6.5.2-0-202307080352qtplatformintegration-documentation.tar.xz 41796 BLAKE2B 442ef4454881597afa4b421a981fffff54ef96b68a4ff41b79d228c2b9d6f09201188fb28e6dc5999a1348fa64ab9046fe5a9a5561a4556664846f5a84dc499c SHA512 47321189d287b72f595fb45e54cd86fa305873fd1aae0557ca486c533673d2c5bf4a57dff425b751e30befb2bb18d87b3fc494d9953515d2066b4e66d8c10a2b
 DIST 6.5.2-0-202307080352qtpositioning-documentation.tar.xz 691532 BLAKE2B df37d05a251f974289affbbca1b5f5de6e364110a8080954376fd23a3718aec704f9983c4581f30ffd5762d4b4676bd7e7b0d7841ffb680b14d3d0d3cdbb4280 SHA512 5541ed9493404a03eaa2ea467a968b271767be6be60127b83d04b2c2891a25325dd39d47660457e73a7c0b4cab1d8ae1bc5f618fa0e885fc6a098622e11ad03a
+DIST 6.5.2-0-202307080352qtpositioning-examples-6.5.2.7z 1065565 BLAKE2B 686fb319c3ba07105126ce363d956b988cfff33d0a4c696fb6f0552e7f3b4c9d598136d30779a6dc57c00e3cdebcd1cc0bbbd4111a4e1d48930745e573dd5ab3 SHA512 5be5d98116cdf47156c5bfd70e2e500cbd6d8524ca95421f57524def61286191fac50c012b994bc62f4b90b4f48700d4a979d1d6e83072c63da8eed826893052
 DIST 6.5.2-0-202307080352qtprintsupport-documentation.tar.xz 349900 BLAKE2B 23498e6df9fa1494d6eb0a735b127805b34c5ba0f961061af7cd8e9a479350a640525f483a1c32f1233daa1c55a06702e823316d7807fc994a3e4c8fe3332112 SHA512 833b3c517f3fa7e2a9e2ad23fb67522f7f297d29cccca5408164543115d52f67a87b02e7684cacd5efab82cf63be33e407c492c80c9ae90310d21058b63accce
 DIST 6.5.2-0-202307080352qtprotobuf-documentation.tar.xz 142944 BLAKE2B 9541e7f101b9c98d69244b5a8a865edd54a74b2df01dabfbe72c7e74c35d033d5994d4dadb36db53890b5af3e9c16fccb4022b01c184a768543ef3b6a473a6b8 SHA512 5b0cea31e7baab3fa58d1fb7589808a1ab95fe8f1daa596a563b4ba7a5e9c49ded8e079f8439ddd7e562e07348a4b9fb5e9e8d074b61933eb4ad5cef6f44f008
 DIST 6.5.2-0-202307080352qtqml-documentation.tar.xz 1430296 BLAKE2B 1534cd670be93499d110538e362822d4b140fbb40221c1e2502759099649f1d07fd1bb4b4706b83180be4975ab6fa3014e49241afb808fd7da8d46c87bc08b49 SHA512 e3f341fd83823ef46903d9e9fedb3c1305d90e6c1bdded7b2d785edba6b502fb4075f289789691a16ffde5df62a41b2dc7ae7f5115cf3a2a44a196d8e7d2bacf
@@ -96,29 +111,45 @@ DIST 6.5.2-0-202307080352qtqmlworkerscript-documentation.tar.xz 31188 BLAKE2B 43
 DIST 6.5.2-0-202307080352qtqmlxmllistmodel-documentation.tar.xz 36864 BLAKE2B 9a40637e1430afda73260efb5472ebdc9dcc215a1db367c01692e0db1394c625e5ff5ece675ed1f59558627aabe18f3fb3e21d98c9d677d855fa04dce3ceb7f6 SHA512 cb70ec64cc84a27d418c97d272a86b5fa4607a2f0378cebedf084ac444e7588656eff04e3aba72792fc6d39d3b408d0d50830b09f0f69543df69181a3cdb8866
 DIST 6.5.2-0-202307080352qtquick-documentation.tar.xz 22280460 BLAKE2B b5b0de77b080504831c341bd2766da38f333f5d95336e427861ab2dea21ac19523156be8b663abbbea1c570d9fd86ef9ac089ccacb55dc77313b4c51f9329180 SHA512 ac223fa71025f9b5389204ebb27920a507866d194bcb8ae3fdd099a59419a217a7573beef8613469b4239d0599319607278e43db0d1678a3b1f82c28d080c52e
 DIST 6.5.2-0-202307080352qtquick3d-documentation.tar.xz 60549772 BLAKE2B 2da322e731814b29e6736e5b3661bff80ee1823acd27020b197a5a0894b552d7764019d190a75f5e0b40e5a438d678f3e1e095bcb3fb9757c311a5069c9d61d1 SHA512 464bed9e121c6195d4d419c2fe43fe0768e0f959110cfc4215a96c60fa1d8c3f3a76e68748e8109c0e536b03f5e112f8a6aba3c4d35d42e8823f0645d3ac1e26
+DIST 6.5.2-0-202307080352qtquick3d-examples-6.5.2.7z 13348350 BLAKE2B 205c8cf3135795bef3b643576557fe33de4929b8b4e869627fdf28f46896a115a9e36e9be5ccb5cfc8bda73cba2aa88f88758fb2f41c8466754078efd051f260 SHA512 4f28e056d7d6094280e1700b5530408b25e2fbfa2533c43fcbd48698989abeb83ee1e88af8ea0557682444dc8e940424ce445edc4a902628cf840238949d23c4
 DIST 6.5.2-0-202307080352qtquick3dphysics-documentation.tar.xz 4585628 BLAKE2B 41900dae8254810d54ca114e1d6b6232a27264649205f56495be35c8e3803ffc8c851db91dbd0f815b7ca8fec897346b1e10cff011364026fe724782421310a1 SHA512 d32d4d9e189488c68c90ebd863d2bca6bf1f359e5987c31ff1c9b392988bb64437a6d3a9bdcf04fd8f3cce13aa3b9b23ef8ee1c52c2b8c59ed5b1a91d0e8d7bc
+DIST 6.5.2-0-202307080352qtquick3dphysics-examples-6.5.2.7z 2355633 BLAKE2B a0ce2decf8cefd0f9770bd720ca3aec75f546722993537cfcb3df0890bcf6c0e9fe8a5d406b048c923514388061c594dd8e42bdad8aa5cfa858f86ef9f283374 SHA512 e62d90d3c892e07be6b0abeea388307884baf6a0a159a8eeeaf8886f8da91482356ae083a3ea0451f7eff3182b5d367167794094a6fa3ac55179cacca6ea25e7
 DIST 6.5.2-0-202307080352qtquickcontrols-documentation.tar.xz 10923288 BLAKE2B 02f1d614e51c9ffd80656873399fa674ae00cf2df92078574bf47a0ec90d5ba78f250ae580e39e1f70f186df49e399b30384cb3a71a3c30481849d0e592ff71f SHA512 a1b214d09b0b49122c21bdf0e386eb141e6df73de45718df8892527639c6c01b31b66df6a05c727a28ee570e9b4ee0e2018bb3d38b45defe66910b52eed3fb00
 DIST 6.5.2-0-202307080352qtquickdialogs-documentation.tar.xz 313388 BLAKE2B 44c1921515e6ce197dde60a1b9bc2099c2b72115b6325dc97651456a9b953fa0d89028b2020fc5b3c33d71baab415ed6e62b696e7185bd422c688faec0505eb0 SHA512 eb4fc49fe98598a6d7ca69e6994841c7e48012550f47ea733bba097df7b6c806f18aca3da5927ff645ae5d72048433fcaae29a4176d3b53d3c232072ec36bd74
 DIST 6.5.2-0-202307080352qtquicktimeline-documentation.tar.xz 152816 BLAKE2B 5cf2383c3f359da6ee850c1cdcabf0597df938ef596b271d76f76cca947fdd043629f6aaf9e6f40179f3e901fba50859d49bbc5bb37c8c1a6eed8dbdb26092cc SHA512 a033fb1ae0cae0ce759451f8317060b6fa36494dd35f416d6735943f1e636ad16a0eced4ad7731c05931f1245ff0d4c5fa888e83bccb84a7f9dd4081b9a75fee
 DIST 6.5.2-0-202307080352qtremoteobjects-documentation.tar.xz 553336 BLAKE2B 50d21b83026e31eef11080d68e427f6a588fee6e245e145443176976623ece8afc5d96ad99e9fe362844be610d4ae266fa90197f05a54b10043e78f0b0b9ce6e SHA512 8148ce6b6d6e616fb4162a1b7204d5acfbee2c34c03c39cb885f42dbbe0c367d2a21ba37e6d09417c96eef8783c87cd71c6fd2e09218d20bd0a324126e17b9a6
+DIST 6.5.2-0-202307080352qtremoteobjects-examples-6.5.2.7z 51265 BLAKE2B eafa408b70a1b51244fb4e92e1b1859207b55284b01157b6de6d6f0379764f8023623acc2c5b62f1808f6d9771fe234aa09465a71e152928da06987d4944a166 SHA512 af84149c102f301c2267b1adf1e682def0ddc4c54d7c40cb058e0fcd395a699b4734875ce5e2fc9ee1c2f2bdc9343bc3fb44ab05a70dfe6cbe2be02352daad26
 DIST 6.5.2-0-202307080352qtscxml-documentation.tar.xz 396412 BLAKE2B f988493a00d823bc384c13276dda8640ec145b739d31b8e02d2eca085eb2153f16f646a86e693f5cafbde77e30c24bf7b24a9caf2f9511602cb5ab3f1b32872a SHA512 d298f20fac06dab8946102e4a0f0f5ccf99fcfb9453adc0ed6cd64a519c80d955ad01519ca98cce6fd0a89097e4fd8c17afcdee1f9b52c615bb1611847b1a80c
+DIST 6.5.2-0-202307080352qtscxml-examples-6.5.2.7z 140270 BLAKE2B ea17a20824fa3e9657c2a5bdbeb16612a087faedcfc621260d5b78c1059c0d6a4b5d933640ba3416ca56aa322c40df1f62c1a116714b19e29ad44a59e239f26b SHA512 81addb9d1572e0db22eed0563540c6a04ffba974cfb5561aa0be4b1fd3e9c60d99ddaaa05ddb8d8944e244f591b3c569f9a60b2dc688b6283597eee6697ee9df
 DIST 6.5.2-0-202307080352qtsensors-documentation.tar.xz 2134536 BLAKE2B ebbf3a4dca96128f59a4b8faa75c78d9e50023225d07675438f72d3403f385d0ebc62e83523ed1b5000a0af49dd694cfc4ab31b86df727922609322e72a1a9c1 SHA512 bb9761bfc99335edefb2990f7bc69fea18d11cc02bc499f25a97eedef6d6a953ccf03ec1ea66a2449fa0f4ac1a4201ad9c463e863fbafab299c83d23b26b3688
+DIST 6.5.2-0-202307080352qtsensors-examples-6.5.2.7z 36074 BLAKE2B 5d58078f6c68f3663fef7418cb09c89529130aec356635bb616734f6ccadfb96350efb7cfa8f4f54a9f0a9577173ad8176d102b34d0e88285e0c0d8d7a4d8c77 SHA512 40640c8b18890497b406217d5f0b70ef6fa160a2aea9b89ad8e90c9e88dc6b1b6bcafce7256ea1453ba589171183d4ab663b22178be0d3d1bc64f3ab187fb768
 DIST 6.5.2-0-202307080352qtserialbus-documentation.tar.xz 736024 BLAKE2B e99a2ef0c7b5c33e8e5131a366dfd42829aded27854475da7b55cad28949307822d6cad2e91710d717228bc4782dcf77ff534fe590c79cac898bac24973dc49e SHA512 6cabd2e232017486da5e5a81bc38c2baf0ca42dc52d93ae2ba4c3d6a94ec55815f3cf5e8b796b397ce1e436a2455acfb36ae7c0b8f758cacf6ffc057feaf0bca
+DIST 6.5.2-0-202307080352qtserialbus-examples-6.5.2.7z 212084 BLAKE2B f602110f26bdb65fbfe8d98474a35870d532d2d08abf6830797646724b5a97a4ed4a01f429a784c0fec2e9d6a1e6dc392eb9f0a7f0584becdb78b75774a724b6 SHA512 d158c735c873a308010c9092924784b73e8cb41423c5144fcea4bbb462128e9b94eefa26973727cfe699a2a77127639ac7c4431f6d35bb6edcfdb9caebfc98ed
 DIST 6.5.2-0-202307080352qtserialport-documentation.tar.xz 183936 BLAKE2B 0eb2bf3ae80ef9bb15b93411b0489509655b325e605a8e7dfdaa8e7e166ffea97e22621cde319fb532a81bb009157beaa7aaacb959dfa3c9444b0ced499847d5 SHA512 16ddc293e0f65d42c096c94891d030dd8218b7de86c44a7d75dfce8201ddfad85ca2a755226c4841078977d5ad74280b6234b8062a612b04a88074236e23ec6c
+DIST 6.5.2-0-202307080352qtserialport-examples-6.5.2.7z 80993 BLAKE2B 2d1d5b07bdab77996c2f134dcabc4af24df5f65810ed96ebb031ae49f1fc1d5dda53215d980303ba4bf9a5f985332224b9e339fc5b51583ab8599ec565c3db77 SHA512 ac4e5f5011a307aaf831ba147c6f856327e2c1b75e118272d0fa792f79e672fd131c93ec3d3f631d893eb9409b512724c0ef074b5fe22efd160a1587c0941c23
 DIST 6.5.2-0-202307080352qtshadertools-documentation.tar.xz 174236 BLAKE2B 54b38bb662e3be32763754a401b86fcea4022660ada9e2446f32e407af90749a254d59aa6796a13ccde232b66f1ede5a63af35c98881b3adb6737c8c4ff4ac61 SHA512 5851e4051d5f9deed33aff9981055616338099b42fc43438e3a5b67ef163d35cda7846ef39cbe170ff0b0029d64272ebb2c8b9abb6ad9ac7e14eba84e5de6fdc
+DIST 6.5.2-0-202307080352qtspeech-examples-6.5.2.7z 156964 BLAKE2B 9b83ea4e58df570c6ce54fcf0d8f048174ff2a655a4d5eb5d096c0084953fb316b3155791bbd1524ccbe079d858f057c38556c94f699af86e2ad277ed7a95cfc SHA512 4911b98e970ec3d832e96a5e698957122057ac54f7addcc692671858e57a205131db48103e20aa538c2f70f626c6d77472df2fd00dff8845941f61c2249fe59a
 DIST 6.5.2-0-202307080352qtsql-documentation.tar.xz 875828 BLAKE2B 241b6fcb2ccd15539a9fec6b724488b063660c73af6867175ce41f826c3fc4d120f8c26febb0c6c960c30ec557357955bce865e16e711a2597d2de221e1dc1e3 SHA512 aa6e61989e0e452e77f4f202bf54c9e76d7192118cbedf4a5ef36b829e6103640b57f0c91616d4587688002e7552b23d224917511265f096c3b90565276e1956
 DIST 6.5.2-0-202307080352qtsvg-documentation.tar.xz 244284 BLAKE2B 05d222bf7bb2e4ded0d2cf91bdadf91f2a0f6a30edea18de6675fb1e1ad8d9dd3988be10f30bc131b1465827cc3bee4eadfb5a6ac0d97fcb58b1da2d05f1e2ef SHA512 b37d50786389386677fcc4445b038d2cd32c25141b5e6403ca990d8019a439182c179c6ee38e29bcae3dc6068ae90b21e624b1900d2ab501b1a7827a5aaefb2d
+DIST 6.5.2-0-202307080352qtsvg-examples-6.5.2.7z 1181759 BLAKE2B 647244b082efe40748d9706bbe16580e94744d8e8fe7bad2daa4a17af83d8e01f9faf94652ede485c702bbcb18e33546b42a8972392833a158b2eb1466c444f5 SHA512 801f1e7f4895ae3c6046c90249e41c321bbc00b53cf97981d10c0f02714dd8fc42526b1ecf259d1a700bc9c6c36c0d243e7abad9d679ca1ab6d15140541e38a3
 DIST 6.5.2-0-202307080352qttestlib-documentation.tar.xz 218732 BLAKE2B c5134f30e6e699d6f62daba736cc420aedea03821e474e96fece27583dadf65889c2869222acad355dc25b6b7a6b06dcc71c349bcd6625d400a5dc19c48c7f57 SHA512 4bcf1c61b3cc5b54c44e84c486cbe7bb774fcea63cbb2ac705f01e5ac54f613834d88e6681e66aa63528f1df579ccd7224c3357ab5ca9dcf63c92b66b689ca16
 DIST 6.5.2-0-202307080352qttexttospeech-documentation.tar.xz 383404 BLAKE2B 4a878c03298c39af5e87b17ba1a8b90bb621d812a1da3abfd7ee75c40ee4a517abb4cd633d27f8b666c7be997f516e4409cd5318a0e491af49eec52dcf729e1e SHA512 25e3193d9657cac518fab80f1c7245c21cf24ad5290007e33d61ad8702c94d1c80b56eeecbc631e51b8f9a5bd2c98d31db768ee08de2c2b944cc089283e31380
+DIST 6.5.2-0-202307080352qttools-examples-6.5.2.7z 454457 BLAKE2B 7f9939d0d084478fc31f0c8eacf6c25d2e3eab911d833ac5b043e71a0ce69c9ad15d42eb90d8d51b4a2abb088dac78e4f4d96a2ddda1060e5a17b606f83fd5fd SHA512 af4b82f0a43058bb314125ef3f16390507cab953f2068af4cabef44ed81d8c7f51c10d1510810ec85935240cff2fb07958ce0f1b3c5bf3564e95500847e67316
 DIST 6.5.2-0-202307080352qtuitools-documentation.tar.xz 206276 BLAKE2B 1d082c40747074356fc4da821e8b54bb102535a3be86af120e680c1fe09417b2325df1d32e3d88d51e7fee9aed4a56c02e886e2a558202bf160d6e2491c4f8c7 SHA512 9ac6182bd91693f05f880827c3740176e333a1dd65fd8f7d8009dd7cc35a156f7da3e08002492d01ac19bb90537370dec865643a0578fc7d089a2dcd4ceaf027
 DIST 6.5.2-0-202307080352qtvirtualkeyboard-documentation.tar.xz 2064792 BLAKE2B 5eb2e221212edff99f47f302a23c70b73ade5116bb6d3f86d1c071461baa45cf3f79575565294711920987bf88abb1fc10b88f927508e292f4194d589d2f2477 SHA512 7f5771612b2945e64f3635363343b9450c34bf68b8a2c50444abd107f469388048485d28e37df4f14327d4205757754119a2a6b38bcaf9b03d341e84f74e541e
+DIST 6.5.2-0-202307080352qtvirtualkeyboard-examples-6.5.2.7z 6948 BLAKE2B a485ca5ad6fe153b37b925fc26c562ec93fb143734dc268b1784a8f9706f44d00a3a1e0167befde1a60975b2289ccf50350df20f9fac925d398356332f928e82 SHA512 10042cc7fbf4bd23fd6f7f868810ebe21478e8769a855b3fd77d7df5f24c8b5c5b5e60c3f752b9b1a8dfcde63080ddd76a031a8b7bac4142bfff58cf6da50ae2
+DIST 6.5.2-0-202307080352qtwayland-examples-6.5.2.7z 511858 BLAKE2B 4d800702028372d428c11a014ac029ef788663775743f3f656c41522b4c81ea259b41a4f2c95f829c3424c56f924028e9243dec4767e28fc89f5079300f81b90 SHA512 55e059bceeddfa8a8f0ca26024d6cb41137a0bc058560ec68b155d804d2e8d9f1474407606ad32214cfadab9a90c026b981195cf357a5ada531b9bd668d054d1
 DIST 6.5.2-0-202307080352qtwaylandcompositor-documentation.tar.xz 1474512 BLAKE2B f057788dbe983443cf58faf9a1856dd2c57e453d1c2b14521d9f97d22011c91aad009ba1f6b527945e17b823a5a0334bdf6e535ea12077b9937edc6f9fd5df22 SHA512 3f3655ed922722e66300ada615d4d8cf9d4909942a8609056cc872c38cc33b066f3033688e4e16a860a3eacd8b2c9f1a0ec9edfcf59d2aad40a592753f5afaa0
 DIST 6.5.2-0-202307080352qtwebchannel-documentation.tar.xz 164988 BLAKE2B 5c4de12e6dbb2d4d40d3f141a92f25d86d87009c357c4c5c4bfbe6f34a4926053630853035f888da61c09c0fc90884697d10a7966f966a8e7c765a01b1bf0abb SHA512 f8dccf0a161073dac0e68835748e51a697dd4d075f0f53a82faf7a4c15498ced5d45b78273efa91d4d9a21fbe83fbf26f7c6742ca0e1b2acacefc450b3d2605b
+DIST 6.5.2-0-202307080352qtwebchannel-examples-6.5.2.7z 65062 BLAKE2B 8227b39d1305c0e51f5a0d48d8930d0d9048daff0d756b2ffd06104ebb98ccc9c51fbdbc02fc6408d55d2b93bdf27dac368444188f9214ee4fdff87b34de437d SHA512 71d449fd584c2c2ec3f32df840caf60f5f1fca181e15fbf8de8a3415cf2e195d1b4a7fc2334ba313bb6b0fa01dec084dde6ceea9fe2ea6597ff5e5e90503dd15
 DIST 6.5.2-0-202307080352qtwebengine-documentation.tar.xz 1929824 BLAKE2B c26b4200f8c38ae144e6e105223b206e6aea810229bad63debd150d009d97f153dcf945cb0dcf4fabe67a4058521d37e0f5c880bd44479cc05dd0019b04ffaa5 SHA512 2bce9e01a82a6e12b7d45db3c86f51ff9b0dcf9406bcfcc99779dd70f2958ea64a2b16671c9407992212aba68c94bb0ba1304ff469bb190d5e768160afe91770
+DIST 6.5.2-0-202307080352qtwebengine-examples-6.5.2.7z 1114498 BLAKE2B cec81816297c49f0f1e8fe3b964ef57ab0896d62f30c9f3133a7001e2443ff5bb8c228f67787a9b4e276b522cefa3f9e34d5aae05c752f75d125e5078f3c0624 SHA512 f8049528fe1eef8f61d9a4494f17c5cad3ae7deb6efc637839d9d859d21f7e30453f7d2f4f488966505632900c86ba9506dd3a4e326ea975de56baceb667abae
 DIST 6.5.2-0-202307080352qtwebsockets-documentation.tar.xz 531400 BLAKE2B 5acee0c5cd0f6321da8e884f1fdeb2acec092a455c1f918c4b923e9e15d5c37a2c2f4e208f8bfb9495bd8e6f571bd360016a1a644bede8b0f9d56a7941644965 SHA512 a047fe520775cd30283429f008b7b403f0bfca0988fea5211db868097cdcc6003ecfeef3400bd359482da5bb81115e4d6d3137a77d39f6e8231c6cecbdbbaa6c
+DIST 6.5.2-0-202307080352qtwebsockets-examples-6.5.2.7z 246732 BLAKE2B c6f84bdf74e1e785c8a66c0989c710ea2c63ea9c3326d0f98fe6fd4ea25de2a0332e8f4024b77e8426689a0622c8401e09e976c7e82081a1206ed65bea5e13c6 SHA512 33d6c0aa040fdd7c5af8a08ea0db78542e3804c25f48941adda8c2163dd2af110cb239dcd43a33df7e0ab4e84ee034e7cfc762c48a7fd8a95fe460cb67e0caf7
 DIST 6.5.2-0-202307080352qtwebview-documentation.tar.xz 125412 BLAKE2B c215ad5884ba6bc5fc9548a5eb4f7a722c8ca74ce89f0dd01eb33007919ad955a9b9967b92e2fe6407a2e03f513d60ae8f5505630a2b6763659455e29f7671ee SHA512 4ebcef3f04ff11fd5789dbaa59122ffae4ac43c1a267e2ca4cae971913f8e4de2fc5148cb21ac468de9646ff1d1afc46f8ae8aff2a0eb956c33782483a3e09ef
+DIST 6.5.2-0-202307080352qtwebview-examples-6.5.2.7z 47258 BLAKE2B fd303abf3d097a1bf7c0e737c93e5a88d34f967f4aa9350d97dcb88c1e3b7d8a109fee4749d5e21218ff6ec485044ba72c9897ebc4fa616a33dd5b371b0aca2e SHA512 149e459ad8ef368b92a700a7e86f28f1d63423c6039209e7f6e91382ef1e3755bb028dc929bfd14f7f4107c872ff5de4506b666666db81ac98a3348c43c5b63c
 DIST 6.5.2-0-202307080352qtwidgets-documentation.tar.xz 23043964 BLAKE2B c8b0ab6283d5f8f78cb2572091182c62665fa994352afa025613f1af230eb4b134dc76ee63a194f79043524592cac42f6ff69cf5d05650f1a024ca91c6208c1b SHA512 e11adf4b33cb6238fe55c7894a997602a34957410e0425f153295c57438cf8f93b9be3a7a4e9b3b77c50e7e530941a59245b8b687dd676eb6720bca9577a5e62
 DIST 6.5.2-0-202307080352qtxml-documentation.tar.xz 257520 BLAKE2B 0d75f414b32368d46d918e93ea10adc523cdcb70be80f796e70a9c15b881946dd5818031e2205e9c6bb1887828bf84ee05226910c74aad0181ab3e086120f48e SHA512 61ad421343b37083f04047dd0e7e68c3332eca8d3730e387818716ccc8973f95c119cf0bfd51bf53254c9b9ccde0f61c6c30af39b0965d56a88503d153bbaeb9
 EBUILD qt-docs-5.15.2_p202011130614.ebuild 3196 BLAKE2B a1fcea250c2fb373126fe9b6190ba48a4a5097a62c873c3661df35022bf0c0b4fef9813cd3fc6d3bf068f3c6fb74eb2612d9a7cf583e73d84dd5795855566a7e SHA512 47652f0db86fbfe08f31053af456b756a53090b53a2bfc3c7828b5791dfa21eb02962f3d802cbee87c7b12471f1543164891631c49954b255d6a97009b037325
-EBUILD qt-docs-6.5.2_p202307080352.ebuild 3097 BLAKE2B 6ea46e7f8a5f760dc9b6222b94fab2a853be36537933d27f82f9fb88a2d8cc66f43bab350561efa0390eb24e5852fd72cc55624f90be2f758626cec554d33f52 SHA512 1e92431b8c1e0fce63ba66a9fd21a04b60083aca01a955763e35f42a09cbbc1192fc1d23659ef8d983e87972b87f28b8ee3de102c9480309b038e3060e525307
+EBUILD qt-docs-6.5.2_p202307080352.ebuild 5035 BLAKE2B 339c6f7ee0e02db8cca02263566bd396e6f984b5df0efc4d637cbaa3502092f7a3d8a3fd03141eed2601b5956fc791a16f919e52b8d73803e392cb923d37cf6f SHA512 252b535718a697a76ba9a2e69beb1525b577fa408a92c38d7dc9f756ed278450a86f9b2071e238b51cbe5513b9fb5e82fd5a9839a3ab6c3eecfe9485a16dd346
 MISC metadata.xml 5116 BLAKE2B 5efae3f5542b01326cf11a9bfbbdab10e648652b26c77786289e4d843d69812f8e9b39d14c502cbdf21dfc68fb92c5cee5bae44848f3226fdd15d6a7b9875e82 SHA512 d8bb4bb98f4d30c61b3b1eec02c254fe032aec94c3a46b28b0505622dd5e8a172eb66cd2b4c9fc125e3a66d25c20bf6def6bd1c70d4b05b0481b34ab3c469583
diff --git a/dev-qt/qt-docs/qt-docs-6.5.2_p202307080352.ebuild b/dev-qt/qt-docs/qt-docs-6.5.2_p202307080352.ebuild
index 452f7ba31477..98ace3ec6876 100644
--- a/dev-qt/qt-docs/qt-docs-6.5.2_p202307080352.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.5.2_p202307080352.ebuild
@@ -3,97 +3,125 @@
 
 EAPI=8
 
-DESCRIPTION="Qt6 documentation, for use with Qt Creator and other tools"
+inherit unpacker
+
+DESCRIPTION="Qt6 documentation and examples for Qt Creator and other tools"
 HOMEPAGE="https://doc.qt.io/"
 
 LICENSE="FDL-1.3"
 SLOT="6"
 KEYWORDS="~amd64"
-IUSE="+html +qch"
-REQUIRED_USE="|| ( html qch )"
+IUSE="+examples +html +qch"
+REQUIRED_USE="|| ( examples html qch )"
+
+BDEPEND="
+	examples? (
+		app-arch/p7zip
+		media-libs/libpng
+	)
+"
 
 qt6_docs_generate_metadata() {
 	local qtver=${PV%%_p*}
 	local prefix=${qtver}-0-${PV##*_p}
-	local suffix=-documentation.tar.xz
-	local baseuri="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_${qtver//.}_src_doc_examples/qt.qt6.${qtver//.}.doc"
+	local doc_suffix=-documentation.tar.xz
+	local exa_suffix=-examples-${qtver}.7z
+	local baseuri=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_${qtver//.}_src_doc_examples/qt.qt6.${qtver//.}
 	SRC_URI=
-	S=${WORKDIR}/Docs/Qt-${qtver}
+	S=${WORKDIR}
 
-	# format: [+-%]<USE>[/<subdir>][="<module> ..."]
-	# '+' = enable, '-' = disable, '%' = always (no IUSE)
-	# '-' is suggested for most things not packaged, rest should be enabled
-	# (subdir's name is used as default module if nothing is specified)
+	# Bumping involves diff'ing the unversioned *_src_doc_examples/*/ files
+	# list from old version to the new for -documentation and -examples
+	# files, then adding/removing entries if anything changed.
+	#
+	# Format: [+-%]<USE>[</|^><package>[!|:]][="<module> ..."]
+	#  -    [+-%]<USE>: enable(+), disable(-), or no IUSE(%)
+	#          (should disable if associated package is not in tree)
+	#  -    /<package>: qt.qt6.*.examples.<package>/*-<package>-examples*
+	#  -    ^<package>: qt.qt6.*.examples/*-<package>-examples.7z
+	#  -      <module>: qt.qt6.*.doc.<package>/*-<module>-documentation*
+	#          (if <module> is unspecified, defaults to <package>)
+	#  - <package>[!:]: only has examples(!) or documentation(:)
+	# Note: sub-300 bytes examples archives are empty, can be skipped
 	local map=(
 		# map with (non-split) Qt6 packages rather than per-module
-		%base="
-			qmake qtconcurrent qtcore qtdbus qtgui qtnetwork
-			qtopengl qtplatformintegration qtprintsupport qtsql
-			qttestlib qtwidgets qtxml"
-		%misc="qtcmake"
-		%doc="qtdoc"
+		%base^qtbase="
+			qmake qtcmake qtconcurrent qtcore qtdbus
+			qtgui qtnetwork qtopengl qtplatformintegration
+			qtprintsupport qtsql qttestlib qtwidgets qtxml
+		"
 		+3d/qt3d
 		-activeqt/qtactiveqt="activeqt"
 		+charts/qtcharts
-		+connectivity/qtbluetooth
-		+connectivity/qtnfc
+		+connectivity/qtbluetooth:
+		+connectivity/qtconnectivity!
+		+connectivity/qtnfc:
 		-datavis/qtdatavis3d
-		+declarative="
+		+declarative^qtdeclarative="
 			qtlabsplatform qtqml qtqmlcore qtqmlmodels
 			qtqmltest qtqmlworkerscript qtqmlxmllistmodel
 			qtquick qtquickcontrols qtquickdialogs
 		"
+		%doc^qtdoc
 		-grpc/qtgrpc="qtprotobuf"
 		-httpserver/qthttpserver
-		+imageformats/qtimageformats
-#		-languageserver/qtlanguageserver # no docs
+		+imageformats/qtimageformats: # empty examples
+#		-languageserver/qtlanguageserver # docs and examples are empty
 		+location/qtlocation
-		-lottie/qtlottie="qtlottieanimation"
+		-lottie/qtlottie:="qtlottieanimation" # empty examples
 		+multimedia/qtmultimedia
 		+networkauth/qtnetworkauth
 		+positioning/qtpositioning
 		+qt5compat/qt5compat="qtcore5compat qtgraphicaleffects5compat"
-#		+qt5="qt5" # already installed by qtbase / conflicts
+#		+qt5="qt5" # already installed by qtbase (conflicts)
 		-quick3dphysics/qtquick3dphysics
 		+quick3d/qtquick3d
-#		-quickeffectmaker/qtquickeffectmaker # no docs
+#		-quickeffectmaker/qtquickeffectmaker! # missing examples-manifest?
 		-remoteobjects/qtremoteobjects
 		+scxml/qtscxml
 		+sensors/qtsensors
 		-serialbus/qtserialbus
 		+serialport/qtserialport
-		+shadertools/qtshadertools
+		+shadertools/qtshadertools: # empty examples
 		+speech/qtspeech="qttexttospeech"
-		+svg="qtsvg"
-		+timeline/qtquicktimeline
-		+tools="
+		+svg^qtsvg
+		+timeline/qtquicktimeline:
+		+tools^qttools="
 			qdoc qtassistant qtdesigner qtdistancefieldgenerator
 			qthelp qtlinguist qtuitools
 		"
 		+virtualkeyboard/qtvirtualkeyboard
-		+wayland="qtwaylandcompositor"
+		+wayland^qtwayland="qtwaylandcompositor"
 		+webchannel/qtwebchannel
-		+webengine/qtpdf
+		+webengine/qtpdf:
 		+webengine/qtwebengine
 		+websockets/qtwebsockets
 		-webview/qtwebview
 	)
 
-	local docs op use sub uris
+	local entry operator use subdir package exception modules uris
 	local -A iuse
-	for docs in "${map[@]}"; do
-		[[ ${docs} =~ ^([%+-])([^/=]+)/?([^=]+)?=?(.+)? ]] # || die in global
-		op=${BASH_REMATCH[1]}
+	for entry in "${map[@]}"; do
+		[[ ${entry} =~ ^([%+-])([^/^!:=]+)([/^])?([^!:=]+)?([!:])?=?(.+)? ]] # || die
+		operator=${BASH_REMATCH[1]#-}
 		use=${BASH_REMATCH[2]}
-		sub=${BASH_REMATCH[3]}
-		printf -v uris \
-			"${baseuri}${sub:+.${sub}}/${prefix}%s${suffix} " \
-			${BASH_REMATCH[4]:-${sub}}
+		subdir=${BASH_REMATCH[3]}
+		package=${BASH_REMATCH[4]}
+		exception=${BASH_REMATCH[5]}
+		modules=${BASH_REMATCH[6]:-${package}}
+
+		[[ ${subdir} == / ]] && subdir=.${package} || subdir=
+
+		[[ ${exception} == ! ]] ||
+			printf -v uris "${baseuri}.doc${subdir}/${prefix}%s${doc_suffix} " \
+				${modules}
+		[[ ${exception} == : ]] ||
+			uris+=" examples? ( ${baseuri}.examples${subdir}/${prefix}${package}${exa_suffix} )"
 
-		if [[ ${op} == % ]]; then
+		if [[ ${operator} == % ]]; then
 			SRC_URI+=" ${uris}"
 		else
-			iuse[${op#-}${use}]= # avoid duplicates
+			iuse[${operator}${use}]= # avoid duplicates
 			SRC_URI+=" ${use}? ( ${uris} )"
 		fi
 	done
@@ -101,9 +129,38 @@ qt6_docs_generate_metadata() {
 }
 qt6_docs_generate_metadata
 
+src_prepare() {
+	default
+
+	if use examples; then
+		# fix broken png from qtdoc-examples (bug #679146)
+		pngfix -q --suffix=.fixed \
+			Examples/*/demos/tweetsearch/content/resources/anonymous.png
+		(( ${?} < 16 )) || die
+		mv "${_}"{.fixed,} || die
+	fi
+}
+
 src_install() {
-	# QT6_DOCDIR from qt6-build.eclass
-	insinto /usr/share/qt6-doc
-	use html && doins -r */
-	use qch && doins -r *.qch
+	insinto /usr/share/qt6-doc # QT6_DOCDIR
+	use qch && doins -r Docs/*/*.qch
+
+	if use html; then
+		doins -r Docs/*/*/
+
+		# needed not to let Qt Creator believe that these examples exist
+		use examples ||
+			find "${ED}" -type f -name examples-manifest.xml -delete || die
+	elif use examples; then
+		# still need docs tarballs even with USE="-html -qch"
+		for dir in Docs/*/*/; do
+			if [[ -e ${dir}/examples-manifest.xml ]]; then
+				insinto /usr/share/qt6-doc/"${dir#*/*/}"
+				doins ${dir}/examples-manifest.xml
+			fi
+		done
+	fi
+
+	insinto /usr/share/qt6/examples # QT6_EXAMPLESDIR
+	use examples && doins -r Examples/*/*/
 }
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index cfe4106b3cc4..d48352ab1540 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,7 @@
 DIST qt3d-everywhere-opensource-src-5.15.10.tar.xz 118262456 BLAKE2B eff3ffd0b305e005019ae59c7214f2df12509ce3fe6cde38dc315b8a3062364c714e5b7e3d33fbaa2c7a71ae19077149bbd7e13d49757044c497337ff2c16035 SHA512 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f
 DIST qt3d-everywhere-src-6.5.2.tar.xz 161691776 BLAKE2B 0bae744dda45b5af9a0c2dca98d43a2f0376cca018671cd91ffa6add8e7045c2fbcdb08f5a9966e93c70e1976f6e2b1a3670b1de6362fbe4eb7bb7c03d53a22e SHA512 f7bcc09b5c6c01e58b68cb7af67cef5f0477ec3cdcd924fd365b7411b2e5d89c307f29d099289055fb1b04b8237cc87dc071734433fa4d0bbb21eec698ed731a
 EBUILD qt3d-5.15.10.ebuild 948 BLAKE2B aefde923b2946495d82760f4a446bb53d21bde558cd2ae500afeb92b7435aa24ebcdb0fdadb4e54bf198e679bdc72bf5303417c77c9bbec99c68eea1d387b56b SHA512 3750f03d8d4937fdc1407325016835ba8885679e8cc3100b537102091fcd6c59cd0db120f7b4db8199c8ce00ad65107634539f41d11d9edc25be9728be2111be
-EBUILD qt3d-6.5.2-r1.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556
-EBUILD qt3d-6.5.9999.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556
-EBUILD qt3d-6.9999.ebuild 776 BLAKE2B 2bc748584515aad7c7181a129b247d4a001b30e607384c5208b0f90eea9a5c72877839ed2de01f34f0d38d06c8319248e57c59059fccc91bcc586fe2427f35c2 SHA512 d0bdf4024d0de21f5c3b6c158e60a825ac45d0039fbab4ff867915aec3ff10a9508f1b427e002655964e8ce0ceca112193bb9a26c22b410044b6412507fe4556
+EBUILD qt3d-6.5.2-r1.ebuild 759 BLAKE2B 6846482699a24cfb1573b27e66c861ea007ff39a24c05ce5edc68f2cd9bb46d4ed4365aadc33e0f057d093300592939f0b2db68d4e71b94a38597da7844a2ce3 SHA512 a01f9df9563743b7216c034edd8087c10bc178a62b538d532cb53ffe94649b1daac7cfc51376c14f970cfb0c978cc69c03316cf06f4711ac2253fc65478c18b2
+EBUILD qt3d-6.5.9999.ebuild 759 BLAKE2B 6846482699a24cfb1573b27e66c861ea007ff39a24c05ce5edc68f2cd9bb46d4ed4365aadc33e0f057d093300592939f0b2db68d4e71b94a38597da7844a2ce3 SHA512 a01f9df9563743b7216c034edd8087c10bc178a62b538d532cb53ffe94649b1daac7cfc51376c14f970cfb0c978cc69c03316cf06f4711ac2253fc65478c18b2
+EBUILD qt3d-6.9999.ebuild 759 BLAKE2B 6846482699a24cfb1573b27e66c861ea007ff39a24c05ce5edc68f2cd9bb46d4ed4365aadc33e0f057d093300592939f0b2db68d4e71b94a38597da7844a2ce3 SHA512 a01f9df9563743b7216c034edd8087c10bc178a62b538d532cb53ffe94649b1daac7cfc51376c14f970cfb0c978cc69c03316cf06f4711ac2253fc65478c18b2
 MISC metadata.xml 692 BLAKE2B 807ac52bd34ad8ea6471eb7b03703f20951c941a2b5841fa173796b4d9b3bdee1afc79fb83057a5bd6329db5cf656c0c5afdc6ece087684c14e0a581c91eed69 SHA512 5894daabb0fbee32e8fbcdc35f720f2f3225bd78ac632491d4603650db49c79c41fbe84d1cfde15870ed7a17c39c98cb5572ca5ed1da7fe5311faa7b2b750aec
diff --git a/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
index 2a4dec0336da..fac726abc29b 100644
--- a/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
+++ b/dev-qt/qt3d/qt3d-6.5.2-r1.ebuild
@@ -16,10 +16,10 @@ fi
 IUSE="gles2-only qml vulkan"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets]
+	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
 	~dev-qt/qtshadertools-${PV}:6
 	media-libs/assimp:=
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-qt/qt3d/qt3d-6.5.9999.ebuild b/dev-qt/qt3d/qt3d-6.5.9999.ebuild
index 2a4dec0336da..fac726abc29b 100644
--- a/dev-qt/qt3d/qt3d-6.5.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.5.9999.ebuild
@@ -16,10 +16,10 @@ fi
 IUSE="gles2-only qml vulkan"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets]
+	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
 	~dev-qt/qtshadertools-${PV}:6
 	media-libs/assimp:=
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-qt/qt3d/qt3d-6.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild
index 2a4dec0336da..fac726abc29b 100644
--- a/dev-qt/qt3d/qt3d-6.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9999.ebuild
@@ -16,10 +16,10 @@ fi
 IUSE="gles2-only qml vulkan"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets]
+	~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=]
 	~dev-qt/qtshadertools-${PV}:6
 	media-libs/assimp:=
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index a8a0e0f3b0d7..4dae3ff59790 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,7 +1,7 @@
 AUX qtbase-6.5.2-CVE-2023-38197.patch 14691 BLAKE2B 68de2edb047871de9608a0a570773c9987474f9977f1dad9a849b8ed18dad6ef966997c0293adaee92fd2fcdb24a79a6bd05a71874c548722bfca64d960f12e3 SHA512 0ee7d66a0894879816454fdfd4c9feb958d82e87f4287935704216330e74135709b23cba7a5c084a6b2617b16c54a96eb6eff785d85f0d79b15ef6ccd9da51c6
 AUX qtbase-6.5.2-tests-gcc13.patch 1491 BLAKE2B 72417e910bb35df59c10d18e093bf4d17952d0a39ead552a342020004bbf7c9e0f903140c014509ab806915ff380ad3732e3cd119b9b1ce3bec550b9c247a077 SHA512 10e05e135e4997cc71c0d2f1a0b40131babe88801d87bb11f69aa1ae93cdcdef9e1e510dbfe337b5bd101e4831a401a63a5e49d84f9f865d6db986e3e60277ba
 DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20
-EBUILD qtbase-6.5.2-r1.ebuild 8953 BLAKE2B 579df068d067a9713003bdaf25a74191d3ec4a5694ad24f859ea53c289570a34aa8eaa9dcc897692f76b7f41f2e13410d9e69f81480f2cc0b22745ed8a5fdc07 SHA512 831305547ceffe924987a969820f807e482564c2fe11fe2cbc284540b2a57046c55567737e216baabbb3c4b9a3e74ccaf3157a5f2cbcc85491bc69f7638e3744
-EBUILD qtbase-6.5.9999.ebuild 8916 BLAKE2B 3453a4d8256e2575d7da28ab3a557b0a41c3d8ce8caf6aa4f14db7b978cb5a4a621c024be96aa36ccb88a1e9a67233fbcefb32bd9b7c75e7c1b3e82851fe37d7 SHA512 b5bba8ff33098e291de7446dcc976d2c8fc0b387f1b1543331d3f182678e7e851810683813293d5ed196c06c0839be80b1db99ae545c0b15ae0ecdd886681e02
-EBUILD qtbase-6.9999.ebuild 8916 BLAKE2B b1edb9c1eac281bff29b7f47ab2350ebbbc397835e8cedfd3d8e585122eef31a16cd0d0aeb2e18fe21951eb17040d41a329f196162421fc3a32e2c026f9ef47c SHA512 4fe1930d08ca1328248fd4794c2ce547553aeb067d61d4e266a9ee43487435b83be7ed9f50b3650911fe9911860afd557db0a92e735d7f0846a6854d2b40e384
-MISC metadata.xml 1675 BLAKE2B 2ebcdba30a9090ca67955496f9e88c33756df5ff409821525fff1e3267198c5eb55d5d486fc103b471b6374a169d2cf9b7c3af11628e860a2fdc412100249f96 SHA512 ce269f77e47f082145f42db9b7bf4e4d4ed21c95ec28670b2957f7ae9f6c716a15e67feea88cb15974f59a5d03afa7b70b875674f0c2f4ba5e9fc90d1cb39bd3
+EBUILD qtbase-6.5.2-r2.ebuild 8934 BLAKE2B c11e3181a9f8d8200a59a31008a5a49026a5cba3ee4487274e24c6a2f0a2fc42173bc9306a9a8cad106e1dd1bb6ae8511ed58539b3a9000a1d920763cb943217 SHA512 2db33bd77917eb230a4fdfa5c2e65ba0f3fa79f6838c8eddacfd22045a04cf65934bfee28857f27acfe2670e992577db96f549267ee214aa35635a8ae04b939d
+EBUILD qtbase-6.5.9999.ebuild 8842 BLAKE2B d8090a9bc7c360df38967d6d2d19ac7ef06a9cc1d03a13005662a578f6d4ac3261ceefe91b8919e1b2264c8433a58164ccff6884c45b058257453e9e2fe74aa7 SHA512 d7cecdbbc81e4330a429411cd3e6449528a12b820575820e665984938a13f94d8b7a87536c1a295ab570e0c8e4c487962fff969ca8153e4bd7f5204246ed736b
+EBUILD qtbase-6.9999.ebuild 8842 BLAKE2B d8090a9bc7c360df38967d6d2d19ac7ef06a9cc1d03a13005662a578f6d4ac3261ceefe91b8919e1b2264c8433a58164ccff6884c45b058257453e9e2fe74aa7 SHA512 d7cecdbbc81e4330a429411cd3e6449528a12b820575820e665984938a13f94d8b7a87536c1a295ab570e0c8e4c487962fff969ca8153e4bd7f5204246ed736b
+MISC metadata.xml 1606 BLAKE2B f6e00b051825268bd8976eea76bd297ab52f8821810ec71388ea7ff4e52e7b0fb1ae22313fe29d3fc123eba70efe9dff9f0934d00b07d3a4b055e9f9344b2feb SHA512 4321e0c195abc2d9459fab1706eeb24563382ff47f37a51a318888370565702c9394cc88e45b20c5f5ebc43114693cfe9c783db1389b8c5fae765ce839677555
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 573775d954fd..1ed99ac060a1 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag>
 		<flag name="network">Build Qt6Network module</flag>
 		<flag name="sql">Build Qt6Sql module</flag>
-		<flag name="systemd">Enable native journald logging support</flag>
 		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
 		<flag name="widgets">Build Qt6Widgets module</flag>
 		<flag name="X">Build the XCB platform plugin and enable X11 integration</flag>
diff --git a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
index 3c566fb935d8..ba0ce93ec259 100644
--- a/dev-qt/qtbase/qtbase-6.5.2-r1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.2-r2.ebuild
@@ -13,7 +13,7 @@ fi
 
 declare -A QT6_IUSE=(
 	[global]="+ssl +udev zstd"
-	[core]="icu systemd"
+	[core]="icu"
 	[modules]="+concurrent +dbus +gui +network +sql +xml"
 
 	[gui]="
@@ -24,7 +24,7 @@ declare -A QT6_IUSE=(
 	[sql]="mysql oci8 odbc postgres +sqlite"
 	[widgets]="cups gtk"
 
-	[optfeature]="wayland" #864509
+	[optfeature]="nls wayland" #810802,864509
 )
 IUSE="${QT6_IUSE[*]}"
 REQUIRED_USE="
@@ -60,7 +60,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libpcre2:=[pcre16,unicode(+)]
 	icu? ( dev-libs/icu:= )
-	systemd? ( sys-apps/systemd:= )
 
 	dbus? ( sys-apps/dbus )
 	gui? (
@@ -124,7 +123,10 @@ DEPEND="
 	)
 "
 BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392
-PDEPEND="wayland? ( ~dev-qt/qtwayland-${PV}:6 )"
+PDEPEND="
+	nls? ( ~dev-qt/qttranslations-${PV}:6 )
+	wayland? ( ~dev-qt/qtwayland-${PV}:6 )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-CVE-2023-38197.patch
@@ -165,7 +167,6 @@ src_configure() {
 
 		# qtcore
 		$(qt_feature icu)
-		$(qt_feature systemd journald)
 
 		# tools
 		-DQT_FEATURE_androiddeployqt=OFF
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 9dff844569da..8a845eb86893 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -13,7 +13,7 @@ fi
 
 declare -A QT6_IUSE=(
 	[global]="+ssl +udev zstd"
-	[core]="icu systemd"
+	[core]="icu"
 	[modules]="+concurrent +dbus +gui +network +sql +xml"
 
 	[gui]="
@@ -60,7 +60,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libpcre2:=[pcre16,unicode(+)]
 	icu? ( dev-libs/icu:= )
-	systemd? ( sys-apps/systemd:= )
 
 	dbus? ( sys-apps/dbus )
 	gui? (
@@ -163,7 +162,6 @@ src_configure() {
 
 		# qtcore
 		$(qt_feature icu)
-		$(qt_feature systemd journald)
 
 		# tools
 		-DQT_FEATURE_androiddeployqt=OFF
@@ -188,9 +186,9 @@ src_configure() {
 		$(qt_feature evdev)
 		$(qt_feature evdev mtdev)
 		$(qt_feature gles2-only opengles2)
-		$(usev !opengl -DINPUT_opengl=no) #913691
 		$(qt_feature libinput)
 		$(qt_feature opengl)
+		$(usev !opengl -DINPUT_opengl=no) #913691
 		$(qt_feature tslib)
 		$(qt_feature vulkan)
 		$(qt_feature widgets)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index a3394328ab7e..8a845eb86893 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -13,7 +13,7 @@ fi
 
 declare -A QT6_IUSE=(
 	[global]="+ssl +udev zstd"
-	[core]="icu systemd"
+	[core]="icu"
 	[modules]="+concurrent +dbus +gui +network +sql +xml"
 
 	[gui]="
@@ -60,7 +60,6 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libpcre2:=[pcre16,unicode(+)]
 	icu? ( dev-libs/icu:= )
-	systemd? ( sys-apps/systemd:= )
 
 	dbus? ( sys-apps/dbus )
 	gui? (
@@ -163,7 +162,6 @@ src_configure() {
 
 		# qtcore
 		$(qt_feature icu)
-		$(qt_feature systemd journald)
 
 		# tools
 		-DQT_FEATURE_androiddeployqt=OFF
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 2f9ceff368c4..7592d70e34df 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,7 @@
 DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4
 DIST qtpositioning-everywhere-src-6.5.2.tar.xz 1456284 BLAKE2B 15ec5202f72ccec5b5cd5e887eacd34718e47e150fd290e8ef3e03e6566b647ca4e2995c87bc54fad598b0225a390eaa93fe7685419006ff39db93fd3803488d SHA512 8319e999de227d6ee999a4e7f84e3a12e2a8b070375fd7b86cef7a7962cce1d4d45f17a846df779561e1cedde80a80240bd2a03259c8a2ed5ebda6e209bdd991
 EBUILD qtpositioning-5.15.10.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
-EBUILD qtpositioning-6.5.2-r1.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a
-EBUILD qtpositioning-6.5.9999.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a
-EBUILD qtpositioning-6.9999.ebuild 1350 BLAKE2B 1ef2f37d2998877ea48cad3309f2105f3853857e6f349e5084560a54dbcf4536d752b66c11cd0c3d82ba6ffefa13c2444958469d9137878607f64baf3ac2bb58 SHA512 8586ec27f68b4307ec81ee902e59120e740a5e0ce7d6a77f003e4a0777a3228550df3ea7bf079da93b520f32da9bb8229d95877b175710494d3be9956a6c485a
-MISC metadata.xml 695 BLAKE2B 13fe75d106b1e2067eaf8113a9f613a3fc575c46c0e92288155d9d799a8337557b8c0e59bc2e77d28e1ab1c358d50d14904d135415ee32f1003901ee18b094ab SHA512 f3310f84aa4fa176bbcde51d8e451a2ad34a502ec9a1f0943381bdfd099b8137df68ba18547320ced87bc68b2ef77307b7b5cf2a10bb42f100adfbd4be871474
+EBUILD qtpositioning-6.5.2-r2.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
+EBUILD qtpositioning-6.5.9999.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
+EBUILD qtpositioning-6.9999.ebuild 1444 BLAKE2B ffe8580c4387d0f830c53171bdd6699cf539302d54dd6e3138dba12f00452ab8a89e87af9ec179bfbc7387e36a57f016ca1900d190bca3dbac40572cfacf2df0 SHA512 1e144814c599b533513050c3add315a8ce5ed96accbe3f5e495a9e5582d3230bfbf9e14230c2c44e92c64232fcde8e72458bc93140256aa03b5886c3486c8d03
+MISC metadata.xml 804 BLAKE2B 94a5445b2839e69d26bb57e8467dd1eab0820c8511304283a4db38710e7026f5956614285526451f77188a7e25f12a638fefbe6a544424fbdc422daecefa0836 SHA512 f3037d4ef45f0490dbf9df8d57497d38931076b5e9c774161633d061ee644a0282ba390d6d95d6195b8f18d91229f055bf4a9e786717cdfc98e2fb87c0e32245
diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml
index 307f4190be2e..2d5119ff80c9 100644
--- a/dev-qt/qtpositioning/metadata.xml
+++ b/dev-qt/qtpositioning/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="geoclue">Use enhanced location information from <pkg>app-misc/geoclue</pkg></flag>
+		<flag name="nmea">Build plugin for parsing NMEA (National Marine Electronics Association) sentences</flag>
 		<flag name="qml">Build QML bindings</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild
index 1a70305f545f..5bc8b82de998 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild
@@ -11,12 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="geoclue +qml"
+IUSE="geoclue nmea +qml"
 
 DEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,widgets]
-	~dev-qt/qtserialport-${PV}:6
+	~dev-qt/qtbase-${PV}:6
 	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+	nmea? (
+		~dev-qt/qtbase-${PV}:6[network]
+		~dev-qt/qtserialport-${PV}:6
+	)
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 RDEPEND="
@@ -27,11 +30,13 @@ RDEPEND="
 src_prepare() {
 	qt6-build_src_prepare
 
-	# would use $(cmake_use_find_package geoclue Qt6DBus) but doing
-	# this side-disables gui+qml if do have qtbase[dbus]
+	# unfortunately cmake_use_find_package would break things with qtbase
 	use geoclue ||
 		sed -e 's/TARGET Qt::DBus/FALSE/' \
 			-i src/plugins/position/CMakeLists.txt || die
+	use nmea ||
+		sed -e 's/TARGET Qt::Network/FALSE/' \
+			-i src/plugins/position/CMakeLists.txt || die
 }
 
 src_configure() {
diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild
index 1a70305f545f..5bc8b82de998 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild
@@ -11,12 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="geoclue +qml"
+IUSE="geoclue nmea +qml"
 
 DEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,widgets]
-	~dev-qt/qtserialport-${PV}:6
+	~dev-qt/qtbase-${PV}:6
 	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+	nmea? (
+		~dev-qt/qtbase-${PV}:6[network]
+		~dev-qt/qtserialport-${PV}:6
+	)
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 RDEPEND="
@@ -27,11 +30,13 @@ RDEPEND="
 src_prepare() {
 	qt6-build_src_prepare
 
-	# would use $(cmake_use_find_package geoclue Qt6DBus) but doing
-	# this side-disables gui+qml if do have qtbase[dbus]
+	# unfortunately cmake_use_find_package would break things with qtbase
 	use geoclue ||
 		sed -e 's/TARGET Qt::DBus/FALSE/' \
 			-i src/plugins/position/CMakeLists.txt || die
+	use nmea ||
+		sed -e 's/TARGET Qt::Network/FALSE/' \
+			-i src/plugins/position/CMakeLists.txt || die
 }
 
 src_configure() {
diff --git a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild
index 1a70305f545f..5bc8b82de998 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild
@@ -11,12 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="geoclue +qml"
+IUSE="geoclue nmea +qml"
 
 DEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,widgets]
-	~dev-qt/qtserialport-${PV}:6
+	~dev-qt/qtbase-${PV}:6
 	geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] )
+	nmea? (
+		~dev-qt/qtbase-${PV}:6[network]
+		~dev-qt/qtserialport-${PV}:6
+	)
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 RDEPEND="
@@ -27,11 +30,13 @@ RDEPEND="
 src_prepare() {
 	qt6-build_src_prepare
 
-	# would use $(cmake_use_find_package geoclue Qt6DBus) but doing
-	# this side-disables gui+qml if do have qtbase[dbus]
+	# unfortunately cmake_use_find_package would break things with qtbase
 	use geoclue ||
 		sed -e 's/TARGET Qt::DBus/FALSE/' \
 			-i src/plugins/position/CMakeLists.txt || die
+	use nmea ||
+		sed -e 's/TARGET Qt::Network/FALSE/' \
+			-i src/plugins/position/CMakeLists.txt || die
 }
 
 src_configure() {
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index de1246f708ea..4c663804f36d 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,5 +1,5 @@
 DIST qtquick3d-everywhere-src-6.5.2.tar.xz 59171420 BLAKE2B 91012368061acf6c4057362a380fea2e3fdc46cf63644a667d7b05450fbbeb8c8dae3765c5617fec8c8a1fd3f880fad21c8e6524c3240f040c9dfdbb80869423 SHA512 2a26f4fa4e4d88b4205813a8bba1c83811354e5ad5e7aa832fd46c5956b46d15e690c359d83f85018c1430e15edd151207411a50227855de4fc8451db710ace2
-EBUILD qtquick3d-6.5.2-r1.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7
-EBUILD qtquick3d-6.5.9999.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7
-EBUILD qtquick3d-6.9999.ebuild 838 BLAKE2B 72e9f20f2df410e23984aba7b342e2a22d67ba1430e95260869caa330b7df38a2c42113a5814fe9c59b306d1249556d5a005734d1e8088d9b5a7c1005b21aad9 SHA512 c1560383c82c1846c92aff96424bd3b9274dec7ad10adf9922488ea4f005d6bdf8265a86719a1950ca10078747327990e93af2c158ba71f3739a688b755b23c7
+EBUILD qtquick3d-6.5.2-r1.ebuild 880 BLAKE2B 3dac83e3bbdc4e50e0420647c0601c6b3b773b4420dd7b6196e8a09b2c396b57895c2a3e33d0b6e2d85c173044f036b826089d8c374f0aa59365d3d19aefe17d SHA512 08e5304cb219e26d6c4280ad2517a13bb0feb8c761be0de44c3b857f0f5bdbaba172bf5e3ded9499546606a8b298d62d6a83022a864038646f40c9d0407248cb
+EBUILD qtquick3d-6.5.9999.ebuild 880 BLAKE2B 3dac83e3bbdc4e50e0420647c0601c6b3b773b4420dd7b6196e8a09b2c396b57895c2a3e33d0b6e2d85c173044f036b826089d8c374f0aa59365d3d19aefe17d SHA512 08e5304cb219e26d6c4280ad2517a13bb0feb8c761be0de44c3b857f0f5bdbaba172bf5e3ded9499546606a8b298d62d6a83022a864038646f40c9d0407248cb
+EBUILD qtquick3d-6.9999.ebuild 880 BLAKE2B 3dac83e3bbdc4e50e0420647c0601c6b3b773b4420dd7b6196e8a09b2c396b57895c2a3e33d0b6e2d85c173044f036b826089d8c374f0aa59365d3d19aefe17d SHA512 08e5304cb219e26d6c4280ad2517a13bb0feb8c761be0de44c3b857f0f5bdbaba172bf5e3ded9499546606a8b298d62d6a83022a864038646f40c9d0407248cb
 MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08
diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild
index 91662e367108..fb83b01939ee 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.5.2-r1.ebuild
@@ -16,14 +16,17 @@ fi
 IUSE="opengl vulkan"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets]
+	~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
 	~dev-qt/qtdeclarative-${PV}:6
 	~dev-qt/qtquicktimeline-${PV}:6
 	~dev-qt/qtshadertools-${PV}:6
 	media-libs/assimp:=
 	sys-libs/zlib:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[network] )
+"
 
 CMAKE_SKIP_TESTS=(
 	# collada support is disabled in system media-libs/assimp (bug #891787)
diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild
index 91662e367108..fb83b01939ee 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild
@@ -16,14 +16,17 @@ fi
 IUSE="opengl vulkan"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets]
+	~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
 	~dev-qt/qtdeclarative-${PV}:6
 	~dev-qt/qtquicktimeline-${PV}:6
 	~dev-qt/qtshadertools-${PV}:6
 	media-libs/assimp:=
 	sys-libs/zlib:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[network] )
+"
 
 CMAKE_SKIP_TESTS=(
 	# collada support is disabled in system media-libs/assimp (bug #891787)
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index 91662e367108..fb83b01939ee 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -16,14 +16,17 @@ fi
 IUSE="opengl vulkan"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[concurrent,network,opengl=,vulkan=,widgets]
+	~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets]
 	~dev-qt/qtdeclarative-${PV}:6
 	~dev-qt/qtquicktimeline-${PV}:6
 	~dev-qt/qtshadertools-${PV}:6
 	media-libs/assimp:=
 	sys-libs/zlib:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[network] )
+"
 
 CMAKE_SKIP_TESTS=(
 	# collada support is disabled in system media-libs/assimp (bug #891787)
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 12086d2ceb36..e820c70c1165 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,7 +1,7 @@
 DIST qtscxml-everywhere-opensource-src-5.15.10.tar.xz 437404 BLAKE2B e36e866e4c02722f88499cc92bf27d2401f2b89d19fed83915803f6c8a367007fc386df250d11ecd92e5c80713924dd9992608769dbb0a42071f0d928317d935 SHA512 93e2df05da176802a0439ba752f52d1c84d291a2addf9492aaab2099f06efb32d896edd0660711bb2e0b67f7a9ea2c4d31b4ec3366f6230140d3de0056478923
 DIST qtscxml-everywhere-src-6.5.2.tar.xz 1163208 BLAKE2B 9e149a82f8f00a7f0c78beb393a87de2dd7b0c61f0168b7f2bb717591d2923b91ef2ebbea211cfe7c724e97a32f74a41537763c828e1e1a3fa16a017b1c73ffa SHA512 fafea704d5e592a31c11f0039336de587353a57d5a69b07d0346fd2906488810d0ed1fc9267a0bf06aeae7f93ae19e150c5734bc969c1e0c7bc4e6215744ac3a
 EBUILD qtscxml-5.15.10.ebuild 398 BLAKE2B 27b0f98657fad702cb2b14ad1c69bc80b9c42e5680ed3ba2db0e79bb9884c0f7e4960c3c4bea26a6e5577476030b52c172f327cb6b6ecd9ec72ec6b5d306725d SHA512 62f3dd6a55d8f8dc8af4d1e0f7ded88f8efd3fe1ada7a7f585bdd488c3599f160a9efbc52a014cb5016e11a13856dfabbc236cb4257bae8bbb18137bc02e22ce
-EBUILD qtscxml-6.5.2.ebuild 561 BLAKE2B 1171b68a7a18764f3b1172e8f20f5c816fc33a88a74d807d947365e656400930a2670e50d7a8a3204561a0c38fc616e2e3b01befb8a0e78ed4d3577d3efa6cef SHA512 d4902e95cc8bef0574e184b8c955b9f6166d6e714a558b737c68775e2c32439fec65acf1b34252afe7346d075f94faaad71b81aa0c176acfe90cd31d027340ca
-EBUILD qtscxml-6.5.9999.ebuild 561 BLAKE2B 1171b68a7a18764f3b1172e8f20f5c816fc33a88a74d807d947365e656400930a2670e50d7a8a3204561a0c38fc616e2e3b01befb8a0e78ed4d3577d3efa6cef SHA512 d4902e95cc8bef0574e184b8c955b9f6166d6e714a558b737c68775e2c32439fec65acf1b34252afe7346d075f94faaad71b81aa0c176acfe90cd31d027340ca
-EBUILD qtscxml-6.9999.ebuild 561 BLAKE2B 1171b68a7a18764f3b1172e8f20f5c816fc33a88a74d807d947365e656400930a2670e50d7a8a3204561a0c38fc616e2e3b01befb8a0e78ed4d3577d3efa6cef SHA512 d4902e95cc8bef0574e184b8c955b9f6166d6e714a558b737c68775e2c32439fec65acf1b34252afe7346d075f94faaad71b81aa0c176acfe90cd31d027340ca
-MISC metadata.xml 532 BLAKE2B b01b5680cf69e0aeb5bfec2c3c9e42728e6246ca515fe9024b1c4aeecaf660d7e4bd085b4065e4e8e40075eca1d63bbe309d7095e6e25441b9f0f13b95614ba5 SHA512 00f10c94d4a40337b094eabed3a9fe7ca05310eb8ceee4efcc0e2a7a636f548a6e74b096e85cfee437b6b5082046ba13cdff6e7b15c3614ca4759cab0f62eac8
+EBUILD qtscxml-6.5.2-r1.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
+EBUILD qtscxml-6.5.9999.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
+EBUILD qtscxml-6.9999.ebuild 677 BLAKE2B 5b4a53a211c467cc30ca0220a4e949e6b869e71ce8351839f77b0846d6d001bbe780b225f19d9c93ac8bdda1a3ff4993d9c8f70e65aead9464d524d47508a33a SHA512 0c8cf8f2e6019062ac0e153ced62bfa7026b00d0aa4d021fff939bd2791a7fc4d57db22c83fa145dccaa7b09ea9303868c73cdfda8e163126a9bf1da154fc87f
+MISC metadata.xml 612 BLAKE2B 74120f98e194bd3776134a96e12add6f8b485464004a9b0bad910cd81ca00bb29d740dfbe8484067eaec788ea6d228a4148f2d9d0757ced2cba1ba0cc4cce0bd SHA512 42b0ed27db93385ca6734f2bf81a9d01b97b6658326c61f821d517a26451b27919e4c429641f7e4a27bcf26407b5c1e134e90651948064308075abd77f4fb942
diff --git a/dev-qt/qtscxml/metadata.xml b/dev-qt/qtscxml/metadata.xml
index 702f3c500dd7..ef86286201dd 100644
--- a/dev-qt/qtscxml/metadata.xml
+++ b/dev-qt/qtscxml/metadata.xml
@@ -5,6 +5,9 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
+	<use>
+		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
diff --git a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild b/dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild
index c3e29fd2e2f0..3baf824212bc 100644
--- a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.5.2-r1.ebuild
@@ -11,14 +11,24 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
+IUSE="qml"
+
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets]
-	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtbase-${PV}:6[gui]
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="${RDEPEND}"
 
 CMAKE_SKIP_TESTS=(
 	# may fail with pid-sandbox, or at least musl/hardened+gcc (exact
-	# conditions unknown but passes without pid, consider flaky)
+	# conditions unknown but passes without pid, considering this flaky)
 	tst_qstatemachine
 )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild
index c3e29fd2e2f0..3baf824212bc 100644
--- a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild
@@ -11,14 +11,24 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
+IUSE="qml"
+
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets]
-	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtbase-${PV}:6[gui]
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="${RDEPEND}"
 
 CMAKE_SKIP_TESTS=(
 	# may fail with pid-sandbox, or at least musl/hardened+gcc (exact
-	# conditions unknown but passes without pid, consider flaky)
+	# conditions unknown but passes without pid, considering this flaky)
 	tst_qstatemachine
 )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtscxml/qtscxml-6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.9999.ebuild
index c3e29fd2e2f0..3baf824212bc 100644
--- a/dev-qt/qtscxml/qtscxml-6.9999.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.9999.ebuild
@@ -11,14 +11,24 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
+IUSE="qml"
+
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl,widgets]
-	~dev-qt/qtdeclarative-${PV}:6
+	~dev-qt/qtbase-${PV}:6[gui]
+	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="${RDEPEND}"
 
 CMAKE_SKIP_TESTS=(
 	# may fail with pid-sandbox, or at least musl/hardened+gcc (exact
-	# conditions unknown but passes without pid, consider flaky)
+	# conditions unknown but passes without pid, considering this flaky)
 	tst_qstatemachine
 )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package qml Qt6Qml)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 7e73c5eddc18..dbeca1c74052 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,7 @@
 DIST qtserialport-everywhere-opensource-src-5.15.10.tar.xz 324256 BLAKE2B 7d5492648854877b42a4a058ee2e1205f67d2ad949041d62f800f0fde701e02b7651efa16dcfa43d0396675009ebdc9362fd74eccec06f079847b7ffff0efd24 SHA512 59face48cce750fb02c112dbef9c997a5b61d84cf8085a0f8c59c3bb5c93d7110de9c9830f26f3ed61fffb2c23eb8a42d5683211abaa6e5147cf87643469a45e
 DIST qtserialport-everywhere-src-6.5.2.tar.xz 279364 BLAKE2B 7f1efb56f4e8f61e97faf62f4edeee8a638180245d0ccf6e85e6a41ac78906dafe4470a7884680b84838a8f409dbf27230659777922ce4250feda7c83b4b8e3b SHA512 9c26fe572272c1dfc7ce795451f2e4a5976a55e13ac8c91ab2dd2f8d07f77f0a18de80dc7b77c31e7233dba962ea2f88495286263fe59ec7f5ac62802f96b2f7
 EBUILD qtserialport-5.15.10.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df
-EBUILD qtserialport-6.5.2.ebuild 356 BLAKE2B 064cf7caaf2ab7fdc6f0bcc5898c3a84a149312496bd3fa9013441393edc4340d38e78ba725e7054b74de8f1c23289116ebd01dafbff9d3679b0aeec959536f1 SHA512 3c5745609c94a7308bf781515345786032ac0771e33d054712265efbe21f110dbe6dd6f5ce7c98ed3317158d59404aba0259e02e977e8316acfa83ff80fbfbfd
-EBUILD qtserialport-6.5.9999.ebuild 356 BLAKE2B 064cf7caaf2ab7fdc6f0bcc5898c3a84a149312496bd3fa9013441393edc4340d38e78ba725e7054b74de8f1c23289116ebd01dafbff9d3679b0aeec959536f1 SHA512 3c5745609c94a7308bf781515345786032ac0771e33d054712265efbe21f110dbe6dd6f5ce7c98ed3317158d59404aba0259e02e977e8316acfa83ff80fbfbfd
-EBUILD qtserialport-6.9999.ebuild 356 BLAKE2B 064cf7caaf2ab7fdc6f0bcc5898c3a84a149312496bd3fa9013441393edc4340d38e78ba725e7054b74de8f1c23289116ebd01dafbff9d3679b0aeec959536f1 SHA512 3c5745609c94a7308bf781515345786032ac0771e33d054712265efbe21f110dbe6dd6f5ce7c98ed3317158d59404aba0259e02e977e8316acfa83ff80fbfbfd
+EBUILD qtserialport-6.5.2.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
+EBUILD qtserialport-6.5.9999.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
+EBUILD qtserialport-6.9999.ebuild 343 BLAKE2B 760748f060f1a7d4e8f556274ecfd88b5f8b40ecb2e9c3f800d2fd73d05553972f99fc940b2bc50d39847cb90023164187c17447ba16ad55ebfc94ed7c92f0d1 SHA512 5a1b62c2d23da41ca03d91d530c9f0bd807362b825b9dd08b85fc0e93cae85aaf60e4ea0435fe14284c8819c3cfce3873baa12fcff8969fd2d3f75e018753c55
 MISC metadata.xml 537 BLAKE2B 48590dfe4d5912693284b963abe9e2fccfff319c2fcc3106fa8d20ec693f7430453eec3fc9ba16c7a9a2cf59f635c1b627f49c6f4e3a8f83be634a68a00b055c SHA512 60ab0488e4a3585fb036e22212f55b5ba5b512acefc9bc68b08a1b255fa6dd0e34e7652a77e55cd7107e1c1f6b742ed12ce20ae92df29a3a38cd2d9f22618f97
diff --git a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild
index c764bce60412..e88655bfbcdc 100644
--- a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,widgets]
+	~dev-qt/qtbase-${PV}:6
 	virtual/libudev:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild
index c764bce60412..e88655bfbcdc 100644
--- a/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,widgets]
+	~dev-qt/qtbase-${PV}:6
 	virtual/libudev:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtserialport/qtserialport-6.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.9999.ebuild
index c764bce60412..e88655bfbcdc 100644
--- a/dev-qt/qtserialport/qtserialport-6.9999.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,widgets]
+	~dev-qt/qtbase-${PV}:6
 	virtual/libudev:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index d3eb0380d8ad..55112345ba88 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -2,7 +2,7 @@ DIST qtwebchannel-5.15.10-gentoo-kde-1.tar.xz 5808 BLAKE2B 4aa01535519811778a3b7
 DIST qtwebchannel-everywhere-opensource-src-5.15.10.tar.xz 211876 BLAKE2B fcc3a198a90826b2d16d3a9ed950b4e00d9a7645231c26af79f3271ad3dacb981f1c057ec95b9c3c71f2baf05e0b71a4fc4d5121cc3fc8ebe101cf21fc404d11 SHA512 ed8349820c623dd7abcd34244a2f05426667d6997a8952567c3cbe785bb2ea92f03dd931bb53f77b34faff16d04dd7d39e4165c75d7a9ebb4ae225d7582355bc
 DIST qtwebchannel-everywhere-src-6.5.2.tar.xz 213940 BLAKE2B c5b97c63c91ef282e37d51b0c9957c5603c05b5336537b1bf57da0c3d60d55eab6516a00db30248fe63a7407bf1713c23baad0bfb4089c76ed1105b3bcdbc120 SHA512 405595dfdfed48aafe42969881994472cb08dc4105a63ccf8c5ca059c0c243b654c38356059ea26cda9165a50b306c92d296dd3eca430b29615ec0ac68431c09
 EBUILD qtwebchannel-5.15.10.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8
-EBUILD qtwebchannel-6.5.2-r1.ebuild 460 BLAKE2B cec255aee0768d0195d6b96e26e0f2f1405e2f57eeacbc63bea44eb179faa9ed17042ffd76ca4cd9de159269737584541b789b2819af3705e828ba96251f5783 SHA512 9b98744a6bade0bdb33f8a4c09a29d6f2db8e364d4ed5a61006a4fbabdedc3d3b3895e005d3d308a86b0e11948cf57c1d449729eb4c0f66ce9bea366c0416f55
-EBUILD qtwebchannel-6.5.9999.ebuild 460 BLAKE2B cec255aee0768d0195d6b96e26e0f2f1405e2f57eeacbc63bea44eb179faa9ed17042ffd76ca4cd9de159269737584541b789b2819af3705e828ba96251f5783 SHA512 9b98744a6bade0bdb33f8a4c09a29d6f2db8e364d4ed5a61006a4fbabdedc3d3b3895e005d3d308a86b0e11948cf57c1d449729eb4c0f66ce9bea366c0416f55
-EBUILD qtwebchannel-6.9999.ebuild 460 BLAKE2B cec255aee0768d0195d6b96e26e0f2f1405e2f57eeacbc63bea44eb179faa9ed17042ffd76ca4cd9de159269737584541b789b2819af3705e828ba96251f5783 SHA512 9b98744a6bade0bdb33f8a4c09a29d6f2db8e364d4ed5a61006a4fbabdedc3d3b3895e005d3d308a86b0e11948cf57c1d449729eb4c0f66ce9bea366c0416f55
+EBUILD qtwebchannel-6.5.2-r2.ebuild 503 BLAKE2B 647a11dccda8826b25477e6c70f460e33644a8b7119c154578c07d9dd0e2ffd31e05fa5c7ea34083ca28ab257cc80da1ce6a58d99d8325e531561e366cd5399c SHA512 a727f687d1c1ab659f03da69bb3523e5f4129a4047c2a2a540b39920c5102878410e68027f0ac70c434688dbea9c75e33e1427eaa8993e3476725c11e704de90
+EBUILD qtwebchannel-6.5.9999.ebuild 503 BLAKE2B 647a11dccda8826b25477e6c70f460e33644a8b7119c154578c07d9dd0e2ffd31e05fa5c7ea34083ca28ab257cc80da1ce6a58d99d8325e531561e366cd5399c SHA512 a727f687d1c1ab659f03da69bb3523e5f4129a4047c2a2a540b39920c5102878410e68027f0ac70c434688dbea9c75e33e1427eaa8993e3476725c11e704de90
+EBUILD qtwebchannel-6.9999.ebuild 503 BLAKE2B 647a11dccda8826b25477e6c70f460e33644a8b7119c154578c07d9dd0e2ffd31e05fa5c7ea34083ca28ab257cc80da1ce6a58d99d8325e531561e366cd5399c SHA512 a727f687d1c1ab659f03da69bb3523e5f4129a4047c2a2a540b39920c5102878410e68027f0ac70c434688dbea9c75e33e1427eaa8993e3476725c11e704de90
 MISC metadata.xml 617 BLAKE2B c9bdd6bc7b0e0aae943acc9060d1ef91d46e5e836f7a034c863032dff51b540edc0643cfd3ea0c4c4e18472a099537aee2b13994ea6fa97249dff25ad5291575 SHA512 ecc344957ebad7d9adc689c343c8315d38fc4d219f0a3bfb6ca848d2d083b0d29d01365a5287d3d5943a95dc75c1147c2e60a2078083a88832296ed0fbee2d4c
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild
index 94df0371318c..6a2b4df1a5b8 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild
@@ -20,9 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-	)
+	has_version dev-qt/qtdeclarative:6 && #913692
+		local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
 
 	qt6-build_src_configure
 }
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
index 94df0371318c..6a2b4df1a5b8 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
@@ -20,9 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-	)
+	has_version dev-qt/qtdeclarative:6 && #913692
+		local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
 
 	qt6-build_src_configure
 }
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
index 94df0371318c..6a2b4df1a5b8 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
@@ -20,9 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Quick)
-	)
+	has_version dev-qt/qtdeclarative:6 && #913692
+		local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
 
 	qt6-build_src_configure
 }
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index e35e37a66a01..52a725ececf2 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -14,6 +14,6 @@ EBUILD qtwebengine-5.15.10_p20230623.ebuild 8524 BLAKE2B cce6249550a5574ab7763c0
 EBUILD qtwebengine-5.15.10_p20230815.ebuild 8258 BLAKE2B 766d6ad760f73e66d9a7f0ee52c3916e14b7f640e26784abf0866b039aecbf809c9e21a00b13d030311fa1ab91360aacd837e1257474800732a5598c3910c646 SHA512 c2d9534d452db6f53238faa05f6b454c4daeb6fcf683997d5095f4a9b777248e8d7f67ba4203a4b26457782817b887ca0cce36fb8d14f887e1b9772e78173140
 EBUILD qtwebengine-6.5.2-r1.ebuild 8083 BLAKE2B 3c16c2ee3141c8fe6be62f1bd25923dc851430d30b4ce0760e1b4fd0a857cd498f1aab4c1e04293af6d6eea48f5c7fa88e18ef8d9e7fb153de6cfff16f5c013a SHA512 c9e2ca65cf4961ae4e9cb9cba649705a28b5d705fbce46cfa2aa07232e1a5948857db03964be85f0fe3c2cccb85980c5642a22d222dd9b69f5cb614e9c12dd3d
 EBUILD qtwebengine-6.5.2.ebuild 8559 BLAKE2B afcca72bb25aab65e617a033bc7b4eb47241c86307184417151522da586fe38e9485151f139fed68b365061dbfd6d19a99ae8296507109e8ab71b8879da2d9de SHA512 4e53155411b17bd1ba2800b2a265a2d117d64d62b20a7c5f275cb08d1a6a3da3aa5646933a386020bfd09b6ef82763e4cae48644db0e6b5123a0314fa904a0ba
-EBUILD qtwebengine-6.5.9999.ebuild 8111 BLAKE2B 695f5be0da107ac6319f5fad0a2d013e8e9a68f0de7beb7e272299d0aa059d77414d24598f8a8d9ff08bde9f180e43e5629d9b1ed280a8ed116dc2ef8c387244 SHA512 1b11fcf80a323f41603e7729f01bada0ca808c9b7a06e1603094179d9b5f796e5d845095a7b1754a86d6217bf7c1276098a663780363414b029bd20aff6a74e5
-EBUILD qtwebengine-6.9999.ebuild 8069 BLAKE2B 9597280a749df3dec5b58b41019869d147e671efd4a75f670ae957f07ad66e0312a9b9be735e8f007a0651e67dc70109a4cb8c59fdf4fd3d6d46b70f01cecdbe SHA512 bb066af71484bb769bdaab8c321bc32068d2c45904598a4b21e46d8b9d87cce7cc97022d444d7163ca0eee1c6490089714ef91220b95262f4f74fa31434b0870
-MISC metadata.xml 1274 BLAKE2B 34cdf96f228f4495510c069b7c3c536bad535acab91e9ce4ea6cadf01b2c2ada307392ca30ef07bbc47b102941d5601a0eb087e9f7b2e04fe31981efbfacde27 SHA512 76638ce2a1a79c9174e13eb7919ac3bafdd37c8bdda9990ca25db576b2ffb1a0c808411b3238fbeb5917dac354fc7b0fc378878a5a3cb2523bf190e468de9cfb
+EBUILD qtwebengine-6.5.9999.ebuild 8120 BLAKE2B 0399b10325436c6ac9580b7fd289a07f36d88d9b465c6832c7600d9000f9e21caf9da11e3bae39a9251fe02ccec23d796b0ca174d1070cc3458e3f6d31fde12c SHA512 e661f0d4ef4ad258b826fcca095f2ad8eedd9afb2877a1cdcf4bd78df47380935ade33fb7c870c52cdef7b9409de032fbe11c64b30b86bed6249dab3b9aaea26
+EBUILD qtwebengine-6.9999.ebuild 8078 BLAKE2B 6c036279e09ef0b6562d52b99ae3c5b8ad1282c3cb6110ee389c3ca3403f18a8a50f3e7b34b884a30852252fe6aa243a1b41710dd74332bb19b097e0f7937bca SHA512 7376659bcbb56efec57d883ebe21e211f6461c3fb443a9ba36fd563a3be133a3275c804d314ca726fe8b5aaae2e25a08bfdb711a4fcb757a17796c02b7c6ff99
+MISC metadata.xml 1312 BLAKE2B 4473aad7240926735bbabbeaeff862f3bc253c3e79e09086c17fb9b603ba5e9dc25ecbbc423a60a344bf471e11634c9b4728222e66f3d19022e3f3d2c9cc2f60 SHA512 797e67cf05a37dcb5ad5712cabef051b4a8f5dcb9601b627bcf029e4c99d0a09fa62b03cb9dcb64b5b6e5f29104e72711136d4c9aa79928c34f6bfe212742e2d
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 7bf30c9e28a5..ba1d70545ae8 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -13,7 +13,7 @@
 	<use>
 		<flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
 		<flag name="jumbo-build">Combine source files to speed up build process.</flag>
-		<flag name="pdf">Build the QtPdf module</flag>
+		<flag name="pdfium">Build the QtPdf module based on chromium's PDFium library</flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index de90fe927c8f..09ccd2e4157f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 IUSE="
 	+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
-	opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets
+	opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets
 "
 REQUIRED_USE="
 	designer? ( qml widgets )
@@ -83,7 +83,7 @@ DEPEND="
 	x11-base/xorg-proto
 	x11-libs/libxshmfence
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdf? ( net-print/cups )
+	pdfium? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -159,7 +159,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(qt_feature pdf qtpdf_build)
+		$(qt_feature pdfium qtpdf_build)
 		$(qt_feature qml qtpdf_quick_build)
 		$(qt_feature widgets qtpdf_widgets_build)
 
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 2ecd3fe98f7b..f4d5c7bf79a9 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 IUSE="
 	+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
-	opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets
+	opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets
 "
 REQUIRED_USE="
 	designer? ( qml widgets )
@@ -83,7 +83,7 @@ DEPEND="
 	x11-base/xorg-proto
 	x11-libs/libxshmfence
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdf? ( net-print/cups )
+	pdfium? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -158,7 +158,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(qt_feature pdf qtpdf_build)
+		$(qt_feature pdfium qtpdf_build)
 		$(qt_feature qml qtpdf_quick_build)
 		$(qt_feature widgets qtpdf_widgets_build)
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2dc1ff59fab0..a4221a48165c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index f54f37567a0b..77bf645ff1cb 100644
--- a/dev-util/shflags/Manifest
+++ b/dev-util/shflags/Manifest
@@ -1,3 +1,5 @@
 DIST shflags-1.2.3.tgz 42253 BLAKE2B 4837d31762129790659b67d4025cf8627ca5db32225ac61b437a5ba6bf9f894c87976d06dd5e5039a5ad4b7a0b7b173cc7f96fc3a11dc3c2ac797de2c749a8ed SHA512 5bddebce14e516fe37b2b1631d5aec54651ee728e538dfb0fcc68d32b79d335c7b48f5ef5aab99dd730de3b8fd556a6640db9b9ae2a7753feb6aa1e0831b64af
+DIST shflags-1.3.0.tgz 49191 BLAKE2B c6070a8bdf771a9daf3ea20bac62c965c269893dda33b1166e6a447fa4c10ee0708539ebb9e50edaad30c5b88fc09794df0fa564a5d48a919e93adee111bb5e1 SHA512 e194ceb300927bd1b8a165462f2fc3b4a5a2d2dfc9b6b65393a1a27d70d31219fae4cfa13975bc30c174a2988308d6bd599434ce85a0bd2c5a9d3ffb6899bc91
 EBUILD shflags-1.2.3.ebuild 583 BLAKE2B b5379b7ebdfb11a761e0f2920ac2a89478e7ec905ee2f6f7edbcefb1172b74b82ef8a51d59189f4cc012b9a2ea2b589047a682525e78f52edad022f05dd80b7d SHA512 4eedf4704359ce9c38d404e457299f9835fa8f0a7fea85f0a3228a932617c4d670b25ec88fbd4170421fb39d92a5f6f62cf693127e469fc3e82e59cd56852a48
+EBUILD shflags-1.3.0.ebuild 590 BLAKE2B 0c4d940bf5642f3948ed6b1aabf672ea02d29d4bf5db136324bc1bb5d0ad1d9ae783761e7a18cc2bc7af53ad87c87cfa587f7236400a2102e79df475f3b0674b SHA512 88065f79b9bde942d7e6cdf737bec6215084e37283cae65f920ac7ded725e72707c019a4b4f3fcfeae526da006881927482196b3c9636889cfa86344cefba7d8
 MISC metadata.xml 396 BLAKE2B 13b062f223325b5f9c105a8cbcb437ffa6f359ae425cb701cbb77f8bae762a41f3b6004f713db971aa90edea93f7fa6d06bd4e6b2c3535d288696d5c3c82873c SHA512 bf9d1678ff850135c5b3539e2e367307fbd6fe1d4fec00ccfd53dca62b541d69285ce867e407b72f9a16cfa5fdf2c0ee243105c4f010cc70f31195e4fcd476aa
diff --git a/dev-util/shflags/shflags-1.3.0.ebuild b/dev-util/shflags/shflags-1.3.0.ebuild
new file mode 100644
index 000000000000..de7b492577ed
--- /dev/null
+++ b/dev-util/shflags/shflags-1.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command-line flags module for Unix shell scripts"
+HOMEPAGE="https://github.com/kward/shflags"
+SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+src_test() {
+	sh test_runner || die
+}
+
+src_install() {
+	dodoc README* doc/*.txt
+	insinto /usr/share/misc
+	doins "${PN}"
+	use examples && dodoc examples/*
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index b96d9930adcb..563be4e5cd0b 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 28f8d904065d..c96bc0c1c3c3 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -99,15 +99,14 @@ qt6-build_src_prepare() {
 	cmake_src_prepare
 
 	if [[ -e CMakeLists.txt ]]; then
-		# build may be skipped entirely and install nothing without errors
-		# if checking for a major dependency/condition failed
-		sed -i '/message(NOTICE.*Skipping/s/NOTICE/FATAL_ERROR/' CMakeLists.txt || die
+		# throw an error rather than skip if *required* conditions are not met
+		sed -e '/message(NOTICE.*Skipping/s/NOTICE/FATAL_ERROR/' \
+			-i CMakeLists.txt || die
 	fi
 
 	if in_iuse test && use test && [[ -e tests/auto/CMakeLists.txt ]]; then
-		# upstream seems to install before running tests, and cmake
-		# subdir that is present in about half of the Qt6 components
-		# cause a dependency on itself and sometimes install test junk
+		# .cmake files tests causing a self-dependency in many modules,
+		# and that sometimes install additional test junk
 		sed -i '/add_subdirectory(cmake)/d' tests/auto/CMakeLists.txt || die
 	fi
 
@@ -136,13 +135,7 @@ qt6-build_src_configure() {
 		return
 	fi
 
-	if [[ ${mycmakeargs@a} == *a* ]]; then
-		local mycmakeargs=("${mycmakeargs[@]}")
-	else
-		local mycmakeargs=()
-	fi
-
-	mycmakeargs+=(
+	local defaultcmakeargs=(
 		# see _qt6-build_create_user_facing_links
 		-DINSTALL_PUBLICBINDIR="${QT6_PREFIX}"/bin
 		# note that if qtbase was built with tests, this is default ON
@@ -151,6 +144,12 @@ qt6-build_src_configure() {
 		-DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS=ON
 	)
 
+	if [[ ${mycmakeargs@a} == *a* ]]; then
+		local mycmakeargs=("${defaultcmakeargs[@]}" "${mycmakeargs[@]}")
+	else
+		local mycmakeargs=("${defaultcmakeargs[@]}")
+	fi
+
 	cmake_src_configure
 }
 
@@ -251,8 +250,8 @@ _qt6-build_match_cpu_flags() {
 	local flags=() intrin intrins
 	while IFS=' ' read -ra intrins; do
 		[[ ${intrins[*]} == *=[^_]* && ${intrins[*]} == *=_* ]] &&
-			for intrin in "${intrins[@]}"; do
-				[[ ${intrin} == *?=* ]] && flags+=( -mno-${intrin%=*} )
+			for intrin in "${intrins[@]%=*}"; do
+				[[ ${intrin} ]] && flags+=( -mno-${intrin} )
 			done
 	done < <(
 		# TODO: review if can drop fma= matching after QTBUG-116357
@@ -287,7 +286,7 @@ _qt6-build_prepare_env() {
 
 	readonly QT6_BINDIR=${QT6_ARCHDATADIR}/bin
 	readonly QT6_DOCDIR=${QT6_PREFIX}/share/qt6-doc
-	readonly QT6_EXAMPLESDIR=${QT6_ARCHDATADIR}/examples
+	readonly QT6_EXAMPLESDIR=${QT6_DATADIR}/examples
 	readonly QT6_HEADERDIR=${QT6_PREFIX}/include/qt6
 	readonly QT6_IMPORTDIR=${QT6_ARCHDATADIR}/imports
 	readonly QT6_LIBEXECDIR=${QT6_ARCHDATADIR}/libexec
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index accb1f8ea9aa..29aaf9c3d0d4 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 0d7650ec8011..6ee22b40a1c4 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,7 +1,8 @@
+AUX ppsspp-1.16-MIPSTables-fix-includes.patch 196 BLAKE2B 6043f05aab6e5b620017a41c5da49a153a70e45057712c034504c9c8e89583439608e23ba1ae4c508e2ab2f12cab99c5478979ad555089aad390abbd36fe67ca SHA512 fa9d66a5f3411452218d776373a54d426ab971d05cb4ccf2a7e36644e6ec4444162cb4d85c5a04a1f956cab6714b2e43027eae451af3e380fb2ac22ac9164159
 AUX ppsspp-CMakeLists-flags.patch 913 BLAKE2B 7bd5df94b51dad35325586f7ad23284436ba670a8c2218a4a6bfb28fb5a055240aeb0543fe331310a0d86d3661cbdf418689a592139ff832802ba1fabbd10fc3 SHA512 5b2ee899b2fbed7229d4abc027e2a010327be4d334e343f977319c475feaf2d180bd74d3640022d0175b11e8256035c828dd4cf03c8a5b9240c989b2d7f72fb7
 AUX ppsspp-disable-ccache-autodetection.patch 753 BLAKE2B aa580bb2c657830bb079618e83903c4a0e28aa13acd612592f58feae2b0ef98535ea6f7e3c76aa9e74004aa80367aea372aec443bb2b789d5f3e7359872ea34f SHA512 cbf1f6e9f200cfa3b51bb84e09206a85aaea38511c0036a24d5e12547c659019fe88fbf221d2f7ddbdb9f0129f8b0fabb24baa594c658ab5ab584a0a723bc1c4
 DIST ppsspp-1.15.4.tar.xz 51947468 BLAKE2B c6a5e621b02556b791ec41389f17dede63811c87ff628b8f1304ac950071b365ecc9be05f4042e4e3b81e77f5a14b6931577f08b0174fec821350a1d7eca4d6a SHA512 9d2c140b0d633e5ca6191aaf276b7e4f6d029f29d1313a45fb78ee3879fec09f57d816604c51474ab6fe9cde713787d5769e87466d3c3015fe6a9b195ff198d2
-DIST ppsspp-1.15.tar.xz 52176784 BLAKE2B f0733edd114e09c3dfc4910fb48b7c5687af06faf39ed9184429d5f9ad0af3149a9270426b92eccbe97f61e436e7399c49e4feb0db05ce9df4d4177d091d7a08 SHA512 88e97f964e826cf791725ed62178dbfa456094af06a1c896df640b24a4e2ae8ed79e0ae63cb29cc6a92e83ecd63ab60013ddf32333fb1e8b5024a6e3fce6b71f
+DIST ppsspp-1.16.tar.xz 50656132 BLAKE2B 5149bd859134a76a191e0f144bdcefc4c521276ebb1390fe5e24eeeb1227b77bab0458a760f29aed5ba169d566f12d5226f2b50a19e44172f1ad98c4eb8f400f SHA512 d65a8c9fb5d7ff45a99f5852d1071029bc51c1e8bdb45b3e78d961a46587553db4465bbd97b301db54a94b60772359929524047f08de3067cd3336f5f7717826
 EBUILD ppsspp-1.15.4.ebuild 1399 BLAKE2B e23586f8504465887cf3ecb26991f1fe70ea2d3e871178f564b94bae62d746c54c79ee8e38e3eb4b518875ff68f7c51a74d8b6180098957ba9e4748f410bd927 SHA512 ec6834e59326a5def648b999dd488898639b6f379ae205e7ffa6d6a5dd40b0928b52a98781b4ae59057c858be5ca37ee84ef33e49069ae53664ad85d9b2cc074
-EBUILD ppsspp-1.15.ebuild 1399 BLAKE2B e23586f8504465887cf3ecb26991f1fe70ea2d3e871178f564b94bae62d746c54c79ee8e38e3eb4b518875ff68f7c51a74d8b6180098957ba9e4748f410bd927 SHA512 ec6834e59326a5def648b999dd488898639b6f379ae205e7ffa6d6a5dd40b0928b52a98781b4ae59057c858be5ca37ee84ef33e49069ae53664ad85d9b2cc074
+EBUILD ppsspp-1.16.ebuild 1577 BLAKE2B 3a5d855859149a8893a7969ac7712ff9604aa70bf80e374d316760cd91a14991ad97027b0c9e8a6057faeab14a4d96a78c9020473655b9d288fed253248f4b8a SHA512 44d572badd060517ce0501889032f81004de7ed303f11cba92a14314c0d40e8353e3c5e8cd33329ff715ad50da2b25159e12362089250d7d2c06d0e25fba35ee
 MISC metadata.xml 526 BLAKE2B 19d0378d36d2b1d81ce404a95d98488b54f4368c72a7397b6d7c9a444edec9c19d146295cfc247a75aca1e1b5d1643161a627b80ea76aa8d43189a5eb14380c2 SHA512 7a8c8a7c05acdc110422d7c38552c8106d1886a672e6bda1212ce9cba737ae5e89e6624010d5bc3149b8da7c061b10295a721c74e7377587ec52ec7be2237855
diff --git a/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch b/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch
new file mode 100644
index 000000000000..87e85f5bc878
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch
@@ -0,0 +1,10 @@
+--- a/Core/MIPS/MIPSTables.h
++++ b/Core/MIPS/MIPSTables.h
+@@ -18,6 +18,7 @@
+ #pragma once
+ 
+ #include <string>
++#include <stdint.h>
+ #include "Common/CommonTypes.h"
+ #include "Core/MIPS/MIPS.h"
+ 
diff --git a/games-emulation/ppsspp/ppsspp-1.15.ebuild b/games-emulation/ppsspp/ppsspp-1.16.ebuild
index 653f672374ea..a8cbd4c208f8 100644
--- a/games-emulation/ppsspp/ppsspp-1.15.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.16.ebuild
@@ -3,18 +3,24 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1 xdg cmake
 
 DESCRIPTION="A PSP emulator written in C++"
 HOMEPAGE="https://www.ppsspp.org/
 	https://github.com/hrydgard/ppsspp/"
-SRC_URI="https://github.com/hrydgard/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hrydgard/${PN}.git"
+else
+	SRC_URI="https://github.com/hrydgard/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
 SLOT="0"
-KEYWORDS="amd64"
 IUSE="discord qt5"
 RESTRICT="test"
 
@@ -37,10 +43,15 @@ RDEPEND="
 	)
 	!qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 "
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-1.16-MIPSTables-fix-includes.patch
 	"${FILESDIR}"/${PN}-CMakeLists-flags.patch
 	"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
 )
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f5bc22ae8375..0ac7d52869e7 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 76e7c8ebfddd..5ff15277782c 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -2,5 +2,5 @@ AUX zxing-cpp-2.0.0-fix-crash.patch 1042 BLAKE2B 30045a15717fe7d64e9f8cb9769d84f
 DIST zxing-cpp-2.0.0.tar.gz 856413 BLAKE2B 8069d3e39a7ddf99510777df477a5e3503e5eead7adcbf175123ab59de47c3da75bb8187533dad552a07b1475756ff3981d30eaa3e8088c5c9b991e22a7127bd SHA512 fa22164f834a42194eafd0d3e9c09d953233c69843ac6e79c8d6513314be28d8082382b436c379368e687e0eed05cb5e566d2893ec6eb29233a36643904ae083
 DIST zxing-cpp-2.1.0.tar.gz 866787 BLAKE2B 2589862e790bac85cee92818381b4ec3f9eeb5ac1dc2a78babf372ad7672bfe1a43ac7cfe4cc228eabed8a6c013f835c7e3e1948137d61edf1056906a149df80 SHA512 a00778c1fb7bb664176f7035aa96db4bab3e7ca28b5be2862182cb591d18edd4c3dfcbd34b4af08e0797bb4af893299d523f98aa84d266b68e4c766410e2e26d
 EBUILD zxing-cpp-2.0.0.ebuild 724 BLAKE2B 4a20a7e612d6da852972e680a349885fa2210c82610793e621d84dbda311b014179ec1f60f21fba6540f5194caafb51f06281c451f398e8fcd7a84961d17e22d SHA512 835311b3ae2d8140d4c103b8d1adaac83b3bb2ce0c9d4e912e7348bcf8c57095411b5360627e6a3b46f14e8ecc57ead1382d90c80db3f5b4192bce1b8390342e
-EBUILD zxing-cpp-2.1.0.ebuild 679 BLAKE2B fe20bfae5229c26ae75d0f4c82c454017545d0a744939d8c91e78995255aa4b7b97d881f53f94d495ed012eaa816c11bf7167c1b27a5f653ce63a10f4f81cb9e SHA512 f7ed916626aa48cda9b7a24941c1f584ecb9810c8960e03c38edce7c6b1a1ec4b4efa77f020d483bc9eea55159a1169e48d2cf5832af2d1bceb11e3669dd3ac6
+EBUILD zxing-cpp-2.1.0.ebuild 676 BLAKE2B ccb737a5d37d63a7e22f4c1b0f5b802c40c869bbe177a885ab309de10b7a9cfb4de3023a603263d2328fbde221ffb31d1270348dcc970b0dd03eab882ac267f0 SHA512 6534891dc23c79e264119861452791ebe1af39e7e7722fd86e95bb4c3847f3a7260871123fb0bc50de35f9e5c5cc79af169a09f9565fdfb75357fa4e24f00fdb
 MISC metadata.xml 332 BLAKE2B f9f865eb6a86bdab5a5d7fe20c01e1ca84bc3977529b2826e1c6b161e31283c8108f57680442096da25a02b961f2f96a7c39458eaf62f654a56f5c17b9552ccc SHA512 f90cb5552e79b1bc3a1f17bd53b9dc756e6825beedf18c0eab5cb44c87c22b9789a19e0ebbfccb529bd935b8b842e48b335d15aab2b80e21a11ea85c1b388be5
diff --git a/media-libs/zxing-cpp/zxing-cpp-2.1.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-2.1.0.ebuild
index 551d84c87579..838aec5f74e3 100644
--- a/media-libs/zxing-cpp/zxing-cpp-2.1.0.ebuild
+++ b/media-libs/zxing-cpp/zxing-cpp-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 src_configure() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 6482f3972a8c..b2b3fcc3ed13 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8c3cc7830729..0e65fa3c731d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Sep 2023 15:09:42 +0000
+Sat, 09 Sep 2023 21:09:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 1a2059ec0adc..5a493894dd4f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546444 BLAKE2B 427e6ba70311c66f33f8718c9e5205812a06f7180945f95cd2cc13a642ebd00b8ab6bde2ebd1ac16f0013a5d2c65c3729739daaa24b9e4c70888d6626437692d SHA512 666ed25ec3b20188903cb612d27562ec06741fff2c9cc4ee150980ae0801d6b66d3d117a8d3df13d953f8c0975e6b4fd3d287a501bb281b5093186361d8515d8
-TIMESTAMP 2023-09-09T15:09:45Z
+TIMESTAMP 2023-09-09T21:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmT8irlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmT83xpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA2ehAAgB87nv4Q4wqB8HTszfIPkpIDaAhVBiGQNjW1y/3+xkjIc32Ygq9WUBCs
-lD8gKZVEQlfdQA4Cjd9r92O4e5iawlrzzx3tXWuBHkN3rzJrNZ5i6ajSSBF20Ch8
-ifetMBtdCPpD0BKlo2ABxgziu7uCxsjqTLghAQUrf1dTs0cIKS/7y+GD4cAXzuES
-AxLVnQQnAZG7LKuTLY+evpDMOYGHCv+fnWODNnpkZUAYYjVc1K9LVWqfu1ebwvoB
-wZVZvLBxB1ex/G3Z7tfUEp+WKI6o0fCDfLebEXu/cSvivqWA2F4tL4vmrBcExQFm
-aUd6Dkmo4Npqj9yvmxc7K+Nvx3hdIs6sV4X5hvbrW8HcjZXUEkQ5ab4mlWBj4Qqe
-+2/9UAdDq3QYojcFGBbwVRYWaH2axEOlVCCYkM2X8zhb4MQgIPExLHYfN6kd9sPP
-Vj/lbPfoctAz0OXchb5d1uPPtIWgKce3pkboO6JvnqKf4P1ZMPmHNeTjYKMtcHWS
-lKarfB3B6qJLyoPCnOUESSDQXLeeXN5eTy9N5DIpqSLRZ3soxiBVbxILi83y+x2d
-LYejXkr+XOgoFoQD7U0R/85ZD3xE89AATbFqThh/QuMOIh9yYcWqFSna8VY9P5/j
-lo9lOK+Pikb5Dj+/l52zAxAOgUtiEzB4OVPceCBbP64i0NqYEVM=
-=evvC
+klCszg//arDYSK0sJXG+/KaH+qxUYbd2i78K1KYqgB9PTupw2+Md4lRNGshZSUvT
+7Y3R8B8S5/gQZJKF6N7xxXAE0hJgzVowklvb0GkXDKBOmkWOn1GLZzaR4u3D/Okc
+shfEl0b8PGULE4YjsNFeZyrANV0E1hmNoGZJIZdNd5Ss3Yp97FCRFMtKkUB8SJh5
+8tavSetSnv3cXdD9WGmZ2lIKWHbT6nVwUsn9Jq8xbLPfW3AvXJ672K6bpNb2cgOA
+nj8nkgkMRh7BJfdQRE51riaZYFYiJU+a18ip180tNvWEbV/SUZPsDSqhcJAs4tq9
+2Sjni6c+x7HvU5pFCLrto82WYWW/WQJsBkepauorrU36pWAEilSTFcgHRuPs3MYm
+wv6fbdUMW2vIbZv9bfpDsrTp5/9jeSm42eqN2VNiJVp+dnQd7BoEzkRpMJxt11X8
+STE8Z9ldASVRtioPpNnK9sOqDuqdzRznq+Sjuz/3WPB7S1Pp1nOcpvOao1M+1BeK
+AfoEB+96hG7hF9PqWTe6HIR56BOsA7oxoPTgB/GyuEmGg2USbw2ngwA9SrvSHbvO
+53K/DAMZ+UfVoiCk4/UkXf4lO0llWHcF0ZaAEwTguff1CvxGJvUAuL000B44pSyI
+/vuiTmgLAxkxQR1F9YHWBpYmvVLp4O/2TwoO8yi+lja+6EXhgnY=
+=JsLM
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8c3cc7830729..0e65fa3c731d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Sep 2023 15:09:42 +0000
+Sat, 09 Sep 2023 21:09:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1927f97a49a5..47faf5cc107e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 5c27fba5f3a3..8502997c82bb 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.25.0-r1 b/metadata/md5-cache/app-crypt/p11-kit-0.25.0-r1
index ecc6b9a28760..a9542188f1a4 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.25.0-r1
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.25.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://p11-glue.github.io/p11-glue/p11-kit.html
 INHERIT=bash-completion-r1 meson-multilib
 IUSE=+libffi gtk-doc nls systemd test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-misc/ca-certificates >=dev-libs/libtasn1-3.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libffi? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.25.0/p11-kit-0.25.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2c38748351cd433be2fa0ec67e14f6f8
+_md5_=528d66332122366d6908fce1bda937f8
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 68faf284161c..c0f1c6b0a015 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/featherpad-1.4.1 b/metadata/md5-cache/app-editors/featherpad-1.4.1
index da7d7b739ced..7532a98c7a3b 100644
--- a/metadata/md5-cache/app-editors/featherpad-1.4.1
+++ b/metadata/md5-cache/app-editors/featherpad-1.4.1
@@ -1,17 +1,16 @@
-BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=!qt6? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/hunspell:= qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) qt6? ( dev-qt/qtbase:6[cups,dbus,gui,widgets] dev-qt/qtsvg:6 ) X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
+DEPEND=app-text/hunspell:= !qt6? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) qt6? ( dev-qt/qtbase:6[cups,dbus,gui,widgets] dev-qt/qtsvg:6 ) X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Lightweight Qt5 Plain-Text Editor for Linux
 EAPI=8
 HOMEPAGE=https://github.com/tsujan/FeatherPad
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg
-IUSE=+qt5 qt6 +X
+IUSE=qt6 +X
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3+
-RDEPEND=app-text/hunspell:= qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) qt6? ( dev-qt/qtbase:6[cups,dbus,gui,widgets] dev-qt/qtsvg:6 ) X? ( x11-libs/libX11 )
-REQUIRED_USE=^^ ( qt5 qt6 )
+RDEPEND=app-text/hunspell:= !qt6? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) ) qt6? ( dev-qt/qtbase:6[cups,dbus,gui,widgets] dev-qt/qtsvg:6 ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=https://github.com/tsujan/FeatherPad/archive/V1.4.1.tar.gz -> featherpad-1.4.1.tar.gz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=14781fb1b7b28657bd5970842bd7d911
+_md5_=552c27a77de551a8985b9cc8530a5d2a
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 87b078de62d8..569aba5ca5da 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/lice-el-0.3 b/metadata/md5-cache/app-emacs/lice-el-0.3
new file mode 100644
index 000000000000..e4bb92327a12
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/lice-el-0.3
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-25.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=License and header template for GNU Emacs
+EAPI=8
+HOMEPAGE=https://github.com/buzztaiki/lice-el/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25.3:*
+SLOT=0
+SRC_URI=https://github.com/buzztaiki/lice-el/archive/v0.3.tar.gz -> lice-el-0.3.tar.gz
+_eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6
+_md5_=18a7a4d7f74bcc9ec23d6ba6aa59e7d2
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index ea6e77301146..572fc1cca284 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/xen-4.16.4 b/metadata/md5-cache/app-emulation/xen-4.16.4
deleted file mode 100644
index 17b961aef11d..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.16.4
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 ) flask? ( sys-apps/checkpolicy )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=8
-HOMEPAGE=https://xenproject.org
-INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
-IUSE=+boot-symlinks debug efi flask
-KEYWORDS=~amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.16.4
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.16.4/xen-4.16.4.tar.gz https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
-_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=2c786e18c8f189e8981cf3281eb230ba
diff --git a/metadata/md5-cache/app-emulation/xen-4.16.4_pre1 b/metadata/md5-cache/app-emulation/xen-4.16.4_pre1
deleted file mode 100644
index 5ae7268b6352..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.16.4_pre1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 ) flask? ( sys-apps/checkpolicy )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=8
-HOMEPAGE=https://xenproject.org
-INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
-IUSE=+boot-symlinks debug efi flask
-KEYWORDS=amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.16.4_pre1
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.16.3/xen-4.16.3.tar.gz https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
-_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=578aad1fb55b9665aee369fdadfe9b6b
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.16.4-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.16.4-r1
deleted file mode 100644
index 5403fc4a211c..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.16.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/gettext
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd? ( app-arch/zstd ) app-arch/bzip2 app-arch/zstd dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_10? ( dev-lang/python:3.10[ncurses,xml(+),threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[ncurses,xml(+),threads(+)] ) app-misc/pax-utils >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( || ( sys-firmware/seabios sys-firmware/seabios-bin ) ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) arm64? ( sys-power/iasl rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl python_single_target_python3_10? ( dev-python/markdown[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/markdown[python_targets_python3_11(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig virtual/pandoc ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= dev-util/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib dev-lang/ocaml[ocamlopt] ) python? ( >=dev-lang/swig-4.0.0 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://xenproject.org
-INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
-IUSE=api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd? ( app-arch/zstd ) app-arch/bzip2 app-arch/zstd dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_10? ( dev-lang/python:3.10[ncurses,xml(+),threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[ncurses,xml(+),threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.16
-SRC_URI=https://downloads.xenproject.org/release/xen/4.16.4/xen-4.16.4.tar.gz https://www.seabios.org/downloads/seabios-1.16.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz -> edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1t.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz -> brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz ) https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=bfa01044b1346e889e34e2145e709cf3
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1 b/metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1
deleted file mode 100644
index f0a6d37db6af..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/gettext
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd? ( app-arch/zstd ) app-arch/bzip2 app-arch/zstd dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_10? ( dev-lang/python:3.10[ncurses,xml(+),threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[ncurses,xml(+),threads(+)] ) app-misc/pax-utils >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( || ( sys-firmware/seabios sys-firmware/seabios-bin ) ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) arm64? ( sys-power/iasl rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl python_single_target_python3_10? ( dev-python/markdown[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/markdown[python_targets_python3_11(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig virtual/pandoc ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= dev-util/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib dev-lang/ocaml[ocamlopt] ) python? ( >=dev-lang/swig-4.0.0 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://xenproject.org
-INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
-IUSE=api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd? ( app-arch/zstd ) app-arch/bzip2 app-arch/zstd dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_10? ( dev-lang/python:3.10[ncurses,xml(+),threads(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[ncurses,xml(+),threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.16
-SRC_URI=https://downloads.xenproject.org/release/xen/4.16.3/xen-4.16.3.tar.gz https://www.seabios.org/downloads/seabios-1.16.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz -> edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1t.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz -> brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz ) https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=19ae13d7da9295e1856fca7985edf3cb
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 91e79ec96d71..e57250a7dd8d 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/reptyr-0.10.0 b/metadata/md5-cache/app-misc/reptyr-0.10.0
new file mode 100644
index 000000000000..8be25e3d097b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/reptyr-0.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=A utility to attach a running program to a new terminal
+EAPI=8
+HOMEPAGE=https://github.com/nelhage/reptyr
+INHERIT=bash-completion-r1 toolchain-funcs flag-o-matic vcs-snapshot
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/nelhage/reptyr/archive/reptyr-0.10.0.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_md5_=c9a51d6bd9eb6e0e686877fa5adf31c1
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 0412c20226da..23ca586ceeb3 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/sigil-2.0.1-r1 b/metadata/md5-cache/app-text/sigil-2.0.1-r1
index 5450b01db29d..6e883344e73c 100644
--- a/metadata/md5-cache/app-text/sigil-2.0.1-r1
+++ b/metadata/md5-cache/app-text/sigil-2.0.1-r1
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk] ) qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk] ) virtual/pkgconfig !qt6? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] sys-libs/zlib[minizip] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) qt6? ( dev-qt/qtbase:6[concurrent,cups,network,widgets,xml] dev-qt/qt5compat:6 dev-qt/qtwebengine:6[widgets] )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] sys-libs/zlib[minizip] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) qt6? ( dev-qt/qtbase:6[concurrent,cups,network,widgets,xml] dev-qt/qt5compat:6 dev-qt/qtwebengine:6[widgets] )
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=8
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg cmake python-single-r1
-IUSE=doc +plugins +qt5 qt6 python_single_target_python3_10 python_single_target_python3_11
+IUSE=doc +plugins qt6 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-3+ Apache-2.0
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] sys-libs/zlib[minizip] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) qt6? ( dev-qt/qtbase:6[concurrent,cups,network,widgets,xml] dev-qt/qt5compat:6 dev-qt/qtwebengine:6[widgets] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( qt5 qt6 )
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[tk] ) python_single_target_python3_11? ( dev-lang/python:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] sys-libs/zlib[minizip] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) !qt6? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) qt6? ( dev-qt/qtbase:6[concurrent,cups,network,widgets,xml] dev-qt/qt5compat:6 dev-qt/qtwebengine:6[widgets] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/2.0.1.tar.gz -> sigil-2.0.1.tar.gz doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/2022.05.17/Sigil_User_Guide_2022.05.17.epub )
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e5a7be7470ceea0a4fb962f469a6ec13
+_md5_=17488def6d27faa1576b402a63dce66f
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 1eeaa3adb7dc..08e23a1ed975 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/xsimd-11.1.0 b/metadata/md5-cache/dev-cpp/xsimd-11.1.0
index a3a896091d94..39ea5ee49501 100644
--- a/metadata/md5-cache/dev-cpp/xsimd-11.1.0
+++ b/metadata/md5-cache/dev-cpp/xsimd-11.1.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/xtensor-stack/xsimd
 INHERIT=cmake
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xtensor-stack/xsimd/archive/refs/tags/11.1.0.tar.gz -> xsimd-11.1.0.tar.gz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=eed490c6f27a8aee9fc445934a7b380d
+_md5_=ed45b90148d518c5be6cdd5410e4ab2f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index c79a67476415..aefa27c3388f 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/mongodb-4.4.20 b/metadata/md5-cache/dev-db/mongodb-4.4.20
index e73d1dd14e6a..7ad5157858d0 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.20
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.20
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.20.tar.gz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=81b19d8c4dcec23bbe31cba747c4876e
+_md5_=7a72f7e21dfa5fe92129609694de1ff6
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 23ff6133b414..52971a4894ef 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/R-4.3.0 b/metadata/md5-cache/dev-lang/R-4.3.0
deleted file mode 100644
index 9ee246a90d85..000000000000
--- a/metadata/md5-cache/dev-lang/R-4.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) test? ( virtual/latex-base ) 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 virtual/fortran
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=app-arch/bzip2 app-arch/xz-utils app-text/ghostscript-gpl dev-libs/libpcre2:= >=dev-libs/tre-0.8.0_p20210321[approx] net-misc/curl virtual/blas sys-libs/zlib[minizip] || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:=[X=] x11-libs/pango:= ) icu? ( dev-libs/icu:= ) jpeg? ( media-libs/libjpeg-turbo:= ) kernel_linux? ( net-libs/libtirpc ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:= ) readline? ( sys-libs/readline:= ) tiff? ( media-libs/tiff:= ) tk? ( dev-lang/tk:= ) X? ( x11-libs/libXmu x11-libs/libXt ) virtual/fortran
-DESCRIPTION=Language and environment for statistical computing and graphics
-EAPI=8
-HOMEPAGE=https://www.r-project.org/
-INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
-IUSE=cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X
-KEYWORDS=amd64 arm64 ~hppa ~ia64 ~loong sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
-RDEPEND=app-arch/bzip2 app-arch/xz-utils app-text/ghostscript-gpl dev-libs/libpcre2:= >=dev-libs/tre-0.8.0_p20210321[approx] net-misc/curl virtual/blas sys-libs/zlib[minizip] || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:=[X=] x11-libs/pango:= ) icu? ( dev-libs/icu:= ) jpeg? ( media-libs/libjpeg-turbo:= ) kernel_linux? ( net-libs/libtirpc ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:= ) readline? ( sys-libs/readline:= ) tiff? ( media-libs/tiff:= ) tk? ( dev-lang/tk:= ) X? ( x11-libs/libXmu x11-libs/libXt ) java? ( >=virtual/jre-1.8:* ) virtual/fortran
-REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
-RESTRICT=minimal? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://cran/src/base/R-4/R-4.3.0.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=859698b158ccf4ac09907afb933fa4b9
diff --git a/metadata/md5-cache/dev-lang/R-4.3.1 b/metadata/md5-cache/dev-lang/R-4.3.1
index 611c4d5ec7b3..917a7c38b086 100644
--- a/metadata/md5-cache/dev-lang/R-4.3.1
+++ b/metadata/md5-cache/dev-lang/R-4.3.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.r-project.org/
 INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
 IUSE=cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X
-KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
+KEYWORDS=amd64 arm64 ~hppa ~ia64 ~loong sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2 app-arch/xz-utils app-text/ghostscript-gpl dev-libs/libpcre2:= >=dev-libs/tre-0.8.0_p20210321[approx] net-misc/curl virtual/blas sys-libs/zlib[minizip] || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:=[X=] x11-libs/pango:= ) icu? ( dev-libs/icu:= ) jpeg? ( media-libs/libjpeg-turbo:= ) kernel_linux? ( net-libs/libtirpc ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:= ) readline? ( sys-libs/readline:= ) tiff? ( media-libs/tiff:= ) tk? ( dev-lang/tk:= ) X? ( x11-libs/libXmu x11-libs/libXt ) java? ( >=virtual/jre-1.8:* ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -14,4 +14,4 @@ RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.3.1.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ca064c6febe6d3fc47960826da7f7247
+_md5_=fbb95a1bf19c53a386051f87d3bdf628
diff --git a/metadata/md5-cache/dev-lang/php-8.0.25 b/metadata/md5-cache/dev-lang/php-8.0.25
deleted file mode 100644
index 4cfd0a7a4c96..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.0.25
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.0
-SRC_URI=https://www.php.net/distributions/php-8.0.25.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=70aa64c52bc48aae00db2be82f05c75e
diff --git a/metadata/md5-cache/dev-lang/php-8.0.28 b/metadata/md5-cache/dev-lang/php-8.0.28
deleted file mode 100644
index e1cfe30b9b7d..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.0.28
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://www.php.net/
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.0
-SRC_URI=https://www.php.net/distributions/php-8.0.28.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=be7b040d444c2905c7c1ba6bc145b550
diff --git a/metadata/md5-cache/dev-lang/php-8.0.29 b/metadata/md5-cache/dev-lang/php-8.0.29
index 5a7b8b1ce490..93c8c0514620 100644
--- a/metadata/md5-cache/dev-lang/php-8.0.29
+++ b/metadata/md5-cache/dev-lang/php-8.0.29
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.php.net/
 INHERIT=flag-o-matic systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.php.net/distributions/php-8.0.29.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=886e2551d44d7801a9cc988f03cfd64c
+_md5_=c40ae9a46530fca46b079f9295884f83
diff --git a/metadata/md5-cache/dev-lang/php-8.1.12 b/metadata/md5-cache/dev-lang/php-8.1.12
deleted file mode 100644
index 90517d19370d..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.1.12
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.1
-SRC_URI=https://www.php.net/distributions/php-8.1.12.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=1d2c1bc4d8e70dd6109d64c4a2c87ed7
diff --git a/metadata/md5-cache/dev-lang/php-8.1.16 b/metadata/md5-cache/dev-lang/php-8.1.16
deleted file mode 100644
index a40c0b618eef..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.1.16
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=8
-HOMEPAGE=https://www.php.net/
-IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
-INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
-RESTRICT=!test? ( test )
-SLOT=8.1
-SRC_URI=https://www.php.net/distributions/php-8.1.16.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=cf1026069402d4e9596e6bfad8afd7e6
diff --git a/metadata/md5-cache/dev-lang/php-8.1.20-r1 b/metadata/md5-cache/dev-lang/php-8.1.20-r1
index 105044caafe0..7683577598bd 100644
--- a/metadata/md5-cache/dev-lang/php-8.1.20-r1
+++ b/metadata/md5-cache/dev-lang/php-8.1.20-r1
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.php.net/
 IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
 INHERIT=flag-o-matic multilib systemd autotools
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 avif bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=8.1
 SRC_URI=https://www.php.net/distributions/php-8.1.20.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=1d5f334641235f4b8ecfd917b924e73e
+_md5_=ba7aeb21f4637f1b74c40d6a6283c4dd
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e3b4d923c0e6..90f1f02bae82 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/level-zero-1.14.0 b/metadata/md5-cache/dev-libs/level-zero-1.14.0
index 8b6690bb1364..a4af2e29d9e1 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.14.0
+++ b/metadata/md5-cache/dev-libs/level-zero-1.14.0
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0/1.14.0
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.14.0.tar.gz -> level-zero-1.14.0.tar.gz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=54f1792f555889f751811cd522b19d5d
+_md5_=2feb508d1af9e073d0efeb5612c0a74c
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1u b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1u
index 5188f3e1407f..2decada996c8 100644
--- a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1u
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1u
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=openssl
 RDEPEND=!=dev-libs/openssl-1.1.1*:0 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=1.1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1u.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1u.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=37ff96c0c5a07deb746c5b97ed313795
+_md5_=bd196fa3433cfdcebd8b1499723a0615
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1c481eaae5d1..d418c0391dfd 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/black-23.9.0 b/metadata/md5-cache/dev-python/black-23.9.0
new file mode 100644
index 000000000000..50ae0eac461c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/black-23.9.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/hatch-vcs[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/aiohttp-3.7.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/aiohttp-cors[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/click-8.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-22.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=The uncompromising Python code formatter
+EAPI=8
+HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
+INHERIT=distutils-r1 multiprocessing optfeature pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/packaging-22.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/platformdirs-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/b/black/black-23.9.0.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=189875d3fbe77c2b856c403c7194e73c
diff --git a/metadata/md5-cache/dev-python/hvac-1.2.1 b/metadata/md5-cache/dev-python/hvac-1.2.1
new file mode 100644
index 000000000000..8d3967b83827
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hvac-1.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask-sqlalchemy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jwcrypto[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/semantic-version[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/werkzeug[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pyhcl-0.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HashiCorp Vault API client
+EAPI=8
+HOMEPAGE=https://github.com/hvac/hvac/ https://pypi.org/project/hvac/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pyhcl-0.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/requests-2.24.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/h/hvac/hvac-1.2.1.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=96e8068cf016ad602cd0097e5f7a3e8f
diff --git a/metadata/md5-cache/dev-python/libtmux-0.23.2 b/metadata/md5-cache/dev-python/libtmux-0.23.2
new file mode 100644
index 000000000000..b4237f85bb66
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libtmux-0.23.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=app-misc/tmux-3.0a >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python API for tmux
+EAPI=8
+HOMEPAGE=https://libtmux.git-pull.com/ https://github.com/tmux-python/libtmux/ https://pypi.org/project/libtmux/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-misc/tmux-3.0a python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.23.2.tar.gz -> libtmux-0.23.2.gh.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=03886deda0f1b2ceb411e0f2dd4aa49e
diff --git a/metadata/md5-cache/dev-python/omemo-dr-1.0.0 b/metadata/md5-cache/dev-python/omemo-dr-1.0.0
index 9a6880a08138..9a938e7e51f8 100644
--- a/metadata/md5-cache/dev-python/omemo-dr-1.0.0
+++ b/metadata/md5-cache/dev-python/omemo-dr-1.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/omemo-dr/ https://dev.gajim.org/gajim/omemo-dr
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/protobuf-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-1.0.0.tar.gz
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f7e7b134eccd9032795c03a6c33b25b8
+_md5_=e81ec9c933f906c2ba381bc6647cdb37
diff --git a/metadata/md5-cache/dev-python/pythran-0.14.0 b/metadata/md5-cache/dev-python/pythran-0.14.0
index 486e279c478d..32bf0fef8053 100644
--- a/metadata/md5-cache/dev-python/pythran-0.14.0
+++ b/metadata/md5-cache/dev-python/pythran-0.14.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pythran/ https://github.com/serge-sans-paille/pythran/
 INHERIT=distutils-r1 multiprocessing
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost =dev-python/beniget-0.4*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/gast-0.5*[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ply-3.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/serge-sans-paille/pythran/archive/0.14.0.tar.gz -> pythran-0.14.0.gh.tar.gz
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=b491be238aa79342912d62c09135311a
+_md5_=51c012a1e2ad4ed3ceb2469047079389
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index db5870d0ffbb..cc7c742c091c 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qt-docs-6.5.2_p202307080352 b/metadata/md5-cache/dev-qt/qt-docs-6.5.2_p202307080352
index 22ecda48369b..717ee2a3102b 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-6.5.2_p202307080352
+++ b/metadata/md5-cache/dev-qt/qt-docs-6.5.2_p202307080352
@@ -1,11 +1,14 @@
-DEFINED_PHASES=install
-DESCRIPTION=Qt6 documentation, for use with Qt Creator and other tools
+BDEPEND=examples? ( app-arch/p7zip media-libs/libpng )
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Qt6 documentation and examples for Qt Creator and other tools
 EAPI=8
 HOMEPAGE=https://doc.qt.io/
-IUSE=+html +qch +tools +quick3d +webchannel grpc +3d +qt5compat +imageformats +multimedia lottie +networkauth +sensors +speech quick3dphysics webview +connectivity +webengine +positioning activeqt +charts +declarative +svg remoteobjects httpserver +websockets +serialport datavis serialbus +wayland +shadertools +timeline +virtualkeyboard +scxml +location
+INHERIT=unpacker
+IUSE=+examples +html +qch +tools +quick3d +webchannel grpc +3d +qt5compat +imageformats +multimedia lottie +networkauth +sensors +speech quick3dphysics webview +connectivity +webengine +positioning activeqt +charts +declarative +svg remoteobjects httpserver +websockets +serialport datavis serialbus +wayland +shadertools +timeline +virtualkeyboard +scxml +location
 KEYWORDS=~amd64
 LICENSE=FDL-1.3
-REQUIRED_USE=|| ( html qch )
+REQUIRED_USE=|| ( examples html qch )
 SLOT=6
-SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qmake-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtconcurrent-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtcore-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdbus-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtgui-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtnetwork-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtopengl-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtplatformintegration-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtprintsupport-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtsql-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qttestlib-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtwidgets-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtxml-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtcmake-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdoc-documentation.tar.xz 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt3d/6.5.2-0-202307080352qt3d-documentation.tar.xz ) activeqt? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtactiveqt/6.5.2-0-202307080352activeqt-documentation.tar.xz ) charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtcharts/6.5.2-0-202307080352qtcharts-documentation.tar.xz ) connectivity? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtbluetooth/6.5.2-0-202307080352qtbluetooth-documentation.tar.xz ) connectivity? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtnfc/6.5.2-0-202307080352qtnfc-documentation.tar.xz ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtdatavis3d/6.5.2-0-202307080352qtdatavis3d-documentation.tar.xz ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtlabsplatform-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqml-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlcore-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlmodels-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmltest-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlworkerscript-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlxmllistmodel-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquick-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquickcontrols-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquickdialogs-documentation.tar.xz ) grpc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtgrpc/6.5.2-0-202307080352qtprotobuf-documentation.tar.xz ) httpserver? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qthttpserver/6.5.2-0-202307080352qthttpserver-documentation.tar.xz ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtimageformats/6.5.2-0-202307080352qtimageformats-documentation.tar.xz ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtlocation/6.5.2-0-202307080352qtlocation-documentation.tar.xz ) lottie? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtlottie/6.5.2-0-202307080352qtlottieanimation-documentation.tar.xz ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtmultimedia/6.5.2-0-202307080352qtmultimedia-documentation.tar.xz ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtnetworkauth/6.5.2-0-202307080352qtnetworkauth-documentation.tar.xz ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtpositioning/6.5.2-0-202307080352qtpositioning-documentation.tar.xz ) qt5compat? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt5compat/6.5.2-0-202307080352qtcore5compat-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt5compat/6.5.2-0-202307080352qtgraphicaleffects5compat-documentation.tar.xz ) quick3dphysics? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquick3dphysics/6.5.2-0-202307080352qtquick3dphysics-documentation.tar.xz ) quick3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquick3d/6.5.2-0-202307080352qtquick3d-documentation.tar.xz ) remoteobjects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtremoteobjects/6.5.2-0-202307080352qtremoteobjects-documentation.tar.xz ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtscxml/6.5.2-0-202307080352qtscxml-documentation.tar.xz ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtsensors/6.5.2-0-202307080352qtsensors-documentation.tar.xz ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtserialbus/6.5.2-0-202307080352qtserialbus-documentation.tar.xz ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtserialport/6.5.2-0-202307080352qtserialport-documentation.tar.xz ) shadertools? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtshadertools/6.5.2-0-202307080352qtshadertools-documentation.tar.xz ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtspeech/6.5.2-0-202307080352qttexttospeech-documentation.tar.xz ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtsvg-documentation.tar.xz ) timeline? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquicktimeline/6.5.2-0-202307080352qtquicktimeline-documentation.tar.xz ) tools? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qdoc-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtassistant-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdesigner-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdistancefieldgenerator-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qthelp-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtlinguist-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtuitools-documentation.tar.xz ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtvirtualkeyboard/6.5.2-0-202307080352qtvirtualkeyboard-documentation.tar.xz ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtwaylandcompositor-documentation.tar.xz ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebchannel/6.5.2-0-202307080352qtwebchannel-documentation.tar.xz ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtpdf/6.5.2-0-202307080352qtpdf-documentation.tar.xz ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebengine/6.5.2-0-202307080352qtwebengine-documentation.tar.xz ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebsockets/6.5.2-0-202307080352qtwebsockets-documentation.tar.xz ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebview/6.5.2-0-202307080352qtwebview-documentation.tar.xz )
-_md5_=010eb69f76914746dc94cd1c62b5aeb2
+SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qmake-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtcmake-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtconcurrent-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtcore-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdbus-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtgui-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtnetwork-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtopengl-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtplatformintegration-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtprintsupport-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtsql-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qttestlib-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtwidgets-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtxml-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtbase-examples-6.5.2.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt3d/6.5.2-0-202307080352qt3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qt3d/6.5.2-0-202307080352qt3d-examples-6.5.2.7z ) ) activeqt? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtactiveqt/6.5.2-0-202307080352activeqt-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtactiveqt/6.5.2-0-202307080352qtactiveqt-examples-6.5.2.7z ) ) charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtcharts/6.5.2-0-202307080352qtcharts-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtcharts/6.5.2-0-202307080352qtcharts-examples-6.5.2.7z ) ) connectivity? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtbluetooth/6.5.2-0-202307080352qtbluetooth-documentation.tar.xz ) connectivity? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtbluetooth/6.5.2-0-202307080352qtbluetooth-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtconnectivity/6.5.2-0-202307080352qtconnectivity-examples-6.5.2.7z ) ) connectivity? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtnfc/6.5.2-0-202307080352qtnfc-documentation.tar.xz ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtdatavis3d/6.5.2-0-202307080352qtdatavis3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtdatavis3d/6.5.2-0-202307080352qtdatavis3d-examples-6.5.2.7z ) ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtlabsplatform-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqml-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlcore-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlmodels-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmltest-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlworkerscript-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtqmlxmllistmodel-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquick-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquickcontrols-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtquickdialogs-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtdeclarative-examples-6.5.2.7z ) ) https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdoc-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtdoc-examples-6.5.2.7z ) grpc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtgrpc/6.5.2-0-202307080352qtprotobuf-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtgrpc/6.5.2-0-202307080352qtgrpc-examples-6.5.2.7z ) ) httpserver? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qthttpserver/6.5.2-0-202307080352qthttpserver-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qthttpserver/6.5.2-0-202307080352qthttpserver-examples-6.5.2.7z ) ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtimageformats/6.5.2-0-202307080352qtimageformats-documentation.tar.xz ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtlocation/6.5.2-0-202307080352qtlocation-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtlocation/6.5.2-0-202307080352qtlocation-examples-6.5.2.7z ) ) lottie? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtlottie/6.5.2-0-202307080352qtlottieanimation-documentation.tar.xz ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtmultimedia/6.5.2-0-202307080352qtmultimedia-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtmultimedia/6.5.2-0-202307080352qtmultimedia-examples-6.5.2.7z ) ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtnetworkauth/6.5.2-0-202307080352qtnetworkauth-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtnetworkauth/6.5.2-0-202307080352qtnetworkauth-examples-6.5.2.7z ) ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtpositioning/6.5.2-0-202307080352qtpositioning-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtpositioning/6.5.2-0-202307080352qtpositioning-examples-6.5.2.7z ) ) qt5compat? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt5compat/6.5.2-0-202307080352qtcore5compat-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qt5compat/6.5.2-0-202307080352qtgraphicaleffects5compat-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qt5compat/6.5.2-0-202307080352qt5compat-examples-6.5.2.7z ) ) quick3dphysics? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquick3dphysics/6.5.2-0-202307080352qtquick3dphysics-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtquick3dphysics/6.5.2-0-202307080352qtquick3dphysics-examples-6.5.2.7z ) ) quick3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquick3d/6.5.2-0-202307080352qtquick3d-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtquick3d/6.5.2-0-202307080352qtquick3d-examples-6.5.2.7z ) ) remoteobjects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtremoteobjects/6.5.2-0-202307080352qtremoteobjects-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtremoteobjects/6.5.2-0-202307080352qtremoteobjects-examples-6.5.2.7z ) ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtscxml/6.5.2-0-202307080352qtscxml-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtscxml/6.5.2-0-202307080352qtscxml-examples-6.5.2.7z ) ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtsensors/6.5.2-0-202307080352qtsensors-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtsensors/6.5.2-0-202307080352qtsensors-examples-6.5.2.7z ) ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtserialbus/6.5.2-0-202307080352qtserialbus-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtserialbus/6.5.2-0-202307080352qtserialbus-examples-6.5.2.7z ) ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtserialport/6.5.2-0-202307080352qtserialport-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtserialport/6.5.2-0-202307080352qtserialport-examples-6.5.2.7z ) ) shadertools? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtshadertools/6.5.2-0-202307080352qtshadertools-documentation.tar.xz ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtspeech/6.5.2-0-202307080352qttexttospeech-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtspeech/6.5.2-0-202307080352qtspeech-examples-6.5.2.7z ) ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtsvg-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtsvg-examples-6.5.2.7z ) ) timeline? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtquicktimeline/6.5.2-0-202307080352qtquicktimeline-documentation.tar.xz ) tools? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qdoc-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtassistant-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdesigner-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtdistancefieldgenerator-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qthelp-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtlinguist-documentation.tar.xz https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtuitools-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qttools-examples-6.5.2.7z ) ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtvirtualkeyboard/6.5.2-0-202307080352qtvirtualkeyboard-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtvirtualkeyboard/6.5.2-0-202307080352qtvirtualkeyboard-examples-6.5.2.7z ) ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc/6.5.2-0-202307080352qtwaylandcompositor-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples/6.5.2-0-202307080352qtwayland-examples-6.5.2.7z ) ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebchannel/6.5.2-0-202307080352qtwebchannel-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtwebchannel/6.5.2-0-202307080352qtwebchannel-examples-6.5.2.7z ) ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtpdf/6.5.2-0-202307080352qtpdf-documentation.tar.xz ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebengine/6.5.2-0-202307080352qtwebengine-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtwebengine/6.5.2-0-202307080352qtwebengine-examples-6.5.2.7z ) ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebsockets/6.5.2-0-202307080352qtwebsockets-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtwebsockets/6.5.2-0-202307080352qtwebsockets-examples-6.5.2.7z ) ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.doc.qtwebview/6.5.2-0-202307080352qtwebview-documentation.tar.xz examples? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_652_src_doc_examples/qt.qt6.652.examples.qtwebview/6.5.2-0-202307080352qtwebview-examples-6.5.2.7z ) )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=a66c5b269786023d44a6e688d8abcc92
diff --git a/metadata/md5-cache/dev-qt/qt3d-6.5.2-r1 b/metadata/md5-cache/dev-qt/qt3d-6.5.2-r1
index 0b47e38e15b9..5a0ee867e4b6 100644
--- a/metadata/md5-cache/dev-qt/qt3d-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qt3d-6.5.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.2:6[widgets] ) vulkan? ( dev-util/vulkan-headers )
+DEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.2:6 ) vulkan? ( dev-util/vulkan-headers )
 DESCRIPTION=3D rendering module for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,9 +8,9 @@ INHERIT=qt6-build
 IUSE=gles2-only qml vulkan test
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.2:6[widgets] )
+RDEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a503b582b944f02498dc4af202f52850
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e819c83623b317dc39622a13bd1f0ad1
diff --git a/metadata/md5-cache/dev-qt/qt3d-6.5.9999 b/metadata/md5-cache/dev-qt/qt3d-6.5.9999
index 84ff12afe2d3..f28d2cd24c5b 100644
--- a/metadata/md5-cache/dev-qt/qt3d-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qt3d-6.5.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] ~dev-qt/qtshadertools-6.5.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.9999:6[widgets] ) vulkan? ( dev-util/vulkan-headers )
+DEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.5.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 ) vulkan? ( dev-util/vulkan-headers )
 DESCRIPTION=3D rendering module for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=gles2-only qml vulkan test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] ~dev-qt/qtshadertools-6.5.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.9999:6[widgets] )
+RDEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.5.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a503b582b944f02498dc4af202f52850
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e819c83623b317dc39622a13bd1f0ad1
diff --git a/metadata/md5-cache/dev-qt/qt3d-6.9999 b/metadata/md5-cache/dev-qt/qt3d-6.9999
index 5b555663c9c7..0ea56d223d74 100644
--- a/metadata/md5-cache/dev-qt/qt3d-6.9999
+++ b/metadata/md5-cache/dev-qt/qt3d-6.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.9999:6[widgets] ) vulkan? ( dev-util/vulkan-headers )
+DEPEND=~dev-qt/qtbase-6.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) vulkan? ( dev-util/vulkan-headers )
 DESCRIPTION=3D rendering module for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=gles2-only qml vulkan test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=,widgets] ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.9999:6[widgets] )
+RDEPEND=~dev-qt/qtbase-6.9999:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a503b582b944f02498dc4af202f52850
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e819c83623b317dc39622a13bd1f0ad1
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.5.2-r1 b/metadata/md5-cache/dev-qt/qt5compat-6.5.2-r1
index 7d97dee4d213..5c0d24024ff5 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.5.2-r1
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7fa58c1c7fd8e3e0b3b2c12a723df1ec
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.5.9999 b/metadata/md5-cache/dev-qt/qt5compat-6.5.9999
index 2553bc6d281c..6684ba92da59 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 ~dev-qt/qtshadertools-6.5.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7fa58c1c7fd8e3e0b3b2c12a723df1ec
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.9999 b/metadata/md5-cache/dev-qt/qt5compat-6.9999
index 1ad39f3e6cd7..6756319e72ea 100644
--- a/metadata/md5-cache/dev-qt/qt5compat-6.9999
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui,icu=,network,xml] icu? ( dev-libs/icu:= ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtshadertools-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7fa58c1c7fd8e3e0b3b2c12a723df1ec
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtbase-6.5.2-r1
deleted file mode 100644
index b0634d585131..000000000000
--- a/metadata/md5-cache/dev-qt/qtbase-6.5.2-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=zstd? ( app-arch/libarchive[zstd] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) ) X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) ) network? ( sctp? ( net-misc/lksctp-tools ) ) test? ( elibc_musl? ( sys-libs/timezone-data ) )
-DESCRIPTION=Cross-platform application development framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-INHERIT=flag-o-matic qt6-build toolchain-funcs
-IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl tslib vulkan +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu systemd mysql oci8 odbc postgres +sqlite cups gtk wayland test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=wayland? ( ~dev-qt/qtwayland-6.5.2:6 )
-RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) )
-REQUIRED_USE=X? ( gui ) accessibility? ( gui ) eglfs? ( gui ) evdev? ( gui ) gles2-only? ( gui ) libinput? ( gui ) opengl? ( gui ) tslib? ( gui ) vulkan? ( gui ) widgets? ( gui ) brotli? ( network ) gssapi? ( network ) libproxy? ( network ) sctp? ( network ) mysql? ( sql ) oci8? ( sql ) odbc? ( sql ) postgres? ( sql ) sqlite? ( sql ) cups? ( gui widgets ) gtk? ( gui widgets ) accessibility? ( X dbus ) eglfs? ( opengl ) gui? ( || ( X eglfs wayland ) ) libinput? ( udev ) sql? ( || ( mysql oci8 odbc postgres sqlite ) ) test? ( icu sql? ( sqlite ) )
-RESTRICT=!test? ( test )
-SLOT=6/6.5
-SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf8d8d5837caa42fdeb2d3cee0556534
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.5.2-r2 b/metadata/md5-cache/dev-qt/qtbase-6.5.2-r2
new file mode 100644
index 000000000000..64e4f15e4ae6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtbase-6.5.2-r2
@@ -0,0 +1,18 @@
+BDEPEND=zstd? ( app-arch/libarchive[zstd] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) ) X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) ) network? ( sctp? ( net-misc/lksctp-tools ) ) test? ( elibc_musl? ( sys-libs/timezone-data ) )
+DESCRIPTION=Cross-platform application development framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=flag-o-matic qt6-build toolchain-funcs
+IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl tslib vulkan +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu mysql oci8 odbc postgres +sqlite cups gtk nls wayland test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=nls? ( ~dev-qt/qttranslations-6.5.2:6 ) wayland? ( ~dev-qt/qtwayland-6.5.2:6 )
+RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) )
+REQUIRED_USE=X? ( gui ) accessibility? ( gui ) eglfs? ( gui ) evdev? ( gui ) gles2-only? ( gui ) libinput? ( gui ) opengl? ( gui ) tslib? ( gui ) vulkan? ( gui ) widgets? ( gui ) brotli? ( network ) gssapi? ( network ) libproxy? ( network ) sctp? ( network ) mysql? ( sql ) oci8? ( sql ) odbc? ( sql ) postgres? ( sql ) sqlite? ( sql ) cups? ( gui widgets ) gtk? ( gui widgets ) accessibility? ( X dbus ) eglfs? ( opengl ) gui? ( || ( X eglfs wayland ) ) libinput? ( udev ) sql? ( || ( mysql oci8 odbc postgres sqlite ) ) test? ( icu sql? ( sqlite ) )
+RESTRICT=!test? ( test )
+SLOT=6/6.5
+SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=52c505430066302a14b3f64ceb9e1d8b
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.5.9999 b/metadata/md5-cache/dev-qt/qtbase-6.5.9999
index 836bcea03a70..21285850c3a5 100644
--- a/metadata/md5-cache/dev-qt/qtbase-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtbase-6.5.9999
@@ -1,17 +1,17 @@
 BDEPEND=zstd? ( app-arch/libarchive[zstd] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) ) X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) ) network? ( sctp? ( net-misc/lksctp-tools ) ) test? ( elibc_musl? ( sys-libs/timezone-data ) )
+DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) ) X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) ) network? ( sctp? ( net-misc/lksctp-tools ) ) test? ( elibc_musl? ( sys-libs/timezone-data ) )
 DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=flag-o-matic qt6-build toolchain-funcs
-IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl tslib vulkan +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu systemd mysql oci8 odbc postgres +sqlite cups gtk nls wayland test
+IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl tslib vulkan +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu mysql oci8 odbc postgres +sqlite cups gtk nls wayland test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=nls? ( ~dev-qt/qttranslations-6.5.9999:6 ) wayland? ( ~dev-qt/qtwayland-6.5.9999:6 )
 PROPERTIES=live
-RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) )
+RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) )
 REQUIRED_USE=X? ( gui ) accessibility? ( gui ) eglfs? ( gui ) evdev? ( gui ) gles2-only? ( gui ) libinput? ( gui ) opengl? ( gui ) tslib? ( gui ) vulkan? ( gui ) widgets? ( gui ) brotli? ( network ) gssapi? ( network ) libproxy? ( network ) sctp? ( network ) mysql? ( sql ) oci8? ( sql ) odbc? ( sql ) postgres? ( sql ) sqlite? ( sql ) cups? ( gui widgets ) gtk? ( gui widgets ) accessibility? ( X dbus ) eglfs? ( opengl ) gui? ( || ( X eglfs wayland ) ) libinput? ( udev ) sql? ( || ( mysql oci8 odbc postgres sqlite ) ) test? ( icu sql? ( sqlite ) )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=65471accc3cb03fe30d96324544d6f3c
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fc860d8073d7d8a2b44d562d2a8ba045
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.9999 b/metadata/md5-cache/dev-qt/qtbase-6.9999
index c5b105431a6a..1820ed0f917b 100644
--- a/metadata/md5-cache/dev-qt/qtbase-6.9999
+++ b/metadata/md5-cache/dev-qt/qtbase-6.9999
@@ -1,17 +1,17 @@
 BDEPEND=zstd? ( app-arch/libarchive[zstd] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) ) X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) ) network? ( sctp? ( net-misc/lksctp-tools ) ) test? ( elibc_musl? ( sys-libs/timezone-data ) )
+DEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) ) X? ( x11-base/xorg-proto ) gui? ( vulkan? ( dev-util/vulkan-headers ) ) network? ( sctp? ( net-misc/lksctp-tools ) ) test? ( elibc_musl? ( sys-libs/timezone-data ) )
 DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=flag-o-matic qt6-build toolchain-funcs
-IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl tslib vulkan +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu systemd mysql oci8 odbc postgres +sqlite cups gtk nls wayland test
+IUSE=+X accessibility eglfs evdev gles2-only +libinput opengl tslib vulkan +widgets +ssl +udev zstd brotli gssapi libproxy sctp +concurrent +dbus +gui +network +sql +xml icu mysql oci8 odbc postgres +sqlite cups gtk nls wayland test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=nls? ( ~dev-qt/qttranslations-6.9999:6 ) wayland? ( ~dev-qt/qtwayland-6.9999:6 )
 PROPERTIES=live
-RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) )
+RDEPEND=sys-libs/zlib:= ssl? ( dev-libs/openssl:= ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode(+)] icu? ( dev-libs/icu:= ) dbus? ( sys-apps/dbus ) gui? ( media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:= x11-libs/libdrm x11-libs/libxkbcommon[X?] X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) accessibility? ( app-accessibility/at-spi2-core:2 ) eglfs? ( media-libs/mesa[gbm(+)] ) evdev? ( sys-libs/mtdev ) libinput? ( dev-libs/libinput:= ) opengl? ( media-libs/libglvnd[X?] ) tslib? ( x11-libs/tslib ) widgets? ( cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango ) ) ) network? ( brotli? ( app-arch/brotli:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) ) sql? ( mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) )
 REQUIRED_USE=X? ( gui ) accessibility? ( gui ) eglfs? ( gui ) evdev? ( gui ) gles2-only? ( gui ) libinput? ( gui ) opengl? ( gui ) tslib? ( gui ) vulkan? ( gui ) widgets? ( gui ) brotli? ( network ) gssapi? ( network ) libproxy? ( network ) sctp? ( network ) mysql? ( sql ) oci8? ( sql ) odbc? ( sql ) postgres? ( sql ) sqlite? ( sql ) cups? ( gui widgets ) gtk? ( gui widgets ) accessibility? ( X dbus ) eglfs? ( opengl ) gui? ( || ( X eglfs wayland ) ) libinput? ( udev ) sql? ( || ( mysql oci8 odbc postgres sqlite ) ) test? ( icu sql? ( sqlite ) )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc88df278db13623ee85a381ebbb9523
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fc860d8073d7d8a2b44d562d2a8ba045
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
index ab0d097b37c8..2218c420105f 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.5.2-r1
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6d6d174f1cd6ddf3babaaeba8c4582af
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.5.9999 b/metadata/md5-cache/dev-qt/qtcharts-6.5.9999
index 0fa69591109f..658ec0729c69 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6d6d174f1cd6ddf3babaaeba8c4582af
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.9999 b/metadata/md5-cache/dev-qt/qtcharts-6.9999
index 1b38aae2a005..6b415aa9048e 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-6.9999
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gles2-only=,gui,opengl,widgets] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6d6d174f1cd6ddf3babaaeba8c4582af
diff --git a/metadata/md5-cache/dev-qt/qtconnectivity-6.5.2 b/metadata/md5-cache/dev-qt/qtconnectivity-6.5.2
index 4937d383a295..42156e7ede0a 100644
--- a/metadata/md5-cache/dev-qt/qtconnectivity-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtconnectivity-6.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( bluetooth nfc )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2492a4fbb0880231ba31941a88359001
diff --git a/metadata/md5-cache/dev-qt/qtconnectivity-6.5.9999 b/metadata/md5-cache/dev-qt/qtconnectivity-6.5.9999
index 80adadf9a1be..6b7120900538 100644
--- a/metadata/md5-cache/dev-qt/qtconnectivity-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtconnectivity-6.5.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.9999:6[network] bluetooth? ( ~dev-qt/qtbase-6.5.9999:
 REQUIRED_USE=|| ( bluetooth nfc )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2492a4fbb0880231ba31941a88359001
diff --git a/metadata/md5-cache/dev-qt/qtconnectivity-6.9999 b/metadata/md5-cache/dev-qt/qtconnectivity-6.9999
index 34d601eefb91..73ba3d9624b9 100644
--- a/metadata/md5-cache/dev-qt/qtconnectivity-6.9999
+++ b/metadata/md5-cache/dev-qt/qtconnectivity-6.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.9999:6[network] bluetooth? ( ~dev-qt/qtbase-6.9999:6[db
 REQUIRED_USE=|| ( bluetooth nfc )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2492a4fbb0880231ba31941a88359001
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2-r1
index 7a9b9e33ead5..7d18916b96f4 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2-r1
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[network,opengl=,sql?,vulkan=,widgets=]
 RESTRICT=test !test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3af78b6ea9f4120cfc1228114b0814cb
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.5.9999 b/metadata/md5-cache/dev-qt/qtdeclarative-6.5.9999
index f0979d9c4857..930026b7da14 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[network,opengl=,sql?,vulkan=,widgets=]
 RESTRICT=test !test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3af78b6ea9f4120cfc1228114b0814cb
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.9999 b/metadata/md5-cache/dev-qt/qtdeclarative-6.9999
index 50ca5b3101b9..0013218d0333 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-6.9999
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network,opengl=,sql?,vulkan=,widgets=]
 RESTRICT=test !test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3af78b6ea9f4120cfc1228114b0814cb
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.5.2 b/metadata/md5-cache/dev-qt/qtimageformats-6.5.2
index b35dca2b9dce..01f61752294c 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.5.2
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[gui] media-libs/libwebp:= media-libs/tiff:= mng?
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f1ccd2dc6848f654ae8a4f80e30c1d20
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.5.9999 b/metadata/md5-cache/dev-qt/qtimageformats-6.5.9999
index 82df95d62754..1326ee9436ed 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f1ccd2dc6848f654ae8a4f80e30c1d20
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.9999 b/metadata/md5-cache/dev-qt/qtimageformats-6.9999
index 0c53cfff31d9..4972e04b0241 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-6.9999
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f1ccd2dc6848f654ae8a4f80e30c1d20
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtlocation-6.5.2-r1
index 4f52c6157a74..769a647c69eb 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.5.2-r1
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[network] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=38d040a524123c74252284cd00ec25be
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.5.9999 b/metadata/md5-cache/dev-qt/qtlocation-6.5.9999
index 96ccd2e35e95..c02ebf333db5 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[network] ~dev-qt/qtdeclarative-6.5.9999:6 ~dev-qt/qtpositioning-6.5.9999:6[qml]
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a19a0c7501a70440a0d51eb9d6fba5dd
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.9999 b/metadata/md5-cache/dev-qt/qtlocation-6.9999
index cff5c724d1cd..0ecd43975671 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-6.9999
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtpositioning-6.9999:6[qml]
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a19a0c7501a70440a0d51eb9d6fba5dd
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2-r1
index d3e5abad50aa..e17a8df0be91 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ffmpeg gstreamer ) vaapi? ( ffmpeg ) test? ( qml )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5ae9e6fea5924918050a0f24a61a3c2a
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.5.9999 b/metadata/md5-cache/dev-qt/qtmultimedia-6.5.9999
index 307ad7cd1d6f..2de305ea56ca 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.5.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui,network,opengl=,vulkan=,widgets] alsa? ( m
 REQUIRED_USE=|| ( ffmpeg gstreamer ) vaapi? ( ffmpeg ) test? ( qml )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=103430f4f93cfbe38d2852b7fc37ec95
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.9999 b/metadata/md5-cache/dev-qt/qtmultimedia-6.9999
index 31334ef382dd..7c354681f2c8 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-6.9999
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.9999:6[gui,network,opengl=,vulkan=,widgets] alsa? ( med
 REQUIRED_USE=|| ( ffmpeg gstreamer ) vaapi? ( ffmpeg ) test? ( qml )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=103430f4f93cfbe38d2852b7fc37ec95
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2-r1
index f4b7764437ce..9bac7dd0e97e 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2-r1
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[network]
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=092cfc506ac81cf758ff21d590cab8d0
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.9999 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.9999
index a5c7a2324f1e..56f25652a692 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[network]
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=092cfc506ac81cf758ff21d590cab8d0
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.9999 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.9999
index 47cf9d780def..2f23e5c1bd14 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-6.9999
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network]
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=092cfc506ac81cf758ff21d590cab8d0
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtpositioning-6.5.2-r2
index 48ad4f0ab136..586f1f1164ec 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.5.2-r2
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.2:6[gui,widgets] ~dev-qt/qtserialport-6.5.2:6 geoclue? ( ~dev-qt/qtbase-6.5.2:6[dbus] ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
+DEPEND=~dev-qt/qtbase-6.5.2:6 geoclue? ( ~dev-qt/qtbase-6.5.2:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.5.2:6[network] ~dev-qt/qtserialport-6.5.2:6 ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 DESCRIPTION=Physical position determination library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
-IUSE=geoclue +qml test
+IUSE=geoclue nmea +qml test
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtbase-6.5.2:6[gui,widgets] ~dev-qt/qtserialport-6.5.2:6 geoclue? ( ~dev-qt/qtbase-6.5.2:6[dbus] ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6 ) geoclue? ( app-misc/geoclue:2.0 )
+RDEPEND=~dev-qt/qtbase-6.5.2:6 geoclue? ( ~dev-qt/qtbase-6.5.2:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.5.2:6[network] ~dev-qt/qtserialport-6.5.2:6 ) qml? ( ~dev-qt/qtdeclarative-6.5.2:6 ) geoclue? ( app-misc/geoclue:2.0 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3f913deac8a5c98946065646d74aa5d7
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=210a08fff081e0d2664f28f19f5bc3a4
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.5.9999 b/metadata/md5-cache/dev-qt/qtpositioning-6.5.9999
index 493163dee30f..9348a40659f2 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.5.9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.9999:6[gui,widgets] ~dev-qt/qtserialport-6.5.9999:6 geoclue? ( ~dev-qt/qtbase-6.5.9999:6[dbus] ) qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
+DEPEND=~dev-qt/qtbase-6.5.9999:6 geoclue? ( ~dev-qt/qtbase-6.5.9999:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.5.9999:6[network] ~dev-qt/qtserialport-6.5.9999:6 ) qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
 DESCRIPTION=Physical position determination library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
-IUSE=geoclue +qml test
+IUSE=geoclue nmea +qml test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui,widgets] ~dev-qt/qtserialport-6.5.9999:6 geoclue? ( ~dev-qt/qtbase-6.5.9999:6[dbus] ) qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 ) geoclue? ( app-misc/geoclue:2.0 )
+RDEPEND=~dev-qt/qtbase-6.5.9999:6 geoclue? ( ~dev-qt/qtbase-6.5.9999:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.5.9999:6[network] ~dev-qt/qtserialport-6.5.9999:6 ) qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 ) geoclue? ( app-misc/geoclue:2.0 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3f913deac8a5c98946065646d74aa5d7
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=210a08fff081e0d2664f28f19f5bc3a4
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.9999 b/metadata/md5-cache/dev-qt/qtpositioning-6.9999
index 24e2692f3079..47b3c4d44da4 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-6.9999
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.9999:6[gui,widgets] ~dev-qt/qtserialport-6.9999:6 geoclue? ( ~dev-qt/qtbase-6.9999:6[dbus] ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
+DEPEND=~dev-qt/qtbase-6.9999:6 geoclue? ( ~dev-qt/qtbase-6.9999:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.9999:6[network] ~dev-qt/qtserialport-6.9999:6 ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 DESCRIPTION=Physical position determination library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
-IUSE=geoclue +qml test
+IUSE=geoclue nmea +qml test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.9999:6[gui,widgets] ~dev-qt/qtserialport-6.9999:6 geoclue? ( ~dev-qt/qtbase-6.9999:6[dbus] ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) geoclue? ( app-misc/geoclue:2.0 )
+RDEPEND=~dev-qt/qtbase-6.9999:6 geoclue? ( ~dev-qt/qtbase-6.9999:6[dbus] ) nmea? ( ~dev-qt/qtbase-6.9999:6[network] ~dev-qt/qtserialport-6.9999:6 ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) geoclue? ( app-misc/geoclue:2.0 )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3f913deac8a5c98946065646d74aa5d7
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=210a08fff081e0d2664f28f19f5bc3a4
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtquick3d-6.5.2-r1
index 3b0365e1ed3b..452061818201 100644
--- a/metadata/md5-cache/dev-qt/qtquick3d-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.5.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtquicktimeline-6.5.2:6 ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= sys-libs/zlib:=
+DEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtquicktimeline-6.5.2:6 ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= sys-libs/zlib:= test? ( ~dev-qt/qtbase-6.5.2:6[network] )
 DESCRIPTION=Qt module and API for defining 3D content in Qt QuickTools
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,9 +8,9 @@ INHERIT=qt6-build
 IUSE=opengl vulkan test
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtquicktimeline-6.5.2:6 ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= sys-libs/zlib:=
+RDEPEND=~dev-qt/qtbase-6.5.2:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtquicktimeline-6.5.2:6 ~dev-qt/qtshadertools-6.5.2:6 media-libs/assimp:= sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=338d2dc576c7ef4f08f9a342ac7d808d
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a7f424ec41cecbcf0dc383f563ef5418
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.5.9999 b/metadata/md5-cache/dev-qt/qtquick3d-6.5.9999
index 97435d97e8c2..9dc76e483cbc 100644
--- a/metadata/md5-cache/dev-qt/qtquick3d-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.5.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.9999:6 ~dev-qt/qtquicktimeline-6.5.9999:6 ~dev-qt/qtshadertools-6.5.9999:6 media-libs/assimp:= sys-libs/zlib:=
+DEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.9999:6 ~dev-qt/qtquicktimeline-6.5.9999:6 ~dev-qt/qtshadertools-6.5.9999:6 media-libs/assimp:= sys-libs/zlib:= test? ( ~dev-qt/qtbase-6.5.9999:6[network] )
 DESCRIPTION=Qt module and API for defining 3D content in Qt QuickTools
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=opengl vulkan test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.9999:6 ~dev-qt/qtquicktimeline-6.5.9999:6 ~dev-qt/qtshadertools-6.5.9999:6 media-libs/assimp:= sys-libs/zlib:=
+RDEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.5.9999:6 ~dev-qt/qtquicktimeline-6.5.9999:6 ~dev-qt/qtshadertools-6.5.9999:6 media-libs/assimp:= sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=338d2dc576c7ef4f08f9a342ac7d808d
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a7f424ec41cecbcf0dc383f563ef5418
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.9999 b/metadata/md5-cache/dev-qt/qtquick3d-6.9999
index 57f9efa8956e..20fcf732f9f9 100644
--- a/metadata/md5-cache/dev-qt/qtquick3d-6.9999
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.9999:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtquicktimeline-6.9999:6 ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= sys-libs/zlib:=
+DEPEND=~dev-qt/qtbase-6.9999:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtquicktimeline-6.9999:6 ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= sys-libs/zlib:= test? ( ~dev-qt/qtbase-6.9999:6[network] )
 DESCRIPTION=Qt module and API for defining 3D content in Qt QuickTools
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=opengl vulkan test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.9999:6[concurrent,network,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtquicktimeline-6.9999:6 ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= sys-libs/zlib:=
+RDEPEND=~dev-qt/qtbase-6.9999:6[concurrent,gui,opengl=,vulkan=,widgets] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtquicktimeline-6.9999:6 ~dev-qt/qtshadertools-6.9999:6 media-libs/assimp:= sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=338d2dc576c7ef4f08f9a342ac7d808d
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a7f424ec41cecbcf0dc383f563ef5418
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2
index 1b872fbc940d..e192ea204d87 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6 ~dev-qt/qtdeclarative-6.5.2:6
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e368262fa5ab625118b788bbe9d39b52
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.9999 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.9999
index 892f7877a63a..e4e5532fb7a0 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6 ~dev-qt/qtdeclarative-6.5.9999:6
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e368262fa5ab625118b788bbe9d39b52
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.9999 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.9999
index d087881ade84..6e3619940ba5 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-6.9999
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6 ~dev-qt/qtdeclarative-6.9999:6
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e368262fa5ab625118b788bbe9d39b52
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.5.2 b/metadata/md5-cache/dev-qt/qtscxml-6.5.2-r1
index 888c6ceec7ea..832987bcb43d 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.5.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.2:6[gui,network,opengl,widgets] ~dev-qt/qtdeclarative-6.5.2:6
+DEPEND=~dev-qt/qtbase-6.5.2:6[gui] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 DESCRIPTION=State Chart XML (SCXML) support library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
-IUSE=test
+IUSE=qml test
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtbase-6.5.2:6[gui,network,opengl,widgets] ~dev-qt/qtdeclarative-6.5.2:6
+RDEPEND=~dev-qt/qtbase-6.5.2:6[gui] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4ca69600753f4345daf5915863a34b5a
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1541e61c05caa2a6c7131789f860fa49
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.5.9999 b/metadata/md5-cache/dev-qt/qtscxml-6.5.9999
index ded06e161f76..ae10f8f0186a 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.5.9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.9999:6[gui,network,opengl,widgets] ~dev-qt/qtdeclarative-6.5.9999:6
+DEPEND=~dev-qt/qtbase-6.5.9999:6[gui] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
 DESCRIPTION=State Chart XML (SCXML) support library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
-IUSE=test
+IUSE=qml test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui,network,opengl,widgets] ~dev-qt/qtdeclarative-6.5.9999:6
+RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4ca69600753f4345daf5915863a34b5a
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1541e61c05caa2a6c7131789f860fa49
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.9999 b/metadata/md5-cache/dev-qt/qtscxml-6.9999
index 4ec40e9178a4..9631963c30c4 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-6.9999
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.9999:6[gui,network,opengl,widgets] ~dev-qt/qtdeclarative-6.9999:6
+DEPEND=~dev-qt/qtbase-6.9999:6[gui] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 DESCRIPTION=State Chart XML (SCXML) support library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt6-build
-IUSE=test
+IUSE=qml test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.9999:6[gui,network,opengl,widgets] ~dev-qt/qtdeclarative-6.9999:6
+RDEPEND=~dev-qt/qtbase-6.9999:6[gui] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4ca69600753f4345daf5915863a34b5a
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1541e61c05caa2a6c7131789f860fa49
diff --git a/metadata/md5-cache/dev-qt/qtsensors-6.5.2 b/metadata/md5-cache/dev-qt/qtsensors-6.5.2
index 03fe5e384c4d..a2e53e016d6f 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtsensors-6.5.2
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[dbus] qml? ( ~dev-qt/qtdeclarative-6.5.2:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=43a1fabbed9a66b18f333b00f5ead6da
diff --git a/metadata/md5-cache/dev-qt/qtsensors-6.5.9999 b/metadata/md5-cache/dev-qt/qtsensors-6.5.9999
index 4d30e7734c46..a2774cb2a3f6 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtsensors-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[dbus] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=43a1fabbed9a66b18f333b00f5ead6da
diff --git a/metadata/md5-cache/dev-qt/qtsensors-6.9999 b/metadata/md5-cache/dev-qt/qtsensors-6.9999
index 8e63398325e2..b539c3b9b6a0 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-6.9999
+++ b/metadata/md5-cache/dev-qt/qtsensors-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[dbus] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=43a1fabbed9a66b18f333b00f5ead6da
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.5.2 b/metadata/md5-cache/dev-qt/qtserialport-6.5.2
index 9b48785dd250..2bbbdf3efa24 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.5.2
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.2:6[gui,widgets] virtual/libudev:=
+DEPEND=~dev-qt/qtbase-6.5.2:6 virtual/libudev:=
 DESCRIPTION=Serial port abstraction library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,9 +8,9 @@ INHERIT=qt6-build
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtbase-6.5.2:6[gui,widgets] virtual/libudev:=
+RDEPEND=~dev-qt/qtbase-6.5.2:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6b2d43ec7a102247afbe54d020593273
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4d9520c4bacf762d8b7b7991110e9040
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.5.9999 b/metadata/md5-cache/dev-qt/qtserialport-6.5.9999
index b34f4b037abf..37add716e58d 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.5.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.5.9999:6[gui,widgets] virtual/libudev:=
+DEPEND=~dev-qt/qtbase-6.5.9999:6 virtual/libudev:=
 DESCRIPTION=Serial port abstraction library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui,widgets] virtual/libudev:=
+RDEPEND=~dev-qt/qtbase-6.5.9999:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6b2d43ec7a102247afbe54d020593273
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4d9520c4bacf762d8b7b7991110e9040
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.9999 b/metadata/md5-cache/dev-qt/qtserialport-6.9999
index fa5b6b720196..f8d9c0a4ec43 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-6.9999
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-qt/qtbase-6.9999:6[gui,widgets] virtual/libudev:=
+DEPEND=~dev-qt/qtbase-6.9999:6 virtual/libudev:=
 DESCRIPTION=Serial port abstraction library for the Qt6 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
@@ -8,8 +8,8 @@ INHERIT=qt6-build
 IUSE=test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
-RDEPEND=~dev-qt/qtbase-6.9999:6[gui,widgets] virtual/libudev:=
+RDEPEND=~dev-qt/qtbase-6.9999:6 virtual/libudev:=
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6b2d43ec7a102247afbe54d020593273
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4d9520c4bacf762d8b7b7991110e9040
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.5.2 b/metadata/md5-cache/dev-qt/qtshadertools-6.5.2
index 6ed3cf96485a..7c8884e3f79c 100644
--- a/metadata/md5-cache/dev-qt/qtshadertools-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.5.2
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[gui]
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=496f3bdf47c9a555981342721473bed2
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.5.9999 b/metadata/md5-cache/dev-qt/qtshadertools-6.5.9999
index ddd52258ec5b..d8c1f786c38f 100644
--- a/metadata/md5-cache/dev-qt/qtshadertools-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui]
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=496f3bdf47c9a555981342721473bed2
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.9999 b/metadata/md5-cache/dev-qt/qtshadertools-6.9999
index 26f30395109c..7c1653e7c769 100644
--- a/metadata/md5-cache/dev-qt/qtshadertools-6.9999
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui]
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=496f3bdf47c9a555981342721473bed2
diff --git a/metadata/md5-cache/dev-qt/qtspeech-6.5.2 b/metadata/md5-cache/dev-qt/qtspeech-6.5.2
index bb582b0bb961..1803667988b0 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtspeech-6.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( flite speechd )
 RESTRICT=test !test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=954b554123cf1ec6c4956787eca66cd9
diff --git a/metadata/md5-cache/dev-qt/qtspeech-6.5.9999 b/metadata/md5-cache/dev-qt/qtspeech-6.5.9999
index 429ae55af3f6..50e67b7e3b17 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtspeech-6.5.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.9999:6 ~dev-qt/qtdeclarative-6.5.9999:6 flite? ( app-
 REQUIRED_USE=|| ( flite speechd )
 RESTRICT=test !test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=954b554123cf1ec6c4956787eca66cd9
diff --git a/metadata/md5-cache/dev-qt/qtspeech-6.9999 b/metadata/md5-cache/dev-qt/qtspeech-6.9999
index 4ea3137b9479..3eb9b1ed16c4 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-6.9999
+++ b/metadata/md5-cache/dev-qt/qtspeech-6.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.9999:6 ~dev-qt/qtdeclarative-6.9999:6 flite? ( app-acce
 REQUIRED_USE=|| ( flite speechd )
 RESTRICT=test !test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=954b554123cf1ec6c4956787eca66cd9
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.5.2 b/metadata/md5-cache/dev-qt/qtsvg-6.5.2
index 60fc34be708e..3a56303c706a 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.5.2
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3036c837f5d24dbe40d2e008fb0a3b79
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.5.9999 b/metadata/md5-cache/dev-qt/qtsvg-6.5.9999
index 9ca680474130..72a54aa6cc67 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3036c837f5d24dbe40d2e008fb0a3b79
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.9999 b/metadata/md5-cache/dev-qt/qtsvg-6.9999
index de52f875c007..7df9c610f9fe 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-6.9999
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui,widgets] sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3036c837f5d24dbe40d2e008fb0a3b79
diff --git a/metadata/md5-cache/dev-qt/qttools-6.5.2-r1 b/metadata/md5-cache/dev-qt/qttools-6.5.2-r1
index 14a22bf2daf1..5b57de33916b 100644
--- a/metadata/md5-cache/dev-qt/qttools-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qttools-6.5.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=assistant? ( widgets ) designer? ( qml widgets ) distancefieldgener
 RESTRICT=test !test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e1042829510bca2bd90948934b7d369f
diff --git a/metadata/md5-cache/dev-qt/qttools-6.5.9999 b/metadata/md5-cache/dev-qt/qttools-6.5.9999
index 9a3ae292028c..ab89b39986fe 100644
--- a/metadata/md5-cache/dev-qt/qttools-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qttools-6.5.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.9999:6[network,widgets?] assistant? ( ~dev-qt/qtbase-
 REQUIRED_USE=assistant? ( widgets ) designer? ( qml widgets ) distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang )
 RESTRICT=test !test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e1042829510bca2bd90948934b7d369f
diff --git a/metadata/md5-cache/dev-qt/qttools-6.9999 b/metadata/md5-cache/dev-qt/qttools-6.9999
index c043d4a2db94..f0d1dbc6c090 100644
--- a/metadata/md5-cache/dev-qt/qttools-6.9999
+++ b/metadata/md5-cache/dev-qt/qttools-6.9999
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.9999:6[network,widgets?] assistant? ( ~dev-qt/qtbase-6.
 REQUIRED_USE=assistant? ( widgets ) designer? ( qml widgets ) distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang )
 RESTRICT=test !test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e1042829510bca2bd90948934b7d369f
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.5.2 b/metadata/md5-cache/dev-qt/qttranslations-6.5.2
index 73d34c5f4885..11b86d71d90c 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-6.5.2
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.5.2
@@ -9,5 +9,5 @@ KEYWORDS=~amd64
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bc61398b89554a600005d1ca1fb32ddb
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.5.9999 b/metadata/md5-cache/dev-qt/qttranslations-6.5.9999
index a33651878049..8d94fa06212e 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.5.9999
@@ -8,5 +8,5 @@ INHERIT=qt6-build
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bc61398b89554a600005d1ca1fb32ddb
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.9999 b/metadata/md5-cache/dev-qt/qttranslations-6.9999
index 7a0ba2c71ef6..d7355e8fafd7 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-6.9999
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.9999
@@ -8,5 +8,5 @@ INHERIT=qt6-build
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bc61398b89554a600005d1ca1fb32ddb
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.2 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.2
index 17749506ec22..2c093c709786 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.2
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[gui] ~dev-qt/qtdeclarative-6.5.2:6 ~dev-qt/qtsvg-
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2e0674f24b32e925078055f974d870ff
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.9999 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.9999
index c304db0ac0f8..931a5c611418 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[gui] ~dev-qt/qtdeclarative-6.5.9999:6 ~dev-qt/qtsvg-6.5.9999:6 spell? ( app-text/hunspell:= )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2e0674f24b32e925078055f974d870ff
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.9999 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.9999
index afabbb3a5047..a968ae42f3bd 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.9999
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[gui] ~dev-qt/qtdeclarative-6.9999:6 ~dev-qt/qtsvg-6.9999:6 spell? ( app-text/hunspell:= )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2e0674f24b32e925078055f974d870ff
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.5.2-r3 b/metadata/md5-cache/dev-qt/qtwayland-6.5.2-r3
index ecec295298a3..0ddeefa1bd49 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-6.5.2-r3
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.5.2-r3
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/wayland ~dev-qt/qtbase-6.5.2:6[egl(+),gui,opengl,vulkan=] media
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0fa6636afc46ca09e85fd2e7c2b8963b
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.5.9999 b/metadata/md5-cache/dev-qt/qtwayland-6.5.9999
index dfc557fd8f57..985143c2a760 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/wayland ~dev-qt/qtbase-6.5.9999:6[gui,opengl,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 ) )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab754bae41dd8fc9eebd3dafe851ad5b
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.9999 b/metadata/md5-cache/dev-qt/qtwayland-6.9999
index 823b9ae06fa1..7b84f5fa341c 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/wayland ~dev-qt/qtbase-6.9999:6[gui,opengl,vulkan=] media-libs/libglvnd x11-libs/libxkbcommon compositor? ( qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab754bae41dd8fc9eebd3dafe851ad5b
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2-r2
index 27465b3136db..bbd362cc8df9 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2-r2
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[concurrent] qml? ( ~dev-qt/qtdeclarative-6.5.2:6
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=94be22fd5fbf336de13907444309d6a9
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b162f72892fb6f6d6269cdbf8ca65b78
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.5.9999 b/metadata/md5-cache/dev-qt/qtwebchannel-6.5.9999
index 8ba7d2b89ad7..492203e2472e 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[concurrent] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=94be22fd5fbf336de13907444309d6a9
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b162f72892fb6f6d6269cdbf8ca65b78
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.9999 b/metadata/md5-cache/dev-qt/qtwebchannel-6.9999
index 1019848341ad..2c2897db439f 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[concurrent] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=94be22fd5fbf336de13907444309d6a9
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b162f72892fb6f6d6269cdbf8ca65b78
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.5.2 b/metadata/md5-cache/dev-qt/qtwebengine-6.5.2
index bd7dde028e15..d241513f9eb7 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.5.2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=619efc969153c5eae99c70e59f160f7a
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtwebengine-6.5.2-r1
index 18f202f8b2bc..6e192e5d4c64 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.5.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( qml widgets )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz https://dev.gentoo.org/~ionen/distfiles/qtwebengine-6.5-patchset-1.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c4fc69866a69716c340503c4696b092d
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.5.9999 b/metadata/md5-cache/dev-qt/qtwebengine-6.5.9999
index f7ddc9695384..9359b2efc83b 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.5.9999
@@ -1,11 +1,11 @@
 BDEPEND=|| ( ( dev-lang/python:3.11[xml(+)] dev-python/html5lib[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[xml(+)] dev-python/html5lib[python_targets_python3_10(-)] ) ) dev-util/gperf net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr dev-libs/nss ~dev-qt/qtbase-6.5.9999:6[gui,opengl=,vulkan?,widgets?] ~dev-qt/qtwebchannel-6.5.9999:6[qml?] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/qttools-6.5.9999:6[designer] ) geolocation? ( ~dev-qt/qtpositioning-6.5.9999:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 ) screencast? ( dev-libs/glib:2 media-libs/mesa[gbm(+)] media-video/pipewire:= x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-6.5.9999:6[widgets] ) media-libs/libglvnd x11-base/xorg-proto x11-libs/libxshmfence screencast? ( media-libs/libepoxy[egl(+)] ) pdf? ( net-print/cups ) test? ( widgets? ( app-text/poppler[cxx(+)] ) )
+DEPEND=app-arch/snappy:= dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr dev-libs/nss ~dev-qt/qtbase-6.5.9999:6[gui,opengl=,vulkan?,widgets?] ~dev-qt/qtwebchannel-6.5.9999:6[qml?] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/qttools-6.5.9999:6[designer] ) geolocation? ( ~dev-qt/qtpositioning-6.5.9999:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 ) screencast? ( dev-libs/glib:2 media-libs/mesa[gbm(+)] media-video/pipewire:= x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-6.5.9999:6[widgets] ) media-libs/libglvnd x11-base/xorg-proto x11-libs/libxshmfence screencast? ( media-libs/libepoxy[egl(+)] ) pdfium? ( net-print/cups ) test? ( widgets? ( app-text/poppler[cxx(+)] ) )
 DESCRIPTION=Library for rendering dynamic web content in Qt6 C++ and QML applications
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=check-reqs flag-o-matic multiprocessing optfeature prefix python-any-r1 qt6-build toolchain-funcs
-IUSE=+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets test
+IUSE=+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
 RDEPEND=app-arch/snappy:= dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr dev-libs/nss ~dev-qt/qtbase-6.5.9999:6[gui,opengl=,vulkan?,widgets?] ~dev-qt/qtwebchannel-6.5.9999:6[qml?] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/qttools-6.5.9999:6[designer] ) geolocation? ( ~dev-qt/qtpositioning-6.5.9999:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 ) screencast? ( dev-libs/glib:2 media-libs/mesa[gbm(+)] media-video/pipewire:= x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-6.5.9999:6[widgets] )
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( qml widgets )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://dev.gentoo.org/~ionen/distfiles/qtwebengine-6.5-patchset-1.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4c5e8920bbcb6f43c4215752147651f4
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9f9f1baba11ee935e72f02bc109d46e0
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.9999 b/metadata/md5-cache/dev-qt/qtwebengine-6.9999
index ea7c54002d33..5653cc550a5e 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.9999
@@ -1,11 +1,11 @@
 BDEPEND=|| ( ( dev-lang/python:3.11[xml(+)] dev-python/html5lib[python_targets_python3_11(-)] ) ( dev-lang/python:3.10[xml(+)] dev-python/html5lib[python_targets_python3_10(-)] ) ) dev-util/gperf net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr dev-libs/nss ~dev-qt/qtbase-6.9999:6[gui,opengl=,vulkan?,widgets?] ~dev-qt/qtwebchannel-6.9999:6[qml?] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/qttools-6.9999:6[designer] ) geolocation? ( ~dev-qt/qtpositioning-6.9999:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) screencast? ( dev-libs/glib:2 media-libs/mesa[gbm(+)] media-video/pipewire:= x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-6.9999:6[widgets] ) media-libs/libglvnd x11-base/xorg-proto x11-libs/libxshmfence screencast? ( media-libs/libepoxy[egl(+)] ) pdf? ( net-print/cups ) test? ( widgets? ( app-text/poppler[cxx(+)] ) )
+DEPEND=app-arch/snappy:= dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr dev-libs/nss ~dev-qt/qtbase-6.9999:6[gui,opengl=,vulkan?,widgets?] ~dev-qt/qtwebchannel-6.9999:6[qml?] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/qttools-6.9999:6[designer] ) geolocation? ( ~dev-qt/qtpositioning-6.9999:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) screencast? ( dev-libs/glib:2 media-libs/mesa[gbm(+)] media-video/pipewire:= x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-6.9999:6[widgets] ) media-libs/libglvnd x11-base/xorg-proto x11-libs/libxshmfence screencast? ( media-libs/libepoxy[egl(+)] ) pdfium? ( net-print/cups ) test? ( widgets? ( app-text/poppler[cxx(+)] ) )
 DESCRIPTION=Library for rendering dynamic web content in Qt6 C++ and QML applications
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=check-reqs flag-o-matic multiprocessing optfeature prefix python-any-r1 qt6-build toolchain-funcs
-IUSE=+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets test
+IUSE=+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets test
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PROPERTIES=live
 RDEPEND=app-arch/snappy:= dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr dev-libs/nss ~dev-qt/qtbase-6.9999:6[gui,opengl=,vulkan?,widgets?] ~dev-qt/qtwebchannel-6.9999:6[qml?] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib:=[minizip] virtual/libudev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon x11-libs/libxkbfile alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/qttools-6.9999:6[designer] ) geolocation? ( ~dev-qt/qtpositioning-6.9999:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( ~dev-qt/qtdeclarative-6.9999:6 ) screencast? ( dev-libs/glib:2 media-libs/mesa[gbm(+)] media-video/pipewire:= x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-6.9999:6[widgets] )
@@ -13,5 +13,5 @@ REQUIRED_USE=designer? ( qml widgets )
 RESTRICT=!test? ( test )
 SLOT=6/6
 SRC_URI=https://dev.gentoo.org/~ionen/distfiles/qtwebengine-6.5-patchset-1.tar.xz
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=eeb79b79d44358cd15b19ea7f643d9d9
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6ad1a1f6c177bbb35259d89c0da4d6ab
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2-r1 b/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2-r1
index ffac1b5cdc1f..65a69105663a 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2-r1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2-r1
@@ -12,5 +12,5 @@ RDEPEND=~dev-qt/qtbase-6.5.2:6[network,ssl] qml? ( ~dev-qt/qtdeclarative-6.5.2:6
 RESTRICT=!test? ( test )
 SLOT=6/6.5
 SRC_URI=https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=31cbc2937c40b87d374587fcea47e4f9
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.5.9999 b/metadata/md5-cache/dev-qt/qtwebsockets-6.5.9999
index 66327ad08ad7..6c441378ec29 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-6.5.9999
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.5.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.5.9999:6[network,ssl] qml? ( ~dev-qt/qtdeclarative-6.5.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6.5
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=31cbc2937c40b87d374587fcea47e4f9
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.9999 b/metadata/md5-cache/dev-qt/qtwebsockets-6.9999
index 8046d3e02c33..58f20c320330 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-6.9999
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=~dev-qt/qtbase-6.9999:6[network,ssl] qml? ( ~dev-qt/qtdeclarative-6.9999:6 )
 RESTRICT=!test? ( test )
 SLOT=6/6
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	6a0e11efcda96a9f39d9d9492c1cfcae	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	492e69eb14764d9acd84ddae4d2172bc	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=31cbc2937c40b87d374587fcea47e4f9
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1d9841ebc795..0bc4db8ac1cc 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/shflags-1.3.0 b/metadata/md5-cache/dev-util/shflags-1.3.0
new file mode 100644
index 000000000000..9d1cec584f1f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/shflags-1.3.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install test
+DESCRIPTION=Command-line flags module for Unix shell scripts
+EAPI=8
+HOMEPAGE=https://github.com/kward/shflags
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/kward/shflags/archive/v1.3.0.tar.gz -> shflags-1.3.0.tgz
+_md5_=6c6c599be64ef16dc3a952253f13caf2
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index eb2a902446a2..10e4e5952812 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.15 b/metadata/md5-cache/games-emulation/ppsspp-1.16
index 05d77c80d698..ed24894025cf 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.15
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.16
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 DESCRIPTION=A PSP emulator written in C++
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.ppsspp.org/ https://github.com/hrydgard/ppsspp/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=python-any-r1 xdg cmake
 IUSE=discord qt5
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 JSON MIT
 RDEPEND=app-arch/snappy:= app-arch/zstd:= dev-libs/libzip:= media-libs/glew:= media-libs/libpng:= media-libs/libsdl2[joystick] media-video/ffmpeg:0/56.58.58 sys-libs/zlib:= virtual/opengl qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) !qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/hrydgard/ppsspp/releases/download/v1.15/ppsspp-1.15.tar.xz
+SRC_URI=https://github.com/hrydgard/ppsspp/releases/download/v1.16/ppsspp-1.16.tar.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a72a7500b76eac0b1aa7f0ef17292443
+_md5_=2f6cd63d51ac3b8051f64e36e9016ff9
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 3d9a77e676d6..3df99d15a1a8 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/zxing-cpp-2.1.0 b/metadata/md5-cache/media-libs/zxing-cpp-2.1.0
index 541ab4c30e88..be780c5a4adf 100644
--- a/metadata/md5-cache/media-libs/zxing-cpp-2.1.0
+++ b/metadata/md5-cache/media-libs/zxing-cpp-2.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=C++ Multi-format 1D/2D barcode image processing library
 EAPI=8
 HOMEPAGE=https://github.com/nu-book/zxing-cpp
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0/3
 SRC_URI=https://github.com/nu-book/zxing-cpp/archive/v2.1.0.tar.gz -> zxing-cpp-2.1.0.tar.gz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0f42bbe2c054dc17ed211d6ef1b9183f
+_md5_=45a815641c67b6a0d31c02c448ff3bd0
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index cd0f5a4768c3..05a25dff488d 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/gajim-1.8.1 b/metadata/md5-cache/net-im/gajim-1.8.1
index 8bbf2a2b17df..c676ec5e4f6f 100644
--- a/metadata/md5-cache/net-im/gajim-1.8.1
+++ b/metadata/md5-cache/net-im/gajim-1.8.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gajim.org/
 INHERIT=distutils-r1 xdg-utils
 IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4[introspection] python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] >=dev-python/nbxmpp-4.2.2[python_targets_python3_10(-)] <dev-python/nbxmpp-5.0.0[python_targets_python3_10(-)] dev-python/precis-i18n[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycurl[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_10(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_10(-)] dev-python/css-parser[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_10(-)] dev-python/jaraco-classes[python_targets_python3_10(-)] dev-python/python-axolotl[python_targets_python3_10(-)] dev-python/qrcode[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] dev-python/omemo-dr[python_targets_python3_10(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_10(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_10(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_10(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_11? ( dev-python/idna[python_targets_python3_11(-)] >=dev-python/nbxmpp-4.2.2[python_targets_python3_11(-)] <dev-python/nbxmpp-5.0.0[python_targets_python3_11(-)] dev-python/precis-i18n[python_targets_python3_11(-)] dev-python/pyasn1[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pycurl[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_11(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_11(-)] dev-python/css-parser[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_11(-)] dev-python/jaraco-classes[python_targets_python3_11(-)] dev-python/python-axolotl[python_targets_python3_11(-)] dev-python/qrcode[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] dev-python/omemo-dr[python_targets_python3_11(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_11(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_11(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_11(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_11(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,xml(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.8/gajim-1.8.1.tar.gz
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=53e510f89a5182e0f08969117b642815
+_md5_=05979532fef74be40d3958d64d54aceb
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 41ce5b271fd5..987ad888e7e4 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/neard-0.18 b/metadata/md5-cache/net-wireless/neard-0.19
index dfdb4d36c6dd..e51250529d3f 100644
--- a/metadata/md5-cache/net-wireless/neard-0.18
+++ b/metadata/md5-cache/net-wireless/neard-0.19
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28 dev-libs/libnl:3= >=sys-apps/dbus-1.2 systemd? ( sys-apps/systemd:0 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/linux-nfc/neard/archive/refs/tags/v0.18.tar.gz -> neard-0.18.tar.gz
+SRC_URI=https://github.com/linux-nfc/neard/archive/refs/tags/v0.19.tar.gz -> neard-0.19.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=1821acf06599f953cd6870c3506bbf20
+_md5_=10ee3b600d811c15f54829bb195e1fbd
diff --git a/metadata/md5-cache/net-wireless/unifi-7.5.174 b/metadata/md5-cache/net-wireless/unifi-7.5.174-r1
index 7753a45975c9..37701e8b0b66 100644
--- a/metadata/md5-cache/net-wireless/unifi-7.5.174
+++ b/metadata/md5-cache/net-wireless/unifi-7.5.174-r1
@@ -8,9 +8,9 @@ INHERIT=java-pkg-2 readme.gentoo-r1 systemd
 IUSE=systemd system-mongodb
 KEYWORDS=-* ~amd64 ~arm64
 LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:11 >=dev-java/java-config-2.2.0-r3
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:17 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0/7.5
 SRC_URI=https://dl.ui.com/unifi/7.5.174/UniFi.unix.zip -> unifi-7.5.174.zip
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ac7bf5b7cac1c0558630b72c3b32de59
+_md5_=34009652690907edc4522748bb39ff18
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 9017692d3d8a..e5cc0ecb1a29 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/cadabra-2.4.4.1 b/metadata/md5-cache/sci-mathematics/cadabra-2.4.4.1
new file mode 100644
index 000000000000..e75839e8ff51
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/cadabra-2.4.4.1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) gui? ( dev-cpp/gtkmm:3.0 )
+DESCRIPTION=Field-theory motivated approach to computer algebra
+EAPI=8
+HOMEPAGE=https://cadabra.science/ https://github.com/kpeeters/cadabra2/
+INHERIT=xdg-utils python-single-r1 cmake
+IUSE=gui +jupyter test python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) gui? ( dev-cpp/gtkmm:3.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/kpeeters/cadabra2/archive/2.4.4.1.tar.gz -> cadabra-2.4.4.1.tar.gz
+_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b7260ae13de1fdf5f756f6d36c7ab6e3
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2 b/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
deleted file mode 100644
index d46a737e23b2..000000000000
--- a/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,postscript(+),zlib(+)] virtual/latex-base dev-tex/hevea dev-texlive/texlive-latexrecommended dev-texlive/texlive-pictures dev-texlive/texlive-mathscience dev-texlive/texlive-latexextra )
-DESCRIPTION=Proof assistant written in O'Caml
-EAPI=7
-HOMEPAGE=http://coq.inria.fr/
-INHERIT=desktop multilib
-IUSE=gtk debug +ocamlopt doc
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] )
-RESTRICT=test
-SLOT=0/8.12.0
-SRC_URI=https://github.com/coq/coq/archive/V8.12.0.tar.gz -> coq-8.12.0.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e06770f956eeaac8c783e903b9941939
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.17.0 b/metadata/md5-cache/sci-mathematics/coq-8.18.0
index 6e7ce27d3fcb..98a02ba3826d 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.17.0
+++ b/metadata/md5-cache/sci-mathematics/coq-8.18.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://coq.inria.fr/ https://github.com/coq/coq/
 INHERIT=desktop dune edo
 IUSE=debug doc gui +ocamlopt test
-KEYWORDS=amd64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/zarith:= || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gui? ( >=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?] >=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
-SLOT=0/8.17.0
-SRC_URI=https://github.com/coq/coq/archive/V8.17.0.tar.gz -> coq-8.17.0.tar.gz
+SLOT=0/8.18.0
+SRC_URI=https://github.com/coq/coq/archive/V8.18.0.tar.gz -> coq-8.18.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=d504c96ddcde31e697bf46c78bade014
+_md5_=6a7ff97e8e02494b1b14d1b93b161bc4
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4f626ba13550..c755856300c4 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-254.3 b/metadata/md5-cache/sys-apps/systemd-utils-254.3
new file mode 100644
index 000000000000..a2c86a720798
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-utils-254.3
@@ -0,0 +1,18 @@
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig python_single_target_python3_10? ( dev-python/jinja[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] boot? ( >=dev-python/pyelftools-0.30[python_targets_python3_10(-)] test? ( dev-python/pefile[python_targets_python3_10(-)] ) ) ) python_single_target_python3_11? ( dev-python/jinja[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] boot? ( >=dev-python/pyelftools-0.30[python_targets_python3_11(-)] test? ( dev-python/pefile[python_targets_python3_11(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array secureboot? ( app-crypt/sbsigntools ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11
+DESCRIPTION=Utilities split out from systemd for OpenRC users
+EAPI=8
+HOMEPAGE=https://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1 secureboot toolchain-funcs udev usr-ldscript
+IUSE=+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11 secureboot split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
+RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/pefile[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pefile[python_targets_python3_11(-)] ) ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/floppy acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/usb acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
+REQUIRED_USE=|| ( boot tmpfiles sysusers udev ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v254.3.tar.gz -> systemd-stable-254.3.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-254.3.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	secureboot	4911adb593665638c76fbd4e70d451ac	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9
+_md5_=3a0d90f34331d5b091a2602dd480088a
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 4f5b07319dc5..aa50c1cafaca 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.29.1 b/metadata/md5-cache/www-servers/nginx-unit-1.29.1
index 490ce497e7f3..edf7f3fa9d39 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.29.1
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.29.1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
-DEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
+DEPEND=perl? ( dev-lang/perl:= ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
 DESCRIPTION=Dynamic web and application server
 EAPI=8
 HOMEPAGE=https://unit.nginx.org
 INHERIT=flag-o-matic python-single-r1 systemd toolchain-funcs
-IUSE=perl python ruby php7-4 php8-0 php8-1 ssl python_single_target_python3_10 python_single_target_python3_11
+IUSE=perl python ruby php8-1 ssl python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64
 LICENSE=Apache-2.0
-RDEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0= acct-user/nginx-unit acct-group/nginx-unit
-REQUIRED_USE=|| ( perl python ruby php7-4 php8-0 php8-1 ssl ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RDEPEND=perl? ( dev-lang/perl:= ) php8-1? ( dev-lang/php:8.1[embed] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0= acct-user/nginx-unit acct-group/nginx-unit
+REQUIRED_USE=|| ( perl python ruby php8-1 ssl ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.29.1.tar.gz -> nginx-unit-1.29.1.tar.gz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ca84dc076dcf8f806a00c9467f091420
+_md5_=2d010d02c9beae5b876103d27a05a617
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.31.0 b/metadata/md5-cache/www-servers/nginx-unit-1.31.0
index effe3449838c..21a7e54097de 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.31.0
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.31.0
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare setup
-DEPEND=perl? ( dev-lang/perl:= ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) php8-2? ( dev-lang/php:8.2[embed] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
+DEPEND=perl? ( dev-lang/perl:= ) php8-1? ( dev-lang/php:8.1[embed] ) php8-2? ( dev-lang/php:8.2[embed] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
 DESCRIPTION=Dynamic web and application server
 EAPI=8
 HOMEPAGE=https://unit.nginx.org
 INHERIT=flag-o-matic python-single-r1 systemd toolchain-funcs
-IUSE=perl python ruby php8-0 php8-1 php8-2 perl ssl python_single_target_python3_10 python_single_target_python3_11
+IUSE=perl python ruby php8-1 php8-2 perl ssl python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=perl? ( dev-lang/perl:= ) php8-0? ( dev-lang/php:8.0[embed] ) php8-1? ( dev-lang/php:8.1[embed] ) php8-2? ( dev-lang/php:8.2[embed] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0= acct-user/nginx-unit acct-group/nginx-unit
-REQUIRED_USE=|| ( perl python ruby php8-0 php8-1 php8-2 perl ssl ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+RDEPEND=perl? ( dev-lang/perl:= ) php8-1? ( dev-lang/php:8.1[embed] ) php8-2? ( dev-lang/php:8.2[embed] ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0= acct-user/nginx-unit acct-group/nginx-unit
+REQUIRED_USE=|| ( perl python ruby php8-1 php8-2 perl ssl ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.31.0.tar.gz -> nginx-unit-1.31.0.tar.gz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=c4697c24eb2cb0386e01fc23df2cc5eb
+_md5_=4f7aae492792bfb23386203c3d88d405
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 2f75cf1b161d..8e076bda41a3 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.104.05 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.104.05
index 3fcf642972cb..57fc80217db3 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.104.05
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.104.05
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/m4 virtual/pkgconfig modules? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) ) virtual/pkgconfig
 DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=acct-group/video sys-libs/glibc >=dev-libs/openssl-1.1:= X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) modules? ( virtual/linux-sources )
+DEPEND=acct-group/video sys-libs/glibc dev-libs/openssl:0/3 X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) modules? ( virtual/linux-sources )
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
@@ -9,9 +9,9 @@ INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd tool
 IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-sign +strip +modules
 KEYWORDS=-* amd64 ~arm64
 LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video sys-libs/glibc >=dev-libs/openssl-1.1:= X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=acct-group/video sys-libs/glibc dev-libs/openssl:0/3 X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/535
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/535.104.05/NVIDIA-Linux-x86_64-535.104.05.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/535.104.05/NVIDIA-Linux-aarch64-535.104.05.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-535.104.05.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bae19435bb76990faae9a783cac19137
+_md5_=642fa1d53eec24b2f82ba6db3aa8c9b6
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.09 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.09
index 3f2994765099..23dc1ec094e8 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.09
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.43.09
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/m4 virtual/pkgconfig modules? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) ) virtual/pkgconfig
 DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=acct-group/video sys-libs/glibc >=dev-libs/openssl-1.1:= X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) modules? ( virtual/linux-sources )
+DEPEND=acct-group/video sys-libs/glibc dev-libs/openssl:0/3 X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) modules? ( virtual/linux-sources )
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=8
 HOMEPAGE=https://developer.nvidia.com/vulkan-driver
@@ -9,9 +9,9 @@ INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd tool
 IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-sign +strip +modules
 KEYWORDS=-* ~amd64
 LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video sys-libs/glibc >=dev-libs/openssl-1.1:= X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=acct-group/video sys-libs/glibc dev-libs/openssl:0/3 X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=kernel-open? ( modules )
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/downloads/vulkan-beta-5354309-linux -> NVIDIA-Linux-x86_64-535.43.09.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.104.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.104.05.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/535.43.09.tar.gz -> open-gpu-kernel-modules-535.43.09.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=ea552c064bb07b9542d69724b71811d1
+_md5_=7248e1ea1f87f67721bfd176f3b7fb11
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.98 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.98
deleted file mode 100644
index ab5c0af22fde..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.98
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/m4 virtual/pkgconfig modules? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) ) virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=acct-group/video sys-libs/glibc >=dev-libs/openssl-1.1:= X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) modules? ( virtual/linux-sources )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=8
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-IDEPEND=modules? ( sys-apps/kmod[tools] )
-INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland dist-kernel modules-sign +strip +modules
-KEYWORDS=-* amd64 ~arm64
-LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video sys-libs/glibc >=dev-libs/openssl-1.1:= X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-REQUIRED_USE=kernel-open? ( modules )
-SLOT=0/535
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/535.98/NVIDIA-Linux-x86_64-535.98.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/535.98/NVIDIA-Linux-aarch64-535.98.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-535.98.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-535.98.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-535.98.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-535.98.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-535.98.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-535.98.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=bae19435bb76990faae9a783cac19137
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e32a1b717619..2725e2500614 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-09-09T15:09:45Z
+TIMESTAMP 2023-09-09T21:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmT8irlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmT83xpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD/2Q/8C5VUM/OU8+DlbP9P7hvTmyTGA0LfqkOn+iKEnlgwZ/Hvk1Sl4V5d3lTi
-CF3NJ3BBPzkr5gga3ub26ItZt/7r+kWN0GyP027MR7b8noRW5QrZtl7n/6Ax2Qtx
-eK75uxfxafNfqQQzeRaBBWzqA9salWEEcLomGb5MuTGemy/yK7BLUbwUk4OFDlgE
-31DdJuKuOz4GuQ6NwloAHMPT/TwwechOJ3AdI/3edhv8DXCYOJjV4W+xH8F5/ohz
-47TsRucNl4RymFSIqhUeM/YnbOKeSUB5wHFORMgu+ug6GRTDJjQ+y9OLD8AX7M5S
-poYWqtErv5NyjyMYwICyU+2iNWqILfMcYNUCLrjBHuA1XxjCfSd9A9UL1cQJk9xj
-+07MfOGSHTLLQT9YSCqDNKrq1vmXsfJ94sfB9xZjRSKBZVMLWyqcYxUqdPoPi04I
-1OfeEHk2iFJKVk3FQAOSwbC/Y6sjaIeW/zdazI2ZC9dOnrzyNtZDEuBAKZhwO5v0
-j8eQYc+ay9UcTmaSD/Y+Kc/75ZD7LbCi8APV6F3i0hLspkVbr7lRVwmgKNlUiAuO
-r7FtGLj409uIL3ZaWmoErqPmWDJFX4/8tSmlWLa+3xvTclIV67WXin9NqXBfRIL0
-CUpMNFngBfXacgdrvSNuDsDjHnQB/AQ2yhjkbgfzXAXR0+ltSjo=
-=D8HQ
+klC4PhAAk4I3dtCu/YjWJPlBH61L9w4uSXqJ7MRHd/35H2H685bW0U+H+BKrc+tj
+dq2DD3zenoswMmC+Q8tCvVIeAl2Z9d3yUeQML2gCbCTUL7/pnd3xaRJb5UsKR1mQ
+9fmphk70g4XFqMhAfIx5x8yTspb0bL6OEDLBgtlB3qDYvJce0lRGFdr07/u2V/S1
+uqNvhby0GhIKdTOsz+si3LpsbHsaZwRX7FRPE2Yw5FnUxKVsOPA4WM6K96AcHzyx
+TULoS92d+0JspWXf4Zbs6FY0pm/ZAqYsCIJizjr18p0qx0gQN8xNTvR8TTyOXvI/
+11nPxkr5aefiJzAfhXlyjR9wco/k8Lot8S8PT0+D/EM9t0sAYC8Addktndx+OA3N
+UdLvFWK6vr+l+qmEc4rZUNh8AVTrzR440F0EsIZ0GXVCOiSBjiMr0bduAkt8FjqS
+vdN9FkMfouFHWyZzXYKWFZeCvu9riwUms9jP2Un809+fQMQjO07mbWsSVkPapVze
++ASYaK3fghm+akVeWVvSC2YotXclB7AYawmggxF4cEEbXv0FB5/yfS7VJjtmOT5q
+Mvy2+7XwyCOG4JrgS3FyNO9H4Tur2xfTOqmh7vCPw3IueKZEfFK69WlaGnmN+zx2
+reM8F7EOG3tEareljQvPp2naZOD8Ur7buHpfCTGU4RWJnkOv9BM=
+=PqNG
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8c3cc7830729..0e65fa3c731d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Sep 2023 15:09:42 +0000
+Sat, 09 Sep 2023 21:09:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 423c072a86b7..7e0dc3a0ef24 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Sep  9 03:09:42 PM UTC 2023
+Sat Sep  9 09:09:44 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 93770c198c1d..777260d8ee0b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Sep 2023 15:15:01 +0000
+Sat, 09 Sep 2023 21:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 60ce18fd498e..92592a66e204 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1cede461dfedc004e076758bd92e1c7830d57238 1694269411 2023-09-09T14:23:31+00:00
+b07884ce9cc6d89cb4dbd05e3be5060f121b3e66 1694293425 2023-09-09T21:03:45+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9c9cc889e0b4..6ed19e222251 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1694272201 Sat 09 Sep 2023 03:10:01 PM UTC
+1694293801 Sat 09 Sep 2023 09:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8c3cc7830729..0e65fa3c731d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Sep 2023 15:09:42 +0000
+Sat, 09 Sep 2023 21:09:44 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ed6704e24ad1..e89cadae991c 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 3edc4b7606b4..3b8852e7c96c 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -4,5 +4,5 @@ DIST gajim-1.8.1.tar.gz 3844796 BLAKE2B b7bbd751a051cd2a46e814a9b3ebc08f10a6570d
 EBUILD gajim-1.7.3-r1.ebuild 2826 BLAKE2B 3252f39b4fe60c4d049310e744851aa2883fb973756b0f1e6a6b261a96056d0235b203ade0bf82625e145768985ee89a9b390dcd80fdb4208eca912fad789a6b SHA512 6e351104f148ce136903be001aa8a1c18c3e09b94459678079bf16603ad7198f63251d606e1818f9b231b30ea38de34fda4c80b8e6ce7f58b54a672c955a129f
 EBUILD gajim-1.7.3.ebuild 2609 BLAKE2B 3ca58a71c4b3e51fb605d031e55a6caa104d5e53e8d1e0e382a3b1bacc38859d0bb2598ce119b005f36b6ef0c67388ee2b7e4e03bfabfe257cd5c65c74e97d8a SHA512 49e1fcdd326c29f480d672bec91b941c3aa7a3d014a226ec8f87de7bf675a8909e5ab2af8afa788193f4c6bf378bc442951c6720e817887e810bd43d91d3d2c7
 EBUILD gajim-1.8.0.ebuild 2986 BLAKE2B 87fda1d68756188525313fffab21464af480a523e91ff73f50ca23fc02f19a0e5e2286610cf045435365905e9791bf1bc049d999b684abfab73a9eb92e0e2ce7 SHA512 1983904536ac220949fe24a654b1a3575290742fd70fa318f983ab36e06ec985c11687bd2e0c888e7e0cd295eac44d498d6eb6e7ad848d3c2ec9fde91ba2ce77
-EBUILD gajim-1.8.1.ebuild 3005 BLAKE2B dfe22cad565c36baec2df346012718b6ee6445be3fe76cea29121e05118ae294d3036c01bdba857b2d9f29e6d36bcb79ba3c1041ad6b95f1fb9521551c68613f SHA512 2e635fb44d7e26b6ad5d74861e0243e0dd27f4bf89b0a66c956b9b482a308b9ffe2dfd06c8707dddc3ce76f720df08ee88ff1421974c7425b57c29224d04e4cc
+EBUILD gajim-1.8.1.ebuild 3012 BLAKE2B 59b7c17fd46b660e3359417b3a43b1256afc983eda3b2a417f3dfa192a15b033c4ae2a3c2e9d8104c22f9f33de5b6a1e7456bb4b1aaba828cf5be51c60795228 SHA512 a848e69a0c9be9d32327ff209465c9b2bbdae4bd731e11b42bd82933b94b1778fb38d398131189a3fc986fafc9e8ef29398b9f74af26bbbbb520ca1a631f2d64
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.8.1.ebuild b/net-im/gajim/gajim-1.8.1.ebuild
index 909d51e4a1f7..03dbc2058313 100644
--- a/net-im/gajim/gajim-1.8.1.ebuild
+++ b/net-im/gajim/gajim-1.8.1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 # Gajim depends now on omemo-dr. Add KEYWORDS again,
 # when https://bugs.gentoo.org/912285 is fixed.
 
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
 
 COMMON_DEPEND="
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9589ad64bac1..dfa8b08b439d 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/neard/Manifest b/net-wireless/neard/Manifest
index ee8b38a53cb2..5095e53c81f6 100644
--- a/net-wireless/neard/Manifest
+++ b/net-wireless/neard/Manifest
@@ -1,5 +1,5 @@
 AUX neard.confd 274 BLAKE2B f61cc6b061a146899aabd430e3e5c082da57a8e413600a748ae23959dd4ff5668d39b17222c7c22f0cf6f990e289e8dd21287142e9d4bf21e7bdd4d15beb05ec SHA512 d696911f7e5f33f6b2a0f6508c73676998a3bfaebbda02386dc08d9149d525bf211bfcf9836276d070f31288ef84540ef1bce3d68119d4439089297c079392ef
 AUX neard.rc 417 BLAKE2B cdbd53502cebf7ac732830d5266fca64e7bfb8ec06caf660e026ec8bd9413375495e630b27e0e0b97997aab5313c5a215059c1624fd350e8b25e59bd5563c578 SHA512 68459f7dfc9bdcc6b450770d76c0ffa4b0adb248476c801317f8a8cc7c2dc9e41dea4fcf9425b9d667821037d923fb8368acb72540cc63478dd45e21ba9215d5
-DIST neard-0.18.tar.gz 228597 BLAKE2B 516205c8731bd1104e10a87408209a1848343078f814753f57fd63bc60e7146974737b13757f490bff83e538744e3d0c5fde9224d1d04ddb901c9d71076749a7 SHA512 2f1da13ade60a75b81e51a76be80a5f6681439c612ae33659eed2e495b1e390dcb1deb60945e14a4bec247b3a046b940146b78925f43be88f35880e4677c721b
-EBUILD neard-0.18.ebuild 1313 BLAKE2B 542bc07c32f7a4f14d3a9a267aefcc16a311b4f143e89ad64fc6f46696e62220d3c1cfae2c502c995f55fab62c5e97dd02f0fa63ee4fe3073efd9873410e4e32 SHA512 e50e5f76f071c3e0019249ea58af66e958541b97221a53a6015017fb31c45790511e069534d0294dc2a855a18800687d08cb48dfb976cec7b49293dd6a86f63c
+DIST neard-0.19.tar.gz 229059 BLAKE2B 35976667dc22d6fc4e80468fcd21124bd8675c490e5d96e6d8d0f5bba28a92deae4255aa96070419f6a840ede9cda7fa793ef2c27fa3e725710dbf0a2a7105a5 SHA512 577061c214365853667033a2ae9f78a367adcbf07f2d7a70087c484ac31b410d34c003f396da622604f8844f30d44cba01f0d8a7cadebfd4c4c6457996541b48
+EBUILD neard-0.19.ebuild 1285 BLAKE2B 150a5563cade23d548713f69ca38f2fb3e8309b60f5ebb2e583a9f101f3a942c640329951968eca1b71206ee35bb27b5eac15f47ccce3c6188606dcf8962f4d5 SHA512 61d9afc81b8d6136c3f1183f6a17e570aa4362d844dec126ca3fe306fa4adc8c67aaec64967c9e70d54290149f34f4f8e2311642de8dd31d3c0d41111b3d7878
 MISC metadata.xml 345 BLAKE2B ff4efcacd7341f422affd38cf868262e2ca73da528803b3f5c0a7efc38f9997d66d0e4c499bc465065671637ed1eb38f05a34a43e88ba214a65ae06c10ed5344 SHA512 fb6522da05b8b33c8aafd24c7a937039756d861adaea54a0e9075b10879b647a315d66b4f94a96da9a220c1248aeedba9d3105d640e4a0ee93eec4567fcd50af
diff --git a/net-wireless/neard/neard-0.18.ebuild b/net-wireless/neard/neard-0.19.ebuild
index 8939f04318ea..0e7a5e21142b 100644
--- a/net-wireless/neard/neard-0.18.ebuild
+++ b/net-wireless/neard/neard-0.19.ebuild
@@ -34,6 +34,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-optimization
+		--disable-test	# Only installs test programs, #913709.
 		--enable-ese
 		--enable-nfctype1
 		--enable-nfctype2
@@ -43,7 +44,6 @@ src_configure() {
 		--enable-p2p
 		--enable-pie
 		$(use_enable systemd)
-		$(use_enable test)
 		$(use_enable tools)
 	)
 	econf "${myeconfargs[@]}"
@@ -56,9 +56,6 @@ src_install() {
 	# to avoid having to rebuild autotools. #580876
 	mv "${ED}/usr/include/version.h" "${ED}/usr/include/near/" || die
 
-	insinto "/etc/dbus-1/system.d/"
-	doins "se/org.neard.se.conf"
-
 	newinitd "${FILESDIR}/neard.rc" neard
 	newconfd "${FILESDIR}/neard.confd" neard
 }
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index e6531be1b4b7..e694aa236168 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -11,5 +11,5 @@ DIST unifi-7.5.174.zip 170958023 BLAKE2B 38006f1a28caca8da956c00d4883f7c5337f1e7
 EBUILD unifi-6.5.55-r2.ebuild 2487 BLAKE2B 32f355cfa0223b1161372a38085082ccf40888192ce9159bfcaaeec0f8dd85e73a124eef2b5bfda559c693159af92f6e44fd67888126094561d7711b011b150e SHA512 5ff01a288d1d67c7e25e37bc03549b698f1a8feffcac404fbbae0880e9707210de6c1ac454058913496f7dadec80006a311d4e88ce713c34265521717ae8b72b
 EBUILD unifi-7.3.83.ebuild 2764 BLAKE2B 7cc3f4c8afe2a18ce87952d3b4658b930508b96aa8a256cbe1c8fa73bb426094b8a395ce7fee1f0d1c25a6db541248cf0faea0c020c2658038339cb4619ac1c7 SHA512 90231e073d5e95f489c724bf014dc44b821c7c55579ff0076d1c21aae2b85ca2c73a9c55f716d1cfee5ef753068b59f438eef058120fb2467917dce161b339ac
 EBUILD unifi-7.4.162.ebuild 2703 BLAKE2B 8982e50fff348e55864e623b58147913da0b9734a01ab93bd8153d570fcc2a4468a11cf4b977607315835a6a85701c35f022a885fa399c32f63990d753bb2353 SHA512 088fd7ee83ef7a7c108cbc4d68747519cf88a04e34208c91305de4323f2736a37839f3541e827f28aac226649eec6cd602162ed30e498eb934540f5be0b12e4d
-EBUILD unifi-7.5.174.ebuild 2434 BLAKE2B 9fe11dcf4a0adb4d276273158e7fcce1729468e5bc6f4eec1291b808cb5cd1ddd36c1b73365364fa934f16421ae1f479dce6a51f6c4c00f76c5dc8f008f3064f SHA512 c20ab32052cb1e4e787f7c3281bb0a5ce355e02d9282053429c0f920c68d5dc818efc3578b75581356fa92c982535075a2e485e6a1581f0eb5b1a440350e466b
+EBUILD unifi-7.5.174-r1.ebuild 2434 BLAKE2B 7a5cac24fee48439bb5fca11958fb4561ccd8a0c2321a707445e4c6a84db964916f31da10e1846d47d8725ba1e8ab8623a9b56c227d156664da35b146b9f4e3d SHA512 d1ecf76bd4614cbcb0b6698b15ee41bd6f237cf0e0c36bf796db65d01057b6effd18c372950e45e81a27869ca081e157b19081ddc9547943e897a2cb21da612c
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-7.5.174.ebuild b/net-wireless/unifi/unifi-7.5.174-r1.ebuild
index da37d1d5280e..71fa8a6c36b9 100644
--- a/net-wireless/unifi/unifi-7.5.174.ebuild
+++ b/net-wireless/unifi/unifi-7.5.174-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	acct-group/unifi
 	acct-user/unifi
 	dev-db/mongodb
-	virtual/jre:11
+	virtual/jre:17
 "
 
 BDEPEND="app-arch/unzip"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 21ba1ae41597..21aa479f4b8d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2802d1beaeed..53e8e39dc641 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2023-09-09)
+# Needs <dev-libs/openssl-3 which is EOL on 2023-09-11. Please upgrade immediately.
+# See bug #913685.
+sci-libs/gloo ssl
+
 # WANG Xuerui <xen0n@gentoo.org> (2023-08-28)
 # Breaks multiple high-profile packages depending on outdated proc-macro2 when
 # USE=nightly and using an affected Rust version; keep until revdep problems
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 7c28507a6e0f..3f27878013e6 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# David Seifert <soap@gentoo.org> (2023-09-09)
+# EOL upstream in 2 months, causes major headaches for OpenSSL 1.1
+# masking. Removal on 2023-10-09.
+php_targets_php8-0
+
 # Hans de Graaff <graaff@gentoo.org> (2023-08-19)
 # Ruby 3.0 is not compatible with OpenSSL 3. Please upgrade to a newer
 # Ruby version.
diff --git a/profiles/package.mask b/profiles/package.mask
index 1e89900272a4..ead5798c64e0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,35 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2023-09-09)
+# OpenSSL 1.1.x is EOL on 2023-09-11. Please upgrade immediately to >= OpenSSL 3.
+# https://www.openssl.org/blog/blog/2023/03/28/1.1.1-EOL/
+# https://www.openssl.org/blog/blog/2023/06/15/1.1.1-EOL-Reminder/
+# Please run a full world upgrade, especially checking /etc/portage and your world file
+# for old PHP or Ruby references.
+<dev-libs/openssl-3
+<app-crypt/xca-2.4.0_p20230526
+
+# Conrad Kostecki <conikost@gentoo.org> (2023-09-09)
+# Release causes problems, upstream degrated to RC back.
+# See #913884 for more information
+=net-wireless/unifi-7.5.174-r1
+
+# David Seifert <soap@gentoo.org> (2023-09-09)
+# EOL upstream in 2 months, causes major headaches for OpenSSL 1.1
+# masking. Removal on 2023-10-09.
+dev-lang/php:8.0
+virtual/httpd-php:8.0
+
+# David Seifert <soap@gentoo.org> (2023-09-09)
+# Depends on PHP 8.0. Removal on 2023-10-09.
+~www-apps/tt-rss-20220218
+
+# David Seifert <soap@gentoo.org> (2023-09-09)
+# Unmaintained, depends on PHP 8.0. Removal on 2023-10-09.
+www-apps/icingaweb2-module-director
+www-apps/icingaweb2-module-incubator
+
 # David Seifert <soap@gentoo.org> (2023-09-09)
 # Depends on PHP 8.0, which in turn depends on OpenSSL 1.1, which in
 # turn is to be masked and removed soon. Removal on 2023-10-09.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b52428aaf85b..f4f0709205b8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2588,7 +2588,6 @@ dev-qt/qtbase:libinput - Enable support for input devices via dev-libs/libinput
 dev-qt/qtbase:libproxy - Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration
 dev-qt/qtbase:network - Build Qt6Network module
 dev-qt/qtbase:sql - Build Qt6Sql module
-dev-qt/qtbase:systemd - Enable native journald logging support
 dev-qt/qtbase:tslib - Enable support for touchscreen devices via x11-libs/tslib
 dev-qt/qtbase:widgets - Build Qt6Widgets module
 dev-qt/qtbluetooth:qml - Build QML/QtQuick bindings and imports
@@ -2621,10 +2620,12 @@ dev-qt/qtmultimedia:widgets - Build the QtMultimediaWidgets module
 dev-qt/qtnetwork:gssapi - Enable support for GSSAPI (virtual/krb5)
 dev-qt/qtnetwork:libproxy - Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration
 dev-qt/qtpositioning:geoclue - Use enhanced location information from app-misc/geoclue
+dev-qt/qtpositioning:nmea - Build plugin for parsing NMEA (National Marine Electronics Association) sentences
 dev-qt/qtpositioning:qml - Build QML bindings
 dev-qt/qtquickcontrols:widgets - Enable QtWidgets support
 dev-qt/qtquickcontrols2:widgets - Enable QtWidgets support
 dev-qt/qtscript:scripttools - Build the QtScriptTools module (requires QtWidgets)
+dev-qt/qtscxml:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtsensors:qml - Build QML bindings
 dev-qt/qtspeech:flite - Enable text-to-speech synthesizer plugin using app-accessibility/flite engine
 dev-qt/qtspeech:speechd - Enable text-to-speech synthesizer plugin using app-accessibility/speech-dispatcher engine
@@ -2648,7 +2649,7 @@ dev-qt/qtwayland:vulkan - Enable support for Vulkan-based server buffer integrat
 dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtwebengine:designer - Install the QWebEngineView plugin used to add widgets in dev-qt/designer forms that display web pages.
 dev-qt/qtwebengine:jumbo-build - Combine source files to speed up build process.
-dev-qt/qtwebengine:pdf - Build the QtPdf module
+dev-qt/qtwebengine:pdfium - Build the QtPdf module based on chromium's PDFium library
 dev-qt/qtwebengine:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtwebengine:system-icu - Use the system-wide dev-libs/icu instead of bundled.
 dev-qt/qtwebengine:widgets - Enable QtWidgets support
@@ -8727,8 +8728,6 @@ www-servers/nginx:pcre-jit - Enable JIT for pcre
 www-servers/nginx:pcre2 - Enable support for pcre2
 www-servers/nginx:rtmp - NGINX-based Media Streaming Server
 www-servers/nginx:ssl - Enable HTTPS module for http. Enable SSL/TLS support for POP3/IMAP/SMTP for mail.
-www-servers/nginx-unit:php7-4 - Support for PHP 7.4
-www-servers/nginx-unit:php8-0 - Support for PHP 8.0
 www-servers/nginx-unit:php8-1 - Support for PHP 8.1
 www-servers/nginx-unit:php8-2 - Support for PHP 8.2
 www-servers/pshs:magic - Enable automatic detection of Content-Type using libmagic (sys-apps/file)
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 6a2be961aecc..9bf142b95a54 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index 219683d44faa..610bb849d150 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1,4 +1,6 @@
 AUX cadabra2-CMake.patch 3184 BLAKE2B afa702834d5eb82a8056307b419fc20bbc2d45b0474994328b70fee383dff415ea37ef2e70c83e9cb7776e06f9295cf5cb9afddddaf857227f7a72f362b61726 SHA512 ddd6b451f81e465d4fef9401340808922bcb1074895173d83d699614e0c967024863848fabdd207f7124ff6396e8c2c75d2ed1425ba73d7bb6d5ac6fe56a87f1
 DIST cadabra-2.4.3.2.tar.gz 25157173 BLAKE2B 895b91a01f5dedc87294903959ee3aca0234016fce0094f4288c07e2d265f90f834670b9c50dcfa059e46564c773f73f049cf65db74f49932e442d15d68ecd88 SHA512 21c76804442397fa3d5fa407fc74395fc800d01c2a5d84270e9cf3abd875c8ff96e2ba8f8349037797ff4ef3d2b9033c2a1a6af45bb75c3a201acdd7357adb6f
+DIST cadabra-2.4.4.1.tar.gz 25171405 BLAKE2B 7505b5b56c4b9f18c63535cac1854a8926f985729ac9b284146d7d604c4774436510f1fa04c615efb4e06ae4b077859e391046b2d07565586afc0d9dac66156a SHA512 9e81889dabeff1ad93f4d8fc01960c11747d2a19d0cb6d8f872cff217ffe7bd6b92fcd5ce49cf5f2c089c440a3abdb0358f5f470b4de616ce17c42a23864caf6
 EBUILD cadabra-2.4.3.2-r1.ebuild 2329 BLAKE2B 877d2060a10c388f43d1723f0830cfdb9a67426af825d7fb16709978b8f1f77888de668f676c76f60e652252261074e60b8087cf144e8f0d1add2db74656e67e SHA512 d081f07f31259e6bf596f6ed3e0362e426b83e02aa99d51cf51601f1654bead5c1d6e5e8a1bd0be000b2237018eab41c9cd00cb6141a76473bed3f1cbaec106f
+EBUILD cadabra-2.4.4.1.ebuild 2330 BLAKE2B 75e146ce8b7645923da52ef63bdf6968deaeec31a2b1d8e0346d2571b4146d26d55275d97a4386ceeabc56bd48d1c10eb2a3dded7d1c702e64e01b6341b69d98 SHA512 f7e05f2a6485c42c3a722f01e5b04444575e3c623f141f8c1befb53795f138fa888a653816287e7a4dd14a4a81f6baa63a8b5c7436041244c0a319402e5b4924
 MISC metadata.xml 1342 BLAKE2B 2f34aae73fc01d4b8fd4326505b7b0785663c62593641d1d0a01f64adc12cbc8676271612ce91258927ac22957a8d5aba53dd2627130582c744bc32c28e0e207 SHA512 41dffbcfae16f8f0702df5a1837b225100761d48817a2d70fa03aca6246b9d3184d60989cf265282286b02a77a126ac82695c2d74c6de91da45e8f64fcb91811
diff --git a/sci-mathematics/cadabra/cadabra-2.4.4.1.ebuild b/sci-mathematics/cadabra/cadabra-2.4.4.1.ebuild
new file mode 100644
index 000000000000..4452c72b8c88
--- /dev/null
+++ b/sci-mathematics/cadabra/cadabra-2.4.4.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MAJOR=$(ver_cut 1)
+CADABRA=${PN}${MAJOR}
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit xdg-utils python-single-r1 cmake
+
+DESCRIPTION="Field-theory motivated approach to computer algebra"
+HOMEPAGE="https://cadabra.science/
+	https://github.com/kpeeters/cadabra2/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git"
+else
+	SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}"/${CADABRA}-${PV}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${MAJOR}"
+IUSE="gui +jupyter test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/dvipng
+	dev-cpp/glibmm:2
+	dev-db/sqlite:3=
+	dev-libs/boost:=
+	dev-libs/gmp:=[cxx]
+	dev-libs/jsoncpp:=
+	dev-libs/libsigc++:2
+	dev-texlive/texlive-basic
+	$(python_gen_cond_dep '
+		dev-python/gmpy:2[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+		jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] )
+	')
+	gui? ( dev-cpp/gtkmm:3.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')"
+
+PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch )
+
+DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst )
+
+xdg_update() {
+	if use gui ; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+src_prepare() {
+	# Clean postinst script which calls libtool and icon-cache update
+	echo '#!/bin/sh' > "${S}"/config/postinst.in || die
+
+	# Fix "PYTHON_EXECUTABLE" in Jupyter kernel
+	sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|"  \
+		"${S}"/jupyterkernel/kernelspec/kernel.json.in || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DENABLE_SYSTEM_JSONCPP=ON
+		-DPACKAGING_MODE=ON
+		-DUSE_PYTHON_3=ON
+		-DBUILD_AS_CPP_LIBRARY=OFF
+		-DENABLE_JUPYTER=OFF  # special Xeus Jupyter kernel (uses xtl)
+		-DENABLE_MATHEMATICA=OFF
+		-DINSTALL_TARGETS_ONLY=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DENABLE_FRONTEND=$(usex gui)
+		-DENABLE_PY_JUPYTER=$(usex jupyter)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_update
+}
+
+pkg_postrm() {
+	xdg_update
+}
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index e186dc5b3f8f..6c84c01ca755 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,7 +1,5 @@
-DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
-DIST coq-8.17.0.tar.gz 7504612 BLAKE2B 90ff0e187e13a6501580733f0e92dbaba0ddc520b418246c743f0c282e74cee3e1d69ad0249cddfd5b8f3ba363bc58cb91aad33d0936ae38afde0f4c97d47a72 SHA512 2f77bcb5211018b5d46320fd39fd34450eeb654aca44551b28bb50a2364398c4b34587630b6558db867ecfb63b246fd3e29dc2375f99967ff62bc002db9c3250
 DIST coq-8.17.1.tar.gz 7506035 BLAKE2B 29b5b11666185ec293f50264f5a8ad66433c3ce05d74128b524f6fc3c6810551fe76d11d6f9db7d3741b829ac8bacb66948aad522d0cd2c487692c3df8b563ff SHA512 9a35311acec2a806730b94ac7dceabc88837f235c52a14c026827d9b89433bd7fa9555a9fc6829aa49edfedb24c8bbaf1411ebf463b74a50aeb17cba47745b6b
-EBUILD coq-8.12.0-r2.ebuild 1854 BLAKE2B 96a5bc026d7cef8218fa0f10401c697df908487a2a510f349a57d080e2c59c6fc6237223fbe82f5114c6ee70ebdfd9fffc9812bc2e8981febac635efd94b3035 SHA512 3936eafb537044833b310fafc9ba4595bb6deba71679177fbb807c59e3bfcd44f8a98c26077fda791619479b5efdefd64f6235ce2ae7c599489c4f0e8f8e003b
-EBUILD coq-8.17.0.ebuild 2317 BLAKE2B ff2958b7e82400115ab634dd00bac13df99ba088d8d2ec48ad61663ba0aa3690e3cad26badedad5fd12958df4c7a343b5c9d2d827a2a7aac3ba35e9ddfe3f222 SHA512 4c04bb4aa2d97dfa21868e6246d8a35d96b55e80c7bf6206ce1c67f46102c449cad25f7062c93c7defdb0e118be57c8f86d3c3323df53ce3c794617a7d4ed6d5
+DIST coq-8.18.0.tar.gz 7612742 BLAKE2B 2fb9f6205465ded60d2e1f7943f53ad884aea121c8129bb30c3f66c172f51f97eb553f8a745fd3ab1ec4da80d4ca08a7aea22f65d372fda3322c0f9ca7862923 SHA512 46922d5f2eb6802a148a52fd3e7f0be8370c93e7bc33cee05cf4a2044290845b10ccddbaa306f29c808e7c5019700763e37e45ff6deb507b874a4348010fed50
 EBUILD coq-8.17.1.ebuild 2317 BLAKE2B ff2958b7e82400115ab634dd00bac13df99ba088d8d2ec48ad61663ba0aa3690e3cad26badedad5fd12958df4c7a343b5c9d2d827a2a7aac3ba35e9ddfe3f222 SHA512 4c04bb4aa2d97dfa21868e6246d8a35d96b55e80c7bf6206ce1c67f46102c449cad25f7062c93c7defdb0e118be57c8f86d3c3323df53ce3c794617a7d4ed6d5
+EBUILD coq-8.18.0.ebuild 2318 BLAKE2B 43895300c1c9b754f5c1d1cfc2140318f8ef32014bcfa59e47e21931efe8d9d115637791b0ddad99c6ecea9fefc172bfddaaef048cffe99ae769fdb807cef8eb SHA512 6f9149a727109283ec4f4ca883016478f0e77464542ca3798e068d3eea2d682eba1b226b37bdc1bc9e4c35c8c19997e1720f3abf2d42c6fc790d148137e0f8a4
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.12.0-r2.ebuild b/sci-mathematics/coq/coq-8.12.0-r2.ebuild
deleted file mode 100644
index 2781f3840db2..000000000000
--- a/sci-mathematics/coq/coq-8.12.0-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib
-
-MY_PV=${PV/_p/pl}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Proof assistant written in O'Caml"
-HOMEPAGE="http://coq.inria.fr/"
-SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
-IUSE="gtk debug +ocamlopt doc"
-
-RESTRICT=test
-
-RDEPEND="
-	dev-ml/camlp5:=[ocamlopt?]
-	|| (
-		dev-ml/num
-		<dev-lang/ocaml-4.09.0[ocamlopt?]
-	)
-	gtk? (
-		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
-		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
-	)"
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	doc? (
-		media-libs/netpbm[png,postscript(+),zlib(+)]
-		virtual/latex-base
-		dev-tex/hevea
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-pictures
-		dev-texlive/texlive-mathscience
-		dev-texlive/texlive-latexextra
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ocaml_lib=$(ocamlc -where)
-	local myconf=(
-		-prefix /usr
-		-bindir /usr/bin
-		-libdir /usr/$(get_libdir)/coq
-		-mandir /usr/share/man
-		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
-		-docdir /usr/share/doc/${PF}
-		-configdir /etc/xdg/${PN}
-		)
-
-	use debug && myconf+=( -debug )
-	use doc || myconf+=( -with-doc no )
-
-	if use gtk; then
-		if use ocamlopt; then
-			myconf+=( -coqide opt )
-		else
-			myconf+=( -coqide byte )
-		fi
-	else
-		myconf+=( -coqide no )
-	fi
-
-	use ocamlopt || myconf+=( -byte-only )
-
-	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
-	./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
-	emake STRIP="true" -j1 world VERBOSE=1
-}
-
-src_test() {
-	emake STRIP="true" check VERBOSE=1
-}
-
-src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install -j1 VERBOSE=1
-	dodoc README.md CREDITS
-
-	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
-}
diff --git a/sci-mathematics/coq/coq-8.17.0.ebuild b/sci-mathematics/coq/coq-8.18.0.ebuild
index 495f48055a82..f634026e1cda 100644
--- a/sci-mathematics/coq/coq-8.17.0.ebuild
+++ b/sci-mathematics/coq/coq-8.18.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc gui +ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 35c268d22db1..35856ad9630f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 35e7dac0db56..c8bdd6a7f37b 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,8 +3,10 @@ AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da6
 AUX systemd-tmpfiles-clean 58 BLAKE2B 6a33f92a136218f3a27ea31e5cdd519706b15a3bba368f6f900d1d540f50493905a2cdab35ee3d216c9cb45e821251bfacc4965ad5a2ca7b1e1ae5627f4a3680 SHA512 3084eb1623b56cb09e4c9bd3e314a3e1d6d88f002149bea75b1c506a30b6345c51c7a90a1330baa5eec86ae6b90116f9970d8ff5add91929167df84bef6e82fe
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
+AUX systemd-utils-254.3-add-link-kernel-install-shared-option.patch 2350 BLAKE2B b9ad80ddadea96516198b8bee351443ec155e5bdf916b6ee86ec5b6712565ddafc04fa632dd0c56bd9e18345d444a7e17d63446121e84402a85c9a828c20e670 SHA512 390fc403630a6abd5724d8939162de4f869e9b7681824a1280a769742bbcccac4126e1cbcc076b48aaf1aa07097b5eae1f5375da1702a8cc452f92996fd0d4f8
 DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
 DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
+DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
 DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
 DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f548c389f59d34b649e874db2f85868943b0a9c33ef62185c83c41a9c220caddd65c44ff328026eff19c3c7efda5efbd73574 SHA512 fa34b9c2f692af8f70dffc5044fe502ff5e21625af5b27cad7fc5e833570b180f53c5d03a0add785e83a5b4e7564117fe4728931df4ef599888c73e92c7f2103
 DIST systemd-stable-253.10.tar.gz 12116663 BLAKE2B 9232067c5fb4ceb3c941d9840a043f34ca3c6eee6e696743715e9f36d47a58e98046ffb6af19084bbd7e8b4edf40c67132a3fa967f37785eb988a18530ca89b1 SHA512 dab45496586a9a78ba46a3c03c02e6bd97a8b832e28f96fdf052ecf1906c8c1bdc55967fc243ca837d0371e81730a92bb230e59a43e2ab6bc1b62fbd42a051d4
@@ -12,6 +14,7 @@ DIST systemd-stable-253.5.tar.gz 12015672 BLAKE2B 3b09bc1a63bc3321c51ea05080f959
 DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb657b99896920cc6b74d1e86586f51bf312d6c2647582a635a479048cadceb0b5ed508918ddff42b2639cec6234a656762f4 SHA512 c81f7ac0cca9073878026d6a3024ebad8bf38c4745fe7bac5a156906ba9fd7b78b90fdc69376821c9927dd60173dd6604684e2ea7dcb55dc2e60a0e20ee01735
 DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
 DIST systemd-stable-253.8.tar.gz 12112413 BLAKE2B 0edf5d2fdb47ef4c2fd9257642a719cb3cf70096d74ae0002f4df2696f3efd591ddf239f2ac9762aa53ebcee5bf31295739f8176313b8260e97fe99cc51722f6 SHA512 628db658ccf01e6cf09c6832735ad08c3d0dd906798e3366d42621fb08ad8b72aa7a51ae4874d76acf6c56282c63dc5fdce677cde3d4e102ce0036571ccabcc4
+DIST systemd-stable-254.3.tar.gz 14329148 BLAKE2B 10b947e04a4ef9ccaeb7adaa67ac0f391927fb172c0750ffb93d4df69d970fd91f26b052f8bfdfb4f81ae69566d0a3459cbc87cc86b624014cfb8781a2914121 SHA512 a0c361c993ac9a121823bdd58e29ef7bd25ccfd206ae0c3e1eed9833b3ddf24f53afe6f669eb9fbff5078977403236b0e4ef5a5f6fde56c504caed1d411e71fe
 EBUILD systemd-utils-252.10.ebuild 11815 BLAKE2B d25fdb6b3ea15768a7894807906e8b9bdf97e11d45d07886eb8361d214de82494986efb9757fd7ffdbffeeb99495404340013c86d2a24e928c6b744e10b050f1 SHA512 bf6ad12b10422b678d3b2110e4e27249dedb1a997d5c283bb9f48c32d593f96343ae0031721053d911a77ebcd12a3e509574eeecb8ab11c7dda5037bf52dd2ed
 EBUILD systemd-utils-252.9.ebuild 11806 BLAKE2B 47a6f40881f6ed002bfa21c652dc0ddf6813bc74f842e33428241fdb26fb4f8948188f53589258146fcb0a865719e7aafe138a8854e70ea5f46aa87c7b9f0851 SHA512 3c5483674b0a468f0d0f1e4346ffc5f8f6d9c306a0a79d8908d440e837eff96cd8d032f98a521c016db48c9a5bb8bfea45306f83ae82587b92e556a8637282e4
 EBUILD systemd-utils-253.10.ebuild 12178 BLAKE2B 688ef38e9378de0aa86611a2147b986d211e7efddfb91a8cfebd1f67df57f636d080dd922bac58bf19b7f379b2fd575b3eb9212ba9aebfcb7002becbcbbde33f SHA512 6ff531dbf3d241e69c8ca4d042095683932b3428d682e97df69b0c7ec72c54d8b64ee58a2c724035abd387627c66aedf89d066a801a6df9fbff4a840ac9045d0
@@ -19,4 +22,5 @@ EBUILD systemd-utils-253.5.ebuild 12051 BLAKE2B 21451742cca560c80fc8fdb5acfcc55e
 EBUILD systemd-utils-253.6.ebuild 12170 BLAKE2B 60ecca693978cb7c531b46f3d1e7f9615bc5935a828d917af327cd186bd700ab0f39e4bf76732536ffdf1f5b56c23903f6b70abe18b2dc6397160833e14db86d SHA512 617c4ba492371d0bedcfd8ed6d6c9d6d39b08db36240ed2e9e811c3c0725695f922430dfe44c24372ed16b28579afd113da8449f958a182777aee0613224ccfd
 EBUILD systemd-utils-253.7.ebuild 12178 BLAKE2B 688ef38e9378de0aa86611a2147b986d211e7efddfb91a8cfebd1f67df57f636d080dd922bac58bf19b7f379b2fd575b3eb9212ba9aebfcb7002becbcbbde33f SHA512 6ff531dbf3d241e69c8ca4d042095683932b3428d682e97df69b0c7ec72c54d8b64ee58a2c724035abd387627c66aedf89d066a801a6df9fbff4a840ac9045d0
 EBUILD systemd-utils-253.8.ebuild 12178 BLAKE2B 688ef38e9378de0aa86611a2147b986d211e7efddfb91a8cfebd1f67df57f636d080dd922bac58bf19b7f379b2fd575b3eb9212ba9aebfcb7002becbcbbde33f SHA512 6ff531dbf3d241e69c8ca4d042095683932b3428d682e97df69b0c7ec72c54d8b64ee58a2c724035abd387627c66aedf89d066a801a6df9fbff4a840ac9045d0
+EBUILD systemd-utils-254.3.ebuild 12235 BLAKE2B 3f050e002a672a9ab47cbdc39bc98fc9e1ad5afb6d12ab0212a01ce089b2ecfc1e35d57833280976fd2d9ef5ce2e96a1fadd9f167a0893261866b2659e3362e7 SHA512 422e254cd24dd94d528000eea7f7e1c3b42347e516dc6b5962d5a920c6de1f7fdd4bb7bfd21396c47b764f7505e3389c61c7950eec2c1c2c8d8ebcaf6c30c61d
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/files/systemd-utils-254.3-add-link-kernel-install-shared-option.patch b/sys-apps/systemd-utils/files/systemd-utils-254.3-add-link-kernel-install-shared-option.patch
new file mode 100644
index 000000000000..17e4ea4832a2
--- /dev/null
+++ b/sys-apps/systemd-utils/files/systemd-utils-254.3-add-link-kernel-install-shared-option.patch
@@ -0,0 +1,58 @@
+From 5973e4b237e7b50dca1c9f3157db459ef1ee6da5 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sat, 9 Sep 2023 13:22:54 -0400
+Subject: [PATCH] meson: add link-kernel-install-shared option
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+---
+ meson.build       | 9 ++++++++-
+ meson_options.txt | 2 ++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 053e772567..003a34574a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -4420,11 +4420,17 @@ executable(
+         install : true,
+         install_dir : rootlibexecdir)
+ 
++if get_option('link-kernel-install-shared')
++        kernel_install_link_with = [libshared]
++else
++        kernel_install_link_with = [libsystemd_static, libshared_static]
++endif
++
+ kernel_install = executable(
+         'kernel-install',
+         'src/kernel-install/kernel-install.c',
+         include_directories : includes,
+-        link_with : [libshared],
++        link_with : kernel_install_link_with,
+         dependencies : [userspace,
+                         versiondep],
+         install_rpath : rootpkglibdir,
+@@ -5059,6 +5065,7 @@ foreach tuple : [
+         ['link-timesyncd-shared',  get_option('link-timesyncd-shared')],
+         ['link-journalctl-shared', get_option('link-journalctl-shared')],
+         ['link-boot-shared',       get_option('link-boot-shared')],
++        ['link-kernel-install-shared', get_option('link-kernel-install-shared')],
+         ['link-portabled-shared',  get_option('link-portabled-shared')],
+         ['first-boot-full-preset'],
+         ['fexecve'],
+diff --git a/meson_options.txt b/meson_options.txt
+index 1909323850..36794e6d98 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -29,6 +29,8 @@ option('link-journalctl-shared', type: 'boolean',
+        description : 'link journalctl against libsystemd-shared.so')
+ option('link-boot-shared', type: 'boolean',
+        description : 'link bootctl and systemd-bless-boot against libsystemd-shared.so')
++option('link-kernel-install-shared', type: 'boolean',
++       description : 'link kernel-install against libsystemd-shared.so')
+ option('link-portabled-shared', type: 'boolean',
+        description : 'link systemd-portabled and its helpers to libsystemd-shared.so')
+ option('first-boot-full-preset', type: 'boolean', value: false,
+-- 
+2.42.0
+
diff --git a/sys-apps/systemd-utils/systemd-utils-254.3.ebuild b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
new file mode 100644
index 000000000000..1912fe2b9f6b
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.3.ebuild
@@ -0,0 +1,544 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="
+	|| ( boot tmpfiles sysusers udev )
+	${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+	boot? (
+		!<sys-boot/systemd-boot-250
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/floppy
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/usb
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_cond_dep "
+		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+	~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+		linux-info_pkg_setup
+	fi
+	use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=(
+			"${WORKDIR}/${MUSL_PATCHSET}"
+		)
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootpkglibdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-kernel-install-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbpf-framework=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				kernel-install
+				man/bootctl.1
+				man/kernel-install.8
+				90-loaderentry.install
+				src/boot/efi/linux$(efi_arch).efi.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/60-persistent-storage.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+src_install() {
+	local rootprefix="$(usex split-usr '' /usr)"
+	meson-multilib_src_install
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl kernel-install
+			doman man/{bootctl.1,kernel-install.8}
+			# 90-loaderentry.install is generated from 90-loaderentry.install.in
+			exeinto usr/lib/kernel/install.d
+			doexe src/kernel-install/*.install
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into "${rootprefix:-/}"
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into "${rootprefix:-/}"
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+			insinto /usr/lib/tmpfiles.d
+			doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+		fi
+		if use udev; then
+			into "${rootprefix:-/}"
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+			exeinto "${rootprefix}"/lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+			insinto "${rootprefix}"/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto "${rootprefix}"/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		exeinto /etc/cron.daily
+		doexe "${FILESDIR}"/systemd-tmpfiles-clean
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+		insinto /usr/lib/tmpfiles.d
+		doins tmpfiles.d/{tmp,x11}.conf
+		doins "${FILESDIR}"/legacy.conf
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto "${rootprefix}"/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto "${rootprefix}"/lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto "${rootprefix}"/lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+
+	use boot && secureboot_auto_sign
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 47a447983a9b..1b5ba007bde1 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 7b33c573735f..797e354977da 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -5,6 +5,6 @@ AUX nginx-unit.initd-r2 808 BLAKE2B efb9c3f33c5fd3070333ddb224ff0bcd4e7f8e1147b4
 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d
 DIST nginx-unit-1.29.1.tar.gz 906654 BLAKE2B 1068a1002b05f6f9f28b19745e3c1c0f1d1def89fad8489174fd7b38ddd8c9678f27a3b105f98a17d537621cdd2cbedf9f39b4c284a7918d290287f3c324fa49 SHA512 c99cea78804ead999e62777132fe204e0f87e1b58e55b0b4a074ab8d203149c14c8faef64872a44404f8fca5bfd98d2f9e4aae2db89bebeee15f27cabbc9f247
 DIST nginx-unit-1.31.0.tar.gz 905152 BLAKE2B 4b3b89318706c584fc2b80599c00bb104c1d70c14f8730b3f1142ae1b30db4cdd6516958eb0daf90031df953c0654af71a0f453a0c0c1f345241b215c207963b SHA512 ce367c81dc96b4a8d280a3e34ff8bbf1941a595c5570f9e50ffa49e1f8ac3c2e0a620be5a994a1c4c65aee7790ca227fddafba1c461fccdced83fd4c08c091e6
-EBUILD nginx-unit-1.29.1.ebuild 2215 BLAKE2B fc5db358d12ec328a969e6b0260e3fc89b4792abb0c689661f1bbbdd52ca2c6c2733ce17499803b6e153ae432d1d3a62212ded0c6c4b47ee7fb7de8a386c5a44 SHA512 70e49718e8b243146a01e4461d4e9e95d57f13f4fa577e6370dab4d176f2134dc353a75dfb79a2db6e8dce1a6a856443af1b8e1cd6e902a1b82bedb0dbdfa0e5
-EBUILD nginx-unit-1.31.0.ebuild 2342 BLAKE2B 9427db46ce7ba25ff0abc78ec662e21aab88d0d39054bbf086ed27df4f8ae293d0a4001e1d5df94e78a23b1988392efa01ddfca0eafa95c0c0cae629d210351e SHA512 19123fb0ee7a0f3706c62043969f28a11e1a0d1b6f51d913efc1442c21ec418829770407ad26a07279ab6e0a0f7fcf36210bc7042ffcc1fc76bd6dfddb593006
-MISC metadata.xml 879 BLAKE2B 00418e215986951cc2d3cc3cc70c38fd4f1d207ab1d51462bdebb4b896972257c2013c5faff206b889930632b03f8bd8ae606ac8e45c2c2ee438ff419b5fe8f7 SHA512 f45dc3c960be09fb09a69e36b63ff5fecff3f1937098a365b077f61db3533efa63fe5500a3c365aca55842bdf383e8c84e3e8b135b6feb8aff6d691e3ab810ad
+EBUILD nginx-unit-1.29.1.ebuild 2127 BLAKE2B 7a23100ddfaa4e11b3a1845e0b89753a1d9747469ba0f0e57b2e3bf969382307d196072882f78c82bfb1e56df0cd2fe075c5dfbfc3cdc5c50e3e9e69b674fd34 SHA512 e1cfed44d1b4f8cf02d33e583b02c05819f0dd02280efa2d6b2a946c18ca7c96953a39fa00538096ce600fd0bb3681258d71c39e6d2188aa77ae3483421c71d7
+EBUILD nginx-unit-1.31.0.ebuild 2298 BLAKE2B 8a5f9975cc304e2227fca2614b744302dfe19366a403ebe78d1f9d782b87b3aeaebabb2a35ac67150ad872a2a27632cf0e418d317e6517d2d1b11ba129a006ce SHA512 5b99387fc4f5bf56c95d36b14c9e0e579a1ed1a21bcf248ca5d779cc27df7fdf7a0ae86668e834e069f1a5a7c0c41b9d1bec58e6b5f91eebdb292881ef36f390
+MISC metadata.xml 781 BLAKE2B f1ecaa8dee982424963fc9e13bc397a11926e7d10b89a0cec8b3c69b73ff877eac83e479d83dbbdcd4da97af5f664949f99e88c5fd195d13ffb7e9bdb41603d6 SHA512 b721b7b61e9033483dc81fd1cd8b2b836ad132b48089e9ab5c78c56bc8c44a11e8fd672d99cbd4ffd37f37226c0e795da4ee3e14996f972f5c74a50f9aef37ec
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index dd2d6a9e0065..488056a85af1 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -13,8 +13,6 @@
 		engineering or operations.
 	</longdescription>
 	<use>
-		<flag name="php7-4">Support for PHP 7.4</flag>
-		<flag name="php8-0">Support for PHP 8.0</flag>
 		<flag name="php8-1">Support for PHP 8.1</flag>
 		<flag name="php8-2">Support for PHP 8.2</flag>
 	</use>
diff --git a/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
index 70a236f59bad..b59e79dd27da 100644
--- a/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
@@ -17,14 +17,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64"
 MY_USE="perl python ruby"
-MY_USE_PHP="php7-4 php8-0 php8-1 "
+MY_USE_PHP="php8-1 "
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"
 REQUIRED_USE="|| ( ${IUSE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="perl? ( dev-lang/perl:= )
-	php7-4? ( dev-lang/php:7.4[embed] )
-	php8-0? ( dev-lang/php:8.0[embed] )
 	php8-1? ( dev-lang/php:8.1[embed] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
diff --git a/www-servers/nginx-unit/nginx-unit-1.31.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.31.0.ebuild
index 8873b5665a10..cac440e33f0d 100644
--- a/www-servers/nginx-unit/nginx-unit-1.31.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.31.0.ebuild
@@ -17,13 +17,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 MY_USE="perl python ruby"
-MY_USE_PHP="php8-0 php8-1 php8-2"
+MY_USE_PHP="php8-1 php8-2"
 IUSE="${MY_USE} ${MY_USE_PHP} perl ssl"
 REQUIRED_USE="|| ( ${IUSE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="perl? ( dev-lang/perl:= )
-	php8-0? ( dev-lang/php:8.0[embed] )
 	php8-1? ( dev-lang/php:8.1[embed] )
 	php8-2? ( dev-lang/php:8.2[embed] )
 	python? ( ${PYTHON_DEPS} )
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 6acbc03f8ba0..467bbdfffc1c 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index a5d0b6f58577..6842334c40f0 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -17,47 +17,38 @@ AUX nvidia-settings-390.144-raw-ldflags.patch 468 BLAKE2B bf4c00a76351e6c3d1587b
 AUX nvidia-settings-530.30.02-desktop.patch 406 BLAKE2B 63f645d5c9f76349b405c61327bc4f6d44e0716b4ec4c2f1aa012505638be0a329bc9589812d1f164641e4725dd15ac652eed0992161e767325b1310d9cd0718 SHA512 ff0fed69d7d36b2f67f9382055490a031ef8e834119bb18b0f71d1265afe92fad44cb11d6fabc5e3750a434c51e4660cfaa3347d062036d975fd341967187494
 DIST NVIDIA-Linux-aarch64-525.125.06.run 263039228 BLAKE2B e25f9dd3807fcd3bc4d3d55b6b7f39969ee4140e2f6a60509b34494b5e29daa1c333edeeb966bfdf4397057c6b707830523c956e28e252ab6db1fc402ac8edbb SHA512 190a458810fa02c89eaeb4587b97463b2be86a9a5ba44ab4113a224d224cec69d8d706b4a3421bdc3a067e0c47a67e104c156bb5ddec6ecd109b655a3d4ef7d7
 DIST NVIDIA-Linux-aarch64-535.104.05.run 268930052 BLAKE2B 2ad8d0c8e490be857f4f9389c6e84ca241b5950e1ae91960128c0dee3043c7796a12e8b5e3d8e3d6b0c35421822f363b31d98ec84495276c3e7722fec12ba169 SHA512 1282d5f494af5ca0f9df55213f74c810dd78b154814ab29fbc9719fa3addf2523b82d41f034fbf1a7ec030af39b4c568d5648ea052405c5af98a5ee3aa4ae253
-DIST NVIDIA-Linux-aarch64-535.98.run 268923347 BLAKE2B d8530e77445475db1411972b89670194f3f30a12d65d437e0943a7cd57631e4fd2d83c7efac44a62c58f1b7b49b0fec0f07eed0306bd97714e77942e39cf6a4d SHA512 c254a5c85dfecfa8aad2d129d0c8b9a40855fb9ad937f90f8bf09bbb808ee954068e921d8f33cd2f09e19aadc087ebfc9a9b43d2f9814343344e387cf9fd24fa
 DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb0105d29c11a2d408457835212a96519c9334ecf19278b36749d3ff7f498f5b0ae45a2efae2d428703dac21245c62f1efebe SHA512 dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.199.02.run 273256770 BLAKE2B 5ceca89da4b4c7de701602d3dbf26e71a1163be26e0e5eac65354ecd40bfc8d68c981a6ef75b13e95079835c95ef7f9e10e5f95a0ed09beffd5bc22cb81a5330 SHA512 e1265b6266473af652e9d7bf85dcd76e312af281c5f4f158ab322e34d378738acb87c30cfff7bf1f6e1b238883e7f665d9fc5151b1e0078dd9aece5a52655405
 DIST NVIDIA-Linux-x86_64-525.125.06.run 414318862 BLAKE2B 204c53bbf579edf6d88c9ab4efcf82983a2b58262df4748076de96f3d67b107949407ae0c5ffe9bf6747783b1bcb9a9efc4a3c60d7161427b1c85ecfc494171a SHA512 a5f13b633d111d9dc928e8522cd916a2b756fccbf2dc532649762a3f9bdc5503bd57c9c698da8205c49e82720b45789413a1afc26be77d741f823b49ae2f333d
 DIST NVIDIA-Linux-x86_64-535.104.05.run 340936244 BLAKE2B b549d84df020291180c2dd08f42abd806c01091ccc976932ed35d5ce0c3fe629adb892dfb48837b57f1eb2aefe13c6a06c7d3a05a490bf4de3c6d5315cf40114 SHA512 9aba3bada23b41acf7420da57cfced8bf883ef9210bbca5db9882e6e682e9755e0bc48fa12bb2ed114d4d68ba99443f26c22c94d3063d0daf8e9c1e21b369bb5
 DIST NVIDIA-Linux-x86_64-535.43.09.run 341142409 BLAKE2B 2ce445b3fb0d8094ddc55bb9ebe16bf7fb2b7b0f30313fc431e7b6d75fb2f7a9021c5128e5cbea5165c4e83bf01d31c602c26b111778f31f54b0192f529a32b6 SHA512 790ad0f39f5f34ba28ee028601d60e28d1e17a8cc0ef64e06e5b3570d661d15404bce7a835e75464023e3b8a8154a9f22de592518016bfc5e137b6d09215f7ba
-DIST NVIDIA-Linux-x86_64-535.98.run 340737533 BLAKE2B 363da4747fecf9ca1a3853f780c9a4b7efcb2a90d8a5bf10e0e9262c7fa69d43c2d54e4b6939337731bd5469f3731e3f458b4329e215414aebe307f6a27adb3c SHA512 d62289a5e90b2b4c4d63ccdf4a161e5f57c437a359ece1f2dc6738401fb5a9fea8fbdc479fc65fa703d55e709a23c957e5d779c53e406c385f141315924e0eb2
 DIST NVIDIA-kernel-module-source-525.125.06.tar.xz 10100204 BLAKE2B 1a7a9f56be4533b8106df25ddf65cd7756cde11fd3e01f96f1f34c7d18af764fcfefc1cf980fed6c0e586e614ccacef9e2cddbabb87c7d7f06a1b27d94f63466 SHA512 1319a2333988795f5b0850cfe769ab0f4c4364bdb516147b85890abb4695aea2553ca0febf9cfcf2f8eafb4c05c3e21f56356ad75e64416c9782b027495028e6
 DIST NVIDIA-kernel-module-source-535.104.05.tar.xz 12477388 BLAKE2B 0fb57ede191093c9512243f027747301d177d9c0444b119ea238f61d397f507b424ad05f05417b13ef94457b7557a92f426fe15217e9da5bacc9645477abd40a SHA512 a7f5428307f51c3b35bffe4e69ccf82883a16c6505fddce7b986f434d4bf1753dbc8c1ab42af2df47df6936860f274b6f15835f99fbbb871dab47a9ba61e53ad
-DIST NVIDIA-kernel-module-source-535.98.tar.xz 12415840 BLAKE2B 3a951ca56d2938caefa5bdc4a346fc9f812baff51bf9103a59af9feb30b6cf25148d1205e7f280dffc96d41e20c557870c3efaea18d290555e3d10f430111d6a SHA512 6d47553bfc40f44403254f522159fafc12ff452680cb609c23c081c298d3bc28f11ed9366e561d97fff37660c790b9f417bf3d4b011565701aaa76b032c496e8
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
 DIST nvidia-installer-470.199.02.tar.bz2 146367 BLAKE2B 0b49350a884c1e2e39fbb3a393aec0e00678ba84d8f15b3a031628593724ec2a91b162075bcb282d2d2efdc199f8c58bbd0a3c2657592bc548d4c0ec35101518 SHA512 e3a2bca22dfc8618a52e5b188bc76718bce0d5a09a136154fbc664aae32c54a6bebaab279f7830e36116bb93e514e81b845f5a7e745dbbdaa0cc6f9284dcc3c3
 DIST nvidia-installer-525.125.06.tar.bz2 147696 BLAKE2B 67d9539dca006b11585e51d3c431e7f60770cdf0a06809f007b53f418afe1f8ee7412946ff68f2c60a1dd5353eaf377087507ae82a1a480801a7f33d458b48a4 SHA512 d29564b91b8e4c4ff6c2d0480d84738e8376e93b0efecd541bbb64258514e28833317147d091ca929238f315a227e7db03eaa6be1846abc660bb25bcd1c50302
 DIST nvidia-installer-535.104.05.tar.bz2 148528 BLAKE2B 06b25e79c5a5333db76e8345fc0118104b7faad45e9403940ae81268c0c130db16a93ca2a6eb04e1c7cd09a36d06bc0644701f54ac465cf7c044fd87af7f4523 SHA512 53939de5744d8da2133baa1b6e3870a753ca4d42d135689ae02aba63077a11c7958af546622d8815f92d6c49d3b10139145515712f71c69122c78ce2e89cd81f
-DIST nvidia-installer-535.98.tar.bz2 147964 BLAKE2B b865fb4182b54b851242dc1616c0eacc2d0e77bab3233c43cc45d01d10b94745557415be5a4799f8566ad55c7332e6bf375f1ad4437166237894859e33447191 SHA512 1f71dc50b06484fbb0233259a64f24cca3d9f56f84e290a849a233c45522f255c30fc33f6e298ed44bb96be51e69cf5d21ccee5594ed526fd4f27316aafbb354
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
 DIST nvidia-modprobe-470.199.02.tar.bz2 38786 BLAKE2B e72ea8d97f94c804411bcd8ad52653bf4a00114c4c65822a006a28076a51803a39b7168273c46cd0391c094837593ff8bd415357541fe73222c9c87b554e0798 SHA512 f66707d1e754d55ebc109d0d03f21143f5702d42ab56785c451b93aa577007de99526d453d732e32ddd273647e041bfe4cd5f4305c7535f2420bac17878c843d
 DIST nvidia-modprobe-525.125.06.tar.bz2 40428 BLAKE2B bafe72592680ee75868c794f1442ce283fe7376a6997ad85c6fbb269cf111fdac0c86bc0474c8a4496796bc519ec975bf8569cfd5c366535260aad4d845aa096 SHA512 d673ab4f23eb72acdbcc4f5786fe0c35d4d3e0816dcb117937441cb41fe9414bc0ce35ff8be8bd7a28d3dbae5e69a57f891cbc985dc73570c7d06d462548d721
 DIST nvidia-modprobe-535.104.05.tar.bz2 40710 BLAKE2B 7a14932085371e6b0b50ca7cbec231c61b7e59917d99ca07b9f90dd461f25b1bd796a67c80fde5860489dcfa6314c7209d8f012042bcf7ad3f929c37cc9aa186 SHA512 504890079a653aedc359a4e142ee48a43305eb0e2a1ba84004c32b965258d4336cb16f08347750b4509f61f7cfab4fd4a8793ded3fa9afe8c2d2752b8a70e933
-DIST nvidia-modprobe-535.98.tar.bz2 40420 BLAKE2B 3757e4af814584de0bec1491351fc35b5df6816cd3ec65457738e7a911cd2539eaaa1f98660020b0d774f726e7d2d134598db961f68a6fb48ae981a3362d245e SHA512 530024500dbb1df6a5a7180308171af2e144df306bafd7dc93f65edb583dc4676516e2d44a6e39cf775759e7a55ee6efc6b94bf357db5974e26caf40a75be956
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
 DIST nvidia-persistenced-470.199.02.tar.bz2 46558 BLAKE2B 67cf26b1915d29898769ffe91399c5204e61a71a0bd205d35daae4516bfe06b978323aea5a8af3341dfd497ac6bf7bb7519e33030a3d622d84f3f8f70e5d510f SHA512 8c4ac45954db02311f323d2dd79cbfeb7d6724e96b881069f1dd2d156be089ad2b3723cdc43c83d5a65bee28d45558fc55ebdc74f971abc4640cc5be0444f5e4
 DIST nvidia-persistenced-525.125.06.tar.bz2 48050 BLAKE2B b7e91a5cbd00cf3f553aa06cb576740ece2025d27291e64271b77dca0c81c4a4ba9450c05db037a1f517e92cfb50019fe63548cde80753c2f0ab6852380ef30d SHA512 736f8a016e3b65b44d59db4f13eaa366c41e0fc6b3adde3f1bf8bb5362948115152016f78b89306c20311a7d70ce12329bbfa5e11eff24a3621cef17c5fa1566
 DIST nvidia-persistenced-535.104.05.tar.bz2 48631 BLAKE2B 6e6823dd1b73086d5c2cc2ae5008d4d6b8ee0ce3d7223035bf55ac64e194cf4684c966810b4c22ebfea2af4c9c5ac09062b0d5c801f2f10cbf46468ac724c649 SHA512 5a0b5ae70d04f5d317dd0795046636eeb1e04e0804676bec148cba197dda7ae8ed370c8d7d6f0a28aa0439f15ab1998a842844c73506b1fa5b9041fc600aac1d
-DIST nvidia-persistenced-535.98.tar.bz2 48567 BLAKE2B a013d367192dc37fffc32ed91c2b4b4af09504e4df2bbdde604d8413615edf4b85a585c38cf06293dd7eae09cdef364127520f693ece0bc265ebcbda41fec71a SHA512 da6d31b79da82fb22ef1f385d1ec91708a7b412b67cf8af710a91556af0b0231d8458b276409b257923da386d4ffadbc78e35ccfcb8cdb7719534a762e30f1a2
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
 DIST nvidia-settings-470.199.02.tar.bz2 1062171 BLAKE2B d247b4a9e8d836b3e37116b51e8dfc36fa23ffc45bf4e21e84d6174adbc45ea8605675b146cf109311412e736995a51d0d0503d182a35507690f384e87202005 SHA512 0a2794e795ddf579f6bc27de2795119e62c6b9cc8e1641ada3e4954a89ef2a7796e88e3299cea113f269838b5bf084ed3c07304d5d34d410c5483c135b13b356
 DIST nvidia-settings-525.125.06.tar.bz2 1087893 BLAKE2B 0aa44617be40469ca43d325436f2dbc6af1a7c813c5da189bd727130bd8c7013bc0bbd45abd0df7eb64c4ec2ec17ca651188014005a8ea4ae63070619c956ce3 SHA512 b3503e821ab84a7fc8361ea5e7277b03048397f188faf3c277455920aefdb194b6cd99cc179b67d64042427a0d4685bbb740463466e6d6f8fc143af2f9af55b2
 DIST nvidia-settings-535.104.05.tar.bz2 1094128 BLAKE2B 040481bb948b29bd73ee8f6ee649c6aaca64c696c3f48da1641998ad932a03003e7084b9a1a2704c98c6c61fcd87e6491c316048b40750e18fb940fc792b1bb8 SHA512 ccd6cc1ca2cb8a61c3f47ec0f9fe9a166763577dd430255372998f499dd028db021ce963ca4265342ff838cadd7dae8b45f5cfaf7f9c879e56798e88be5f373b
-DIST nvidia-settings-535.98.tar.bz2 1093244 BLAKE2B 151fb58b3d05412bc3a3495618bbafef1f63cf239adff0567064242d74d7ff64c2ba7751a22248e661987b274e8de504f6bcf196912ba64b42228a718a4aba45 SHA512 d5b1b9cf816ebf2d4ccfc4a9c24853342fd810534a99dc5d8e076c01d7d471748ea5519e5b26f51483c774e240428ca1b6f05e986d41e11517e3eab14fb799c4
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
 DIST nvidia-xconfig-470.199.02.tar.bz2 108683 BLAKE2B 80e5b356f1b2a10b2f0d1a139b511fa79af925d5cdac80ebd04fe53b4ec26df599985a3ee4be1cb466415ec8fb292e3b8b85013aaa21226a9301351490ddb28b SHA512 0c1d18af896b8cb3a4992025ed207c9bcf2211e6a8e904755d51ce1d3791db89c0baa4571f9eb5198a5fcd13ffd41deec416c622f8207bb7dd23decd9864ad89
 DIST nvidia-xconfig-525.125.06.tar.bz2 111119 BLAKE2B bd9ef08c361e969775522911a931a25b4512a59d9aa2f90ab1be1696161cd127f20c526b31173d0226408c74da14b5cb381c717d6b8b8b3975b2449e5beb7d9c SHA512 7595f88004aa23595364dd25db35986abb802de80c9e70c9f22367184859057140271dcfd8688ec9d686ca67ae85740c21300ddebd1dbd78af5660896154f3b4
 DIST nvidia-xconfig-535.104.05.tar.bz2 111008 BLAKE2B 3656fb5410a80113fb6198f8f49754538786394cf9fd911332cd6f23b0076b71a81612f213facd290d50806e5c35c3ed935edfbe356d0992c22d6cbc91c87bd4 SHA512 fa5f6b800344b22efeb9662954e7a3513c52f197d72d2a9bc4e66afb9d1656d4d248ac0c085915d2ce5c68fe067f27042ff195d6425dc189a7b70a56d102a27a
-DIST nvidia-xconfig-535.98.tar.bz2 110497 BLAKE2B 679a902359365e68001661af6448be0fd26c028baf2d45c2566df3368df9378de94b77c969701dbd2f47dbf7decd3ee0a1404adabb01f4d4984772680183a8d9 SHA512 e519d2114f050c7750f490beca28dc9dcaa87df2a0a1f5d268048e88f6996ff32ad185750e6164602d3489d9c295e0e933c51c346b122eba629d28970d66dbf3
 DIST open-gpu-kernel-modules-535.43.09.tar.gz 12753157 BLAKE2B 80b5294efee18a085ca4b0bca9f0b001cbd42a15094fd7e8d1ee3031334b25aa421552ca9154802da8604bfb7c3f1a2cc67ad7cac226d5e361a37ca9928f0b0e SHA512 c2024a80a16b4acfcaa43cf2febfd9203c26289e95134f9d3b3147297f52e2e5605de0e83ea99d9c6ee65b0e4d8cd36a49558c0410ab19598524f7de926ead1f
 EBUILD nvidia-drivers-390.157.ebuild 14000 BLAKE2B 805fa37475ab2580dcd4f5d24947ff401e6d7932e79cfa3994d0b362f33672e15fe99a812458c44d2dd2012e3a4e9965203edacd9cfc99e35f895c90e1324139 SHA512 68ad898a113db55ff402ce95c30363ff32e18d907362a96d8169b54a671894c9767843a500d1f620ac01ef9ccdbd9a5878dfbb955836f214072ec7b0b0e860cf
 EBUILD nvidia-drivers-470.199.02.ebuild 14656 BLAKE2B 4f67bea9cf732e0aa4a8333687a1f47c8fd657d1af648a5f38c595fcea084445e2ca7f6e8ab2d9d9646e1ffe1b7cb39df7564288880050121cf0c289427024b6 SHA512 8db360878365d1be726eaaf5c1645d863faf6324e9ac57151ace55071690c9fb974804ca5f915c0a760a74e72a22548013bc5fae34bcff86c39c17b59f8300fe
 EBUILD nvidia-drivers-525.125.06.ebuild 16960 BLAKE2B 0dfcd83e2e9760aabf91d2717dff6f1cc4a57854532a4f338d9c5aa801041269a7901db08cb8922018a563cf01c721fcaa2a31a4cede9b40c07befd72a801a3f SHA512 11b44447bdec3ea67910a16d1e86da84af0097c31b4bbea1950b1a3b0694f30f820d30c30c9b88de8bb43ff5603a56a6fad421d798e2ae6e6c87b1b8b4743b46
-EBUILD nvidia-drivers-535.104.05.ebuild 17462 BLAKE2B 63e72ccb1aea5f9b9a17820c239b49e11e254bcce6a809ac4cd9b5824a44f0cb0da3ae9054a8504eeb70f81ddaa7b8a29d00f4ef4f27f8ce37e7fad9111eb56e SHA512 c40a7e7120bd876b3521212579d9f727a8c167c82eebbf0379d8911dcb8669ccc799f426f023708d23bc1c8395a2e9e628ba1a4ef90bc6e16a59b6c66b33b601
-EBUILD nvidia-drivers-535.43.09.ebuild 17473 BLAKE2B ef9372c4c7f6d36d6b5950f6f1ff2e97cabc8a1a726e4cc036f58f40fd97a95fa96c158d84229235c5c0dfff8f59b9086d221232b6c556fee1c661c57311f021 SHA512 f2ed713cc08e1655a1bd570462b41013e8216572535d25e181ddef2ab31b596d50927ab663feb70e6be95529b1e5b40bd9470e08643c0ed10f90e499293c8e49
-EBUILD nvidia-drivers-535.98.ebuild 17462 BLAKE2B 63e72ccb1aea5f9b9a17820c239b49e11e254bcce6a809ac4cd9b5824a44f0cb0da3ae9054a8504eeb70f81ddaa7b8a29d00f4ef4f27f8ce37e7fad9111eb56e SHA512 c40a7e7120bd876b3521212579d9f727a8c167c82eebbf0379d8911dcb8669ccc799f426f023708d23bc1c8395a2e9e628ba1a4ef90bc6e16a59b6c66b33b601
+EBUILD nvidia-drivers-535.104.05.ebuild 17081 BLAKE2B 5e89d002f8f9abe8f211f87e46bbc4d48878f8f395ba625fa37f051bc4e288defc0b33ea1377ee3d7d5ebda2035f2352a4df890ccfd3ff0759d93ba816881137 SHA512 60ef8c6d9343b355d67d766c6914aaa49c499582f10e5937aed4acb7de8b2c87dd9abfdf0b9cafe1a09ed39a5e064704321e06ea57cd789a3c515fa87923c8cd
+EBUILD nvidia-drivers-535.43.09.ebuild 17092 BLAKE2B 39d09a951f48d1f3d5439ca6bd3679964f3c5c68288553986f6f70d4ce0b0608300d4f7b4d0047bd87a1cb4e406a2f93bafec7b9662467e5f18f4cf7d7ad5b1c SHA512 78585e51b271d9bfb801e2b174b77c8ffeec66d9b8bf9b20c64aa21a8a965341183b9fbbcbd20238b561d2afe3551d06c93f5835eaadbcb2a0b7dd3ecce45786
 MISC metadata.xml 1276 BLAKE2B 9fd18d8984ae4440f9623426edea81096b3aef9e591737d45f434848a24d50bda3ea6fa14fa412a9a59404b6256f00147b1a4650cf5f7a1a1445363fd844b522 SHA512 e46e21f95ea3b84dae5dee6bd2fa61efa4df7ebbf9ecb8033d5d590ad05c1343119822a50a156c3a46fcec5fbd1977cb6d6fc74c32e64ac4e8ded9760f09d91c
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild
index 5b7e42606c89..d58319e453af 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.104.05.ebuild
@@ -27,13 +27,10 @@ KEYWORDS="-* amd64 ~arm64"
 IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
-# wrt openssl, can only use exactly :0/1.1 *or* :0/3 (prebuilt) but depend on
-# a simple >=1.1 given a || ( ) block confuses portage with subslot "rebuilds"
-# TODO: change to a hard dependency on exactly :0/3 when :0/1.1 loses relevance
 COMMON_DEPEND="
 	acct-group/video
 	sys-libs/glibc
-	>=dev-libs/openssl-1.1:=
+	dev-libs/openssl:0/3
 	X? ( x11-libs/libpciaccess )
 	persistenced? (
 		acct-user/nvpd
@@ -250,11 +247,8 @@ src_install() {
 		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
 		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
 		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+		libnvidia-pkcs11.so # using the openssl3 version instead
 	)
-	# TODO: hard-depend on openssl:0/3, drop this, and add pkcs11.so above
-	has_version 'dev-libs/openssl:0/3' &&
-		skip_files+=( libnvidia-pkcs11.so ) ||
-		skip_files+=( libnvidia-pkcs11-openssl3.so )
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild
index 65339f5d791d..cca0de3cf882 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.09.ebuild
@@ -28,13 +28,10 @@ KEYWORDS="-* ~amd64"
 IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( modules )"
 
-# wrt openssl, can only use exactly :0/1.1 *or* :0/3 (prebuilt) but depend on
-# a simple >=1.1 given a || ( ) block confuses portage with subslot "rebuilds"
-# TODO: change to a hard dependency on exactly :0/3 when :0/1.1 loses relevance
 COMMON_DEPEND="
 	acct-group/video
 	sys-libs/glibc
-	>=dev-libs/openssl-1.1:=
+	dev-libs/openssl:0/3
 	X? ( x11-libs/libpciaccess )
 	persistenced? (
 		acct-user/nvpd
@@ -251,11 +248,8 @@ src_install() {
 		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
 		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
 		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+		libnvidia-pkcs11.so # using the openssl3 version instead
 	)
-	# TODO: hard-depend on openssl:0/3, drop this, and add pkcs11.so above
-	has_version 'dev-libs/openssl:0/3' &&
-		skip_files+=( libnvidia-pkcs11.so ) ||
-		skip_files+=( libnvidia-pkcs11-openssl3.so )
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
 		$(usev !modules gsp)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.98.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.98.ebuild
deleted file mode 100644
index 5b7e42606c89..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.98.ebuild
+++ /dev/null
@@ -1,509 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_IUSE=+modules
-inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1
-inherit systemd toolchain-funcs unpacker user-info
-
-MODULES_KERNEL_MAX=6.5
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
-	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 kernel-open persistenced +static-libs +tools wayland"
-REQUIRED_USE="kernel-open? ( modules )"
-
-# wrt openssl, can only use exactly :0/1.1 *or* :0/3 (prebuilt) but depend on
-# a simple >=1.1 given a || ( ) block confuses portage with subslot "rebuilds"
-# TODO: change to a hard dependency on exactly :0/3 when :0/1.1 loses relevance
-COMMON_DEPEND="
-	acct-group/video
-	sys-libs/glibc
-	>=dev-libs/openssl-1.1:=
-	X? ( x11-libs/libpciaccess )
-	persistenced? (
-		acct-user/nvpd
-		net-libs/libtirpc:=
-	)
-	tools? (
-		>=app-accessibility/at-spi2-core-2.46:2
-		dev-libs/glib:2
-		dev-libs/jansson:=
-		media-libs/harfbuzz:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,abi_x86_32(-)?]
-		x11-libs/libX11[abi_x86_32(-)?]
-		x11-libs/libXext[abi_x86_32(-)?]
-	)
-	wayland? (
-		gui-libs/egl-gbm
-		>=gui-libs/egl-wayland-1.1.10
-		media-libs/libglvnd
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-kernel-module-source-515.86.01-raw-ldflags.patch
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
-	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
-)
-
-pkg_setup() {
-	use modules && [[ ${MERGE_TYPE} != binary ]] || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!SLUB_DEBUG_ON
-		!DEBUG_MUTEXES"
-
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set and, if the CPU supports the feature,
-	this *could* lead to modules load failure with ENDBR errors, or to
-	broken CUDA/NVENC. Please ignore if not having issues, but otherwise
-	try to unset or pass ibt=off to the kernel's command line." #911142
-	use kernel-open || CONFIG_CHECK+=" ~!X86_KERNEL_IBT"
-
-	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
-	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of another option that requires it such as CONFIG_KVM."
-
-	linux-mod-r1_pkg_setup
-}
-
-src_prepare() {
-	# make patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-		-i kernel{,-module-source/kernel-open}/conftest.sh || die
-
-	# adjust service files
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
-
-	# use alternative vulkan icd option if USE=-X (bug #909181)
-	use X || sed -i 's/"libGLX/"libEGL/' nvidia_{layers,icd}.json || die
-
-	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
-
-	# makefile attempts to install wayland library even if not built
-	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
-		nvidia-settings/src/Makefile || die
-
-	# temporary option, nvidia will remove in the future
-	use !kernel-open ||
-		sed -i '/blacklist/a\
-\
-# Enable using kernel-open with workstation GPUs (experimental)\
-options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
-}
-
-src_compile() {
-	tc-export AR CC CXX LD OBJCOPY OBJDUMP
-	local -x RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" # raw-ldflags.patch
-
-	local xnvflags=-fPIC #840389
-	# lto static libraries tend to cause problems without fat objects
-	is-flagq '-flto@(|=*)' && xnvflags+=" $(test-flags-CC -ffat-lto-objects)"
-
-	NV_ARGS=(
-		PREFIX="${EPREFIX}"/usr
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_LD="$(tc-getBUILD_LD)"
-		BUILD_GTK2LIB=
-		NV_USE_BUNDLED_LIBJANSSON=0
-		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-		WAYLAND_AVAILABLE=$(usex wayland 1 0)
-		XNVCTRL_CFLAGS="${xnvflags}"
-	)
-
-	if use modules; then
-		local o_cflags=${CFLAGS} o_cxxflags=${CXXFLAGS} o_ldflags=${LDFLAGS}
-
-		local modlistargs=video:kernel
-		if use kernel-open; then
-			modlistargs+=-module-source:kernel-module-source/kernel-open
-
-			# environment flags are normally unused for modules, but nvidia
-			# uses it for building the "blob" and it is a bit fragile
-			filter-flags -fno-plt #912949
-			filter-lto
-			CC=${KERNEL_CC} CXX=${KERNEL_CXX} strip-unsupported-flags
-		fi
-
-		local modlist=( nvidia{,-drm,-modeset,-peermem,-uvm}=${modlistargs} )
-		local modargs=(
-			IGNORE_CC_MISMATCH=yes NV_VERBOSE=1
-			SYSOUT="${KV_OUT_DIR}" SYSSRC="${KV_DIR}"
-		)
-
-		linux-mod-r1_src_compile
-		CFLAGS=${o_cflags} CXXFLAGS=${o_cxxflags} LDFLAGS=${o_ldflags}
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe
-	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
-
-	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
-		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-			emake "${NV_ARGS[@]}" -C nvidia-settings
-	elif use static-libs; then
-		# pretend GTK+3 is available, not actually used (bug #880879)
-		emake "${NV_ARGS[@]}" BUILD_GTK3LIB=1 \
-			-C nvidia-settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-	local -A paths=(
-		[APPLICATION_PROFILE]=/usr/share/nvidia
-		[CUDA_ICD]=/etc/OpenCL/vendors
-		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-		[FIRMWARE]=/lib/firmware/nvidia/${PV}
-		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-		[OPENGL_DATA]=/usr/share/nvidia
-		[VULKAN_ICD_JSON]=/usr/share/vulkan
-		[WINE_LIB]=/usr/${libdir}/nvidia/wine
-		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-	)
-
-	local skip_files=(
-		$(usev !X "libGLX_nvidia libglxserver_nvidia")
-		$(usev !wayland libnvidia-vulkan-producer)
-		libGLX_indirect # non-glvnd unused fallback
-		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
-		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
-		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-	)
-	# TODO: hard-depend on openssl:0/3, drop this, and add pkcs11.so above
-	has_version 'dev-libs/openssl:0/3' &&
-		skip_files+=( libnvidia-pkcs11.so ) ||
-		skip_files+=( libnvidia-pkcs11-openssl3.so )
-	local skip_modules=(
-		$(usev !X "nvfbc vdpau xdriver")
-		$(usev !modules gsp)
-		installer nvpd # handled separately / built from source
-	)
-	local skip_types=(
-		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
-		OPENCL_WRAPPER.\* # virtual/opencl
-		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
-	)
-
-	local DOCS=(
-		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-	)
-	local HTML_DOCS=( html/. )
-	einstalldocs
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usev modules "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
-$(use amd64 && usev !abi_x86_32 "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For additional information or for troubleshooting issues, please see
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers and NVIDIA's own
-documentation that is installed alongside this README."
-	readme.gentoo_create_doc
-
-	if use modules; then
-		linux-mod-r1_src_install
-
-		insinto /etc/modprobe.d
-		doins "${T}"/nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-	fowners :video /usr/bin/nvidia-modprobe #505092
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	if use persistenced; then
-		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
-		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
-		systemd_dounit "${T}"/nvidia-persistenced.service
-	fi
-
-	if use tools; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-	# mimic nvidia-installer by reading .manifest to install files
-	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
-	local m into
-	while IFS=' ' read -ra m; do
-		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
-			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
-			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
-
-		case ${m[2]} in
-			MANPAGE)
-				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
-				continue
-			;;
-			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
-			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
-		esac
-
-		if [[ -v 'paths[${m[2]}]' ]]; then
-			into=${paths[${m[2]}]}
-		elif [[ ${m[2]} == EXPLICIT_PATH ]]; then
-			into=${m[3]}
-		elif [[ ${m[2]} == *_BINARY ]]; then
-			into=/opt/bin
-		elif [[ ${m[3]} == COMPAT32 ]]; then
-			use abi_x86_32 || continue
-			into=/usr/${libdir32}
-		elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then
-			into=/usr/${libdir}
-		else
-			die "No known installation path for ${m[0]}"
-		fi
-		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
-		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
-
-		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
-			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
-			dosym ${m[4]} ${into}/${m[0]}
-			continue
-		fi
-		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
-			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
-
-		printf -v m[1] %o $((m[1] | 0200)) # 444->644
-		insopts -m${m[1]}
-		insinto ${into}
-		doins ${m[0]}
-	done < .manifest || die
-	insopts -m0644 # reset
-
-	# MODULE:installer non-skipped extras
-	: "$(systemd_get_sleepdir)"
-	exeinto "${_#"${EPREFIX}"}"
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	dobin nvidia-bug-report.sh
-
-	# MODULE:powerd extras
-	if use amd64; then
-		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
-	fi
-
-	# symlink non-versioned so nvidia-settings can use it even if misdetected
-	dosym nvidia-application-profiles-${PV}-key-documentation \
-		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-
-	# don't attempt to strip firmware files (silences errors)
-	dostrip -x ${paths[FIRMWARE]}
-
-	# sandbox issues with /dev/nvidiactl (and /dev/char wrt bug #904292)
-	# are widespread and sometime affect revdeps of packages built with
-	# USE=opencl/cuda making it hard to manage in ebuilds (minimal set,
-	# ebuilds should handle manually if need others or addwrite)
-	insinto /etc/sandbox.d
-	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/char"'
-}
-
-pkg_preinst() {
-	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
-
-	use modules || return
-
-	# set video group id based on live system (bug #491414)
-	local g=$(egetent group video | cut -d: -f3)
-	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	linux-mod-r1_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		if use modules; then
-			ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
-			ewarn "(e.g. API mismatch messages in the \`dmesg\` output), please verify"
-			ewarn "that the running kernel is ${KV_FULL} and that (if used) the"
-			ewarn "initramfs does not include NVIDIA modules (or at least, not old ones)."
-		fi
-	fi
-
-	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
-		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
-		ewarn "this may lead to system instability/freezes with this version of"
-		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
-	fi
-
-	if [[ -v NV_LEGACY_MASK ]]; then
-		ewarn
-		ewarn "***WARNING***"
-		ewarn
-		ewarn "You are installing a version of ${PN} known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
-		ewarn "are available or fully functional, may need to consider nouveau[2])."
-		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
-		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
-	fi
-
-	if use kernel-open; then
-		ewarn
-		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
-		ewarn "and only for modern GPUs (e.g. GTX 1650+). Try to disable if run into issues."
-		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
-	fi
-
-	if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
-		elog
-		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
-		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
-		elog "experimental but is required for wayland."
-		elog
-		elog "If you experience issues, either disable wayland or edit nvidia.conf."
-		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
-	fi
-}