gentoo auto-resync : 21:07:2023 - 01:09:27

198 files changed, 3068 insertions, 392 deletions

diff --git a/Manifest b/Manifest
index 24c97a6ee575..7f50913db9fc 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29274 BLAKE2B 48ad3782d8c0410839106b48772e095d974170e4b6c22fdd0c65d72746959c80040c66f3558489c8164d5d70265c9bb83446455d0fe46d65288365c72815757f SHA512 9f5e8ca604b8ff08b760ef89707012ac8f88ea70c260d1d45d1eda0ac11a28b005e0c46062af7fd8755c7d18b099e56e9ea1cfa4ab43de86adc881fb36fe8455
-TIMESTAMP 2023-07-20T17:40:08Z
+MANIFEST Manifest.files.gz 29291 BLAKE2B 29725fd481a4581a714e3353e1a1557bf6066ced3e2ae77547ca2c7d4197c79339a2426b0939602497f4efa04207ab667dd35f6003e98dc2a4a90e840decacc0 SHA512 b885d226996590c16467b388cac2e9b3a1a16f3ae3a9be67f4beeabf725a0887f607d4ffeda1ef3930b77399751dd1b4e078ce8c21f7816d54ed5a4c0091ed92
+TIMESTAMP 2023-07-20T23:40:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmS5cXhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmS5xdZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDbxA//U9OFlChWIVI7k5g2CKr5+qs2H8GpsdWNqUliWSTMOfVzXq6OjGiCgJEZ
-ld0yJ/eQzRaPKO5E3YvKkWJcyPMsQK1k1IilClnGYmbNKbZ901Oe1jH1IiZszzIF
-3KRRtW5F45i2R7YxrAE9fa3zgQtenE1RHykMZkqQZQS5jnvmt2lqAaowwVSMwWO5
-6hpuG3wImZ9OR90BWjjO3pxIEFZeu97wxAiN1vtSs09LM1n3SzJ5phzUGR+Dx5II
-R+p4/4vm7Ja7CX101Cujm2SfuS3myAUM9piJpAdewD+RIxJv7xvH+gdnoUdbWHEm
-cKNdnPX70i7UIdTMWgzGEsvERd/3IuOMs6ODSQXVlWF6b5vQihttvHG13MMKduiG
-RNjWFTKCSXW+KsULZTuZBZN4hmwDpqBxfOKozs4f75z+f+8CoBjmBNNV+nY0XXMP
-/Ww0oXFYmhEE50h3bdWZPDZlHUN3wiTdX0MVt4Vflb853XZalkMVxk9hO+cgx9bl
-HOdtShdTsv1yTswfykZlOhf1fh5IuSmb/eTyzJc2Fz1PU0HtIbmz2h2cg0G9zmId
-AR2E6SlO1Sfa8g1ohulJs+W1QgoO84PpuWm2WcR/ueB3i6sPl2g764ncPY4TZb9m
-jcVG1gGi7dNm4TqbZVieaQAMmtxy54JF5GPHvwXBvxsDb3+bXlc=
-=rHap
+klB6tg/+ITYWf0N4DhTDtv455bT8aP/BK4yrtAW80BKlJKy1q5ynSI5qA1A861Fr
+on9L9gqRq0an73h4Tj/qZ1HhIdLm8T8IVjmf+uA6eqyHE8mcOhbwYQOlpF7Msn+0
+q5dNGfiMxN2AHZWpaj39cDqRBStnYVVhwDfTnFtd3w1vnlO4StRbbJ732qJbGIf5
+sCmlMBaZsS+55HaQloO4tw/OOOaqSRYRAH3W1Rq4xFui4nDjmvw4sNUtBBNF4rLa
+ydcdJVKG+ighOjwNo2814tSgbJGDHogiGCB5pQO89LG0bAQmlkNTt5NDieGtUOvr
+r7cAyIUKb/+xLothd2zrbz5hBadDZikgBVliFsZV5GKXnJP5acWXRYBMeONJYAQP
+1ze/FVn7ZniPm50Lzw07VmwKDQMQX+CclXp2mgDZxeDB9ZoDnKbudZIlL6iDwC09
+j+X4QtJkheDSn7gzK+lH+XoeIWuM373rgjUG/VcHr1rnmzjEJjt5ZR+/JOqsLjpg
+zrGknlPt2iHPp3xDw6YE9DGd4VWXHvcRbkh77NCfTSbItkFy7jOF93ulhZWyyx2v
+wa6R0a706V+cQPmVvmpdUuVO+PWnOrh55Dcr8sj8Gqw96jS+yzy2CyvssQPlw2Gj
+WhYDdZ7C9XxhYjjSlZIJ3VQpst6zx07ldZSApOY7eH92mXIBaaI=
+=cXto
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 50f80963796b..0987313fa09d 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index da428f612d37..b7a30b6018e8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 8e8dad7f64ab..62d1a17a4e12 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,10 +1,11 @@
 AUX consolelog.sh-r1 276 BLAKE2B 0db3c2201f4d628a4e650b39aa17998e0523bc33861375d3bebd2729e649451793ebed46bfbdfee5c56d79902c489152d57d6e3951a19dbb872e5e1f9711e11d SHA512 022bc6510cf744e1beded8999f61e87ae31dbb151d5abbc4acee6f37a46684edcceb5259d6ea25e0ceea5a3056bb50fde869e97371678f302269b31be2cade0b
 AUX metalog-0.9-metalog-conf.patch 269 BLAKE2B ed59aa36a7388b4f91be80731fcfda0c806fc8bb90b86ca6357fea949ff6f231b42b37fdf2f044541c07fbbc4b0a67db4d6dcdcb18c9cd5091e2c3106bb4fc34 SHA512 0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df
+AUX metalog-20230719-metalog-conf.patch 387 BLAKE2B 18dfdb4f24d2b0b6ddf9fcbb92a2b3fa34d59985fd502850a38b2e84f6638275b52efd07c9b317b444bcd765d3bdf06f6572367150aa71e1c8f8a96b52519e01 SHA512 8c54f5e04b37747ebd6a23d45dd94b477c6900552724861cd49564232e0c0a2c9b225622a836dfe063d60e3e6e67840274d64b25e0c401b0430adb18bbc6a0e0
 AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac642195c7566667c7a330a4113acdd451522c907aa0814195ed5124aa92184bfca08eddc670b2d3f SHA512 4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e
 AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7f67e6cd347ef3361fe7212ce1441ba4a582cb0e59f8b2c9d2e7832b4e8b4f019c87d268a2833639f0 SHA512 09d8ac585418c6a3dfccc9d0f1a050b5862924712d78dc44fce3cb497bb362afe0a556240b14cf957fcdf64d0d06f5b6a8df4372c69129b43dc3520ecd310344
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd
-DIST metalog-20230707.tar.gz 41729 BLAKE2B e027b918c3b6d795459d9b219a5d84a7813a27b48b6be9e059c19dd2ea546d24e48724360968a2078be8b81b32b296d5444389616afdc16ce9234fd105ee37c9 SHA512 ab341f5f2ac757e4579a1f4fad2a92fd446fe7e930e95e55231830d88bf177f79102f99554b56da0529aaa6fc37c02863824705bde2f47546d44284ab13538b9
+DIST metalog-20230719.tar.gz 42579 BLAKE2B 6088c86fad90185fcb22a96ff88686647eac1fb4216884f43c07dff23274efc748c908f6f98162f743d2528437748f79809dfe6911d8d47e6cf7e58c8f3ca3b4 SHA512 a717dca5e00e9e66b97a84c3dbb0cdda522cbe628fad4cfbcb5256ee69659c63149bbb1e8797028bbab55d97787661c1d7316c7c2cbfe3b65932f84d64af15f6
 EBUILD metalog-20220214.ebuild 1596 BLAKE2B 53c041f5274b99fadb2f50447e0586b4c6ff50cef2352fa6ccd94fb81b5415e5c19eb7fa5ead9a78790005ecab64bbb116a24c4503c60ee7aa7757adf2bfbfc8 SHA512 ff8ce0ffb00b10176481a91488a99a143f50989f987901d0f92eaa84dbe48c7eec0da7b5552498fe89121ccf2f0f4731a5c44ce2f29d625f85adffaed6f73785
-EBUILD metalog-20230707.ebuild 1610 BLAKE2B d520fc2a1e579d4cc351029abd6774b6f38e38d5441a5c390edd384427e08135ec73bc100b31f8c1b296fa6a02f8da9466452cf6289cfaed4aa40ceb55fcbc41 SHA512 020a787671af37e15e6571077ee26c64c15a248dee78127af4761e770bef12b179d672b9185f9ea03c774000aa0265c69abf676a15b4b7adbeff461c6d49210b
+EBUILD metalog-20230719.ebuild 1620 BLAKE2B 4a1576b0815ff4b652d3e0743a38f42d54f187bb93b2960784383cb685d4d00b40c32dea8805508faaae54b33de9bd75449d3ae068f04e78a3b476087ac5c62e SHA512 c15ec77bce5ec82013a5346342f59efd57a6890cd0046d1832ea5a3f2cdabc964e0733c5c54bef89805cef47a20e1aeb70441ba83693ebd72c9fdca7d60fd896
 MISC metadata.xml 390 BLAKE2B 84c414c7f1c23c5eff546e465a36844c13f5f774c0e53117a1d3584af4f16a1bebeba681f6714af316437f2125ee2f65f0a1fb110699438e8d6a28f4aa0fd6f8 SHA512 5656e552504213e621d2804cc877f623feb243a166b7da0507a3ac1d934db9d438b6d087ba9d7b0d2c38551227bd0c190e42374771bdc4422fc263b894101998
diff --git a/app-admin/metalog/files/metalog-20230719-metalog-conf.patch b/app-admin/metalog/files/metalog-20230719-metalog-conf.patch
new file mode 100644
index 000000000000..504c2a28291f
--- /dev/null
+++ b/app-admin/metalog/files/metalog-20230719-metalog-conf.patch
@@ -0,0 +1,13 @@
+diff --git a/metalog.conf b/metalog.conf
+index 8f53b87..54332c6 100644
+--- a/metalog.conf
++++ b/metalog.conf
+@@ -44,6 +44,8 @@ maxfiles = 5
+ # merely write $@ to some device (your console for messages):
+ # echo "$@" > /dev/tty10
+ #
++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog
++#
+ #console logging:
+ #  facility  = "*"
+ #  command   = "/sbin/consolelog.sh"
diff --git a/app-admin/metalog/metalog-20230707.ebuild b/app-admin/metalog/metalog-20230719.ebuild
index 91000efc30e5..4e0803b008b6 100644
--- a/app-admin/metalog/metalog-20230707.ebuild
+++ b/app-admin/metalog/metalog-20230719.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools systemd
 
@@ -18,14 +18,16 @@ IUSE="unicode"
 RDEPEND="
 	dev-libs/libpcre2
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 BDEPEND="
 	sys-devel/autoconf-archive
 	virtual/pkgconfig
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.9-metalog-conf.patch
+	"${FILESDIR}"/metalog-20230719-metalog-conf.patch
 )
 
 src_prepare() {
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 0f7b9b7a0e2f..2ceaf16fd020 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 70278747d0f6..4307b03693e1 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -2,6 +2,8 @@ AUX containerd.confd 124 BLAKE2B 25f72941a47374fa0de3a2dce3d8ca57420f013a0d7527e
 AUX containerd.initd 794 BLAKE2B 88a1976615e4e9d67c10ed3748aadd74ae13ef4cf004bb5b5d45216275715e3acffa8c0c98309d81298795ac007bde02d2f3afd466c7c54e58012a12f156198f SHA512 f31b088e988beb84ef029992255018561417c0e92803dffe35ec481515e1be79ba4611cc139bb5000b0ac79a437f1a6dec3516d6f9580d4b384f1e0f092d8370
 DIST containerd-1.6.19.tar.gz 8706434 BLAKE2B cd6a85721f0752b6c7c5c098153d581375db6f877e261097a7d74a78dc0957e6beeea38c1aa7c53227ed84e727744811fa38863097cb137b8ba775e1f04fb9b2 SHA512 dca78d472dfbc6fc4d9b0b3a0d0a131d3575163c52e4fe18ea2c6147868b8822c54046c0709974e9b90472b882ba3890ada7f0fcbf31549efffba0d91531886c
 DIST containerd-1.6.20.tar.gz 8749093 BLAKE2B b2168f68ba45f5e0c589946fdfcded8c57801340e10f4fe6374ab9caaa740888246df49322b880a06bd665ad98bbafc8c39d44059a00f446c7cc24bbdb357eb8 SHA512 dd9708c99d95773a78b0fcd77b388cb8a971d0d65502c8b86cbb3b29c48bac31366ae0603d7710a13c21c33adcd341cdec69dcb3c3a06a2d753c4c59f2549d75
+DIST containerd-1.7.1.tar.gz 9682254 BLAKE2B f168070caf2b76f0be350a98f41bfdbfe6d78344d68821fb92a29f839a6e847d795e5b79436e36f985aa88028ff1c3f44f134cf6bd502ddac22453a457bd952b SHA512 e9b00ba8f4dd1b5b1088060d3822f684611d43b367ddfeb1bee1660140af85f31e9c9bfc600a67e8fc8645a625dc4e1919d9af7291bdeaa607bff7065a4fc945
 EBUILD containerd-1.6.19.ebuild 1927 BLAKE2B 7131884f709d6703034b75cd03dcd31e8bd7972177b415931fdeb4e2698ae6412e423a7596c1826d4ff3550eab34af98f73d1b19c2ee97498f503cd66a241892 SHA512 4d6f87a38149de29e87e6ee6ce5b54dbee16974138ed9ba8a7a101467dfeaebf58b76f220277fc5b616d45e7f90f5d84303f822e9e5692887724b601d6c6e6dd
 EBUILD containerd-1.6.20.ebuild 1950 BLAKE2B 99c7ab750bc6ad36268ae0b6ebd9a87df33cd5afafa7bdc1cf02174f9c7ce145fb208be9cec1af1731bc8e5d1fbe280e2b715a4473745f3f803d1a7c29357437 SHA512 2b77137f5643e91bdd2fbde132036073562bf87221c65d236ee37797b4ba2ceb80f630e079d73fe7d1623d636edc463b22d518598c81d87837852853b173fdca
+EBUILD containerd-1.7.1.ebuild 1950 BLAKE2B 8007c9f349189a679afff2247768309c8574dbcb8d15d53b3db4d73120eb4fe47f5220693ee29dd8dd46649ad24e425bf15a7c01c6f5ae5fbf2dccaf3490d919 SHA512 30364ea01f671c71e83df99927e843d175f8c9e8e9a4e9df7666080b5cb715755463c4ccf49c836d3b5ea7717ae7bcb06032d1eb4f92e34cebf7720966db07fc
 MISC metadata.xml 1093 BLAKE2B 692497be353e27b92d968142a155b5010a60f60739e1cfc9faeb966033f868c67e18c8feaaf661903266f160742a0c9e3d34485258df3ace9e8982d2ad3602d6 SHA512 18280d46fe79ecbcfd4e3f9cc139103da1fca31b6a5cfafb4c9c30d8b2a559fa30bf71f17f228a96c56506c5e18eb7c1f3340b5428c213be9e2e45e4cf5fc407
diff --git a/app-containers/containerd/containerd-1.7.1.ebuild b/app-containers/containerd/containerd-1.7.1.ebuild
new file mode 100644
index 000000000000..725ad4744070
--- /dev/null
+++ b/app-containers/containerd/containerd-1.7.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_REVISION=2806fc1057397dbaeefbea0e4e17bddfbd388f38
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+	${DEPEND}
+	~app-containers/runc-1.1.7[apparmor?,seccomp?]
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		-e "s/-mod=readonly//" \
+		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION="${GIT_REVISION}"
+		VERSION=v${PV}
+	)
+
+	# race condition in man target https://bugs.gentoo.org/765100
+	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+	einstalldocs
+}
diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index 7b361b41d71c..63bc0cc07a9b 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -1,7 +1,6 @@
-DIST docker-buildx-0.10.2.tar.gz 9187634 BLAKE2B 9a43a7bcb224f33d718928ef3070449cac4db87c951f4337368d0c994f211d4c3db3a5e9c309ce10e357ab24746bed2507e2867c9fdab3b51a5423787362fee1 SHA512 ba6b8baae1a8e24bf9ddc58d5e2451270fa6e3891bae83112ca00ae56b7a4842b45ec970898ec27a2123e312885bf0d8c58cc600d8462787242eb878f45cd877
 DIST docker-buildx-0.10.4.tar.gz 9184825 BLAKE2B f0e71c0f6dda5f02da4cf0b0514f67f5d339ba10359afc69aae25abf907447fd22fe3d92427299bc67aeaa6a84e748a8a5cbd86151b2baba2dd01f25cc04a793 SHA512 f82b89b8dd4e45524c8d353c4d7588f47b1c7b7ecf759fd9605247c1c7aa0ca152c3ecdec0e0b62b5eef05e6b65d2ca1f5ccab6d75819b92fc92ff62b44105b7
-EBUILD docker-buildx-0.10.2.ebuild 1419 BLAKE2B 9270f5131fc4ff742928ad8308a6017d5ec96dca156b50992d3df77477af5d302be5457b9745026e14f7129aaefb0a0aef6e1ddf3778f2157c73c26adce1f4b7 SHA512 b57cabd264c6e89158107691581ede6fab15cc108c7a7c3248f38c12d3137dd8d610bec6e2757f4c7863bfbebc43a68c6cd82d19d4e3c2ad8b5aefccf0d8b0bd
+DIST docker-buildx-0.11.2.tar.gz 10342565 BLAKE2B 1e034e9a07f36b46096f8f035869adc93b63af46cd9886f5ed4bc0939ce2f76b7f029a11ee536a34be23952e5c85251d757cec9ff05df172e3a26ea82a1bf0b1 SHA512 6f3718edf1e86c4422e1419580e4c38cf378a59555067be2aa6fac3e7f8878afe39d777765ace274cd9c47630f39cbacfacfdc4ecadd6ff46d5ee37d8f9bc75c
 EBUILD docker-buildx-0.10.4-r1.ebuild 1509 BLAKE2B 6249c41dd3a487486299280496241ddc5a10aad213ab74ad14588f04f7ff65698411cb22c740804b35861f2d0eebfd4f7fb4119fb10c5c4b5d501e3a87bbe751 SHA512 cae6418005c70a6175452db13be6dae93157e07b9faec4bbf08cd911887b13847cdf7894b2c9fe49951b3323db8e751f9256566e5f1a499b2b337d03bf888901
-EBUILD docker-buildx-0.10.4.ebuild 1542 BLAKE2B 857e629af0ccf5f975884902bb58561aa9dfc65abc4613c7619925e2b0fbbf7b5a26cd073efaac44c61390506e32acf06b4b143812742faf064df07c3bde1d92 SHA512 a8db926dca24e0501448fd951d4bf5f151baf65da1b49ea6fbd5c3e7c50344b5a753f78438344b877535e421f8e5651508bec8e14d0406116865c035756956be
-EBUILD docker-buildx-9999.ebuild 1512 BLAKE2B 4ddf44f9fd348b374cc961c2dced227d31b7c915eb513edb14c9f3332cc0f7b3d42ba4e970b2caa99069205f9949853cb68905bd619351527e621c898ec7663d SHA512 8facddba40493ab8b7256fb6d488b37ddfb84fb75abc4c2dcec4fbe1cd6dbdc41a82137ad3a6f1a3439997083f24d206a302c133abb68e0f4a7d6d3166df11e1
-MISC metadata.xml 710 BLAKE2B e54ba5993825b2fa455c7ad33dc37d3edddbf74f19cc2e8ce3260fdac0d581c3c719d5f7252b7836d263efd020b4d3d90d717c3873531055418dbb556f02288c SHA512 f217f1f7f8ac31cbf5516630eea107a686394efc960384c67a216f80b57c61323b6b02b5dd1ae458817a851b9f166c684087790079e48b7d4a2a78130dc2a411
+EBUILD docker-buildx-0.11.2.ebuild 1544 BLAKE2B 528ca1df997bb69588c7e458ea888b930ccf53b4515a413a6d748a3e1a953c11b4a8ecfb91d8dbae8880196c02b09d5be87a443afc68613cd88078c602bf5075 SHA512 31daf408aa66ff74aff6cd8f9bf5e1e3a2164ac0b92d73a85fb073dd643c4e160869967d0a8b60591ad392aba46e9d6a04ce1a7709300a1479647eed54375712
+EBUILD docker-buildx-9999.ebuild 1544 BLAKE2B 528ca1df997bb69588c7e458ea888b930ccf53b4515a413a6d748a3e1a953c11b4a8ecfb91d8dbae8880196c02b09d5be87a443afc68613cd88078c602bf5075 SHA512 31daf408aa66ff74aff6cd8f9bf5e1e3a2164ac0b92d73a85fb073dd643c4e160869967d0a8b60591ad392aba46e9d6a04ce1a7709300a1479647eed54375712
+MISC metadata.xml 819 BLAKE2B eabae0ff28ea1eea91dff4633ae0edee670ec5fea2615c550b80b37d71e07c311073e4c17f32b50a46a670f46d5d8c536595058cdcf485b4002aa416328663b2 SHA512 e290b4c9af65f262a654f4bb5e5c7bedd7a246dc5804387d8c4823e6c7cd2b2eff7b671cd493145a5c1a6083861c5464004a1f626b65c18e91c9b9675d3831d1
diff --git a/app-containers/docker-buildx/docker-buildx-0.10.2.ebuild b/app-containers/docker-buildx/docker-buildx-0.10.2.ebuild
deleted file mode 100644
index 4c9132f3eb3f..000000000000
--- a/app-containers/docker-buildx/docker-buildx-0.10.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-MY_PN="buildx"
-DESCRIPTION="Docker CLI plugin for extended build capabilities with BuildKit"
-HOMEPAGE="https://github.com/docker/buildx"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/docker/buildx.git"
-else
-	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# This gives us the ability to neatly `-skip` tests.
-# not required once ::gentoo is all > 1.20
-RESTRICT="!test? ( test )"
-IUSE="test"
-
-BDEPEND="
-	test? ( >=dev-lang/go-1.20 )
-"
-DEPEND="app-containers/docker"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local _buildx_r='github.com/docker/buildx'
-	ego build -mod=vendor -o docker-buildx \
-		-ldflags "-linkmode=external \
-		-X $_buildx_r/version.Version=${PV} \
-		-X $_buildx_r/version.Revision=$(date -u +%FT%T%z) \
-		-X $_buildx_r/version.Package=$_buildx_r" \
-		./cmd/buildx
-}
-
-src_test() {
-	# TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism.
-	if [[ ${PV} == 9999 ]]; then
-		ego test ./... -skip "TestReadTargets"
-	else
-		ego test ./... -skip "TestGit|TestReadTargets"
-	fi
-}
-
-src_install() {
-	exeinto /usr/libexec/docker/cli-plugins
-	doexe docker-buildx
-
-	dodoc README.md
-}
diff --git a/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild b/app-containers/docker-buildx/docker-buildx-0.11.2.ebuild
index c294def7f490..8cecb6eed7ae 100644
--- a/app-containers/docker-buildx/docker-buildx-0.10.4.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-0.11.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/docker/buildx.git"
 else
 	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
@@ -28,8 +28,7 @@ IUSE="test"
 BDEPEND="
 	test? ( >=dev-lang/go-1.20 )
 "
-DEPEND="app-containers/docker"
-RDEPEND="${DEPEND}"
+RDEPEND="app-containers/docker-cli"
 
 src_compile() {
 	local _buildx_r='github.com/docker/buildx'
@@ -37,10 +36,10 @@ src_compile() {
 	if [[ ${PV} == 9999 ]]; then
 		version="$(git rev-parse --short HEAD)"
 	fi
-	ego build -mod=vendor -o docker-buildx \
-		-ldflags "-linkmode=external \
-		-X $_buildx_r/version.Version=${version} \
-		-X $_buildx_r/version.Revision=$(date -u +%FT%T%z) \
+	ego build -o docker-buildx \
+		-ldflags "-linkmode=external
+		-X $_buildx_r/version.Version=${version}
+		-X $_buildx_r/version.Revision=$(date -u +%FT%T%z)
 		-X $_buildx_r/version.Package=$_buildx_r" \
 		./cmd/buildx
 }
@@ -48,9 +47,9 @@ src_compile() {
 src_test() {
 	# TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism.
 	if [[ ${PV} == 9999 ]]; then
-		ego test ./... -skip "TestReadTargets"
+		ego test ./... -skip "TestReadTargets|TestIntegration"
 	else
-		ego test ./... -skip "TestGit|TestReadTargets"
+		ego test ./... -skip "TestGit|TestReadTargets|TestIntegration"
 	fi
 }
 
diff --git a/app-containers/docker-buildx/docker-buildx-9999.ebuild b/app-containers/docker-buildx/docker-buildx-9999.ebuild
index 48941a07ce98..8cecb6eed7ae 100644
--- a/app-containers/docker-buildx/docker-buildx-9999.ebuild
+++ b/app-containers/docker-buildx/docker-buildx-9999.ebuild
@@ -47,9 +47,9 @@ src_compile() {
 src_test() {
 	# TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism.
 	if [[ ${PV} == 9999 ]]; then
-		ego test ./... -skip "TestReadTargets"
+		ego test ./... -skip "TestReadTargets|TestIntegration"
 	else
-		ego test ./... -skip "TestGit|TestReadTargets"
+		ego test ./... -skip "TestGit|TestReadTargets|TestIntegration"
 	fi
 }
 
diff --git a/app-containers/docker-buildx/metadata.xml b/app-containers/docker-buildx/metadata.xml
index 42cd3f472a0d..14dd56055eaf 100644
--- a/app-containers/docker-buildx/metadata.xml
+++ b/app-containers/docker-buildx/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>containers@gentoo.org</email>
+		<name>Containers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">docker/buildx</remote-id>
 	</upstream>
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index 3504c45e9c45..bd644a267999 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,4 +1,7 @@
 DIST docker-cli-23.0.3-man.tar.xz 81976 BLAKE2B e7390b429d0db2445035da506bb796364f97e6560e766a28d1245e6a76c84314c38af1f3a946d2eb1785132d26805e0d3a76c374559e70989b64e8ce917f8423 SHA512 842d7187ad8a3933d815057ec535c13466c56bd051c7133e6e0a9c85f5140e4ef61b66771ee6788c8fb50d10652a86b663f29fe4ec3190773f70fd45f36fbcd4
 DIST docker-cli-23.0.3.tar.gz 6215298 BLAKE2B 817ca474d61839c8b5929db9bfa964b936285622859ab30f45be2f382238a5e49987fdbcdc896eaa7109f114166cf0e1dbc4f001cefe293a6c286b50e2737258 SHA512 873783a0fe9ecab3b8f251c842ba69070e0dffbb4a758c16165441b2f483d55d15b98fd7da0707e483995ac2d1fbb9a0f13f570b78486382b26d6ca6c5e612a9
+DIST docker-cli-24.0.4-man.tar.xz 82500 BLAKE2B 67b113ea0a0b8377a2ab8c887849e2d8e6a57cf914bf1c6a1cdcc44978e154ee5b18abdc1b509d3c7367760204bcb1b896f2335a6ff18470433b08f3ce82d346 SHA512 fe7320bb0bacbddba0b00c1351591eceb96386e0e5141b7c399d483f6e549b687b8b3db4b33c127ded118f723d6eb5cbb995733be13c362a0e680f96b221b351
+DIST docker-cli-24.0.4.tar.gz 6242506 BLAKE2B 2cc66a43dce613f0940a0aa2ffac075562ff58a483e68511f47a05bb27dc997547522ebd546d314c932d79eb366699b319d9ed561d481ef072bcd40d6993a6d1 SHA512 6b59e01ad975961f64a7c04c719b83dcd95875c223fc11dc3cb4fc6792b6a478fd014559a775ab59b8156e4476a1424cb997c7ae97a692be317b9e7d24ed92fb
 EBUILD docker-cli-23.0.3.ebuild 1916 BLAKE2B 714ccdfe708f2d2c9adae830189243a5fa38eaf144418bf77925e8e2acd5716220a96d5924b65b66bf3f8699336bb47c215f29fb58746089939755c813737562 SHA512 caba0e08042eb3694b82e4d8b8eb80bbf4823fed10048eae02529c7e87e23c53b0365eb609cb64e966d90515b571e72757aa5d1c23bb9dbc6af516f47906a111
+EBUILD docker-cli-24.0.4.ebuild 1919 BLAKE2B 5ced5e6d80f3c18975d2d690e774cc007143f339fbb0874b5fbbf6d2ff4fce5ef4704e3b648c0ef09f889d6e29e5b1314ee9ee901c23fd5eae3dbf29d7a2a4d0 SHA512 570b7e6789910ad1823c9501ec0cf40012199b3a061057ad9857fa7672b36470c4bbf4bf3bf7e14352c19a4dea4b331dcf0e14eda9faf5c613a2bc89f5213015
 MISC metadata.xml 689 BLAKE2B 45f4a07f9d949ad4e0175908af936140573bd257f7b11f9b9cc25cdd52bb821a294036635fd81662bcd348aa21e69b5582ab2dc8efaf94dbbdc9608b131414f4 SHA512 efe37f3ae8bc6b26433b7bacfda203ea3b480f419b343921214f19a4ad4e25b2cca5f0426a27348902f51ef15f558e81599ccdadcab6504f9d22314bb472d80c
diff --git a/app-containers/docker-cli/docker-cli-24.0.4.ebuild b/app-containers/docker-cli/docker-cli-24.0.4.ebuild
new file mode 100644
index 000000000000..3f8d95218497
--- /dev/null
+++ b/app-containers/docker-cli/docker-cli-24.0.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=3713ee1eea
+EGO_PN="github.com/docker/cli"
+MY_PV=${PV/_/-}
+inherit bash-completion-r1  golang-vcs-snapshot
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="hardened selinux"
+
+RDEPEND="!<app-containers/docker-20.10.1
+	selinux? ( sec-policy/selinux-docker )"
+BDEPEND="
+	>=dev-lang/go-1.16.6"
+
+RESTRICT="installsources strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	set -- ${A}
+	unpack ${2}
+}
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	export GOPATH="${WORKDIR}/${P}"
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="${PV}" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+}
+
+src_install() {
+	dobin build/docker
+	doman "${WORKDIR}"/man/man?/*
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
+
+pkg_postinst() {
+	has_version "app-containers/docker-buildx" && return
+	ewarn "the 'docker build' command is deprecated and will be removed in a"
+	ewarn "future release. If you need this functionality, install"
+	ewarn "app-containers/docker-buildx."
+}
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 2dd18a353db0..2423c697f426 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,6 +1,8 @@
 AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
 DIST docker-23.0.3.tar.gz 13621933 BLAKE2B fd548b6083df495c35cc4d27374afdbc37e3678454b33477e9e88ba7c1564901d91a87eb0b87da2cfeab6a7c120bec95cad3a94db15a49719713a3660fae9958 SHA512 1f47a0c669c07ad1e628c99d153623076cd5c8e65e82fa54f7dd0d32579fae803ec9bee748e4ba1a6dc8fe37654602aaf005e58e09f00d8ff4f32e6047240caa
 DIST docker-23.0.4.tar.gz 13625597 BLAKE2B ab4d50e9b334f18e620979bc13a7b146f8e0381d52aca0e45785108f1d53743e0157eb1e5bda76bc1300df1aa7825ca1ca141a21aeea39e81bc626ad1ea77775 SHA512 94d2c748541cf402197e98f93f574daf72bd84fc7603bf30e23674be36862ddbff5f37ad667455a710d730b9c5bc11962c287d6fd60a20320e0e0a41e3329c44
+DIST docker-24.0.4.tar.gz 14453359 BLAKE2B d089721469857eee87fd63b04c43cfde97ab9a38b5017c52c859b9b291574be4055b25585304434e070a7b74f90fa2582bb4fd8cddeae795637aaa23242fe8cb SHA512 5d749764a3541104d13ebe42e7b4225f66a98f9cc81f6406790be8a534f6c0d5ec13b145212bf75899e489feddf7679add6f43c6f9dd76b704291ed0e638eb6e
 EBUILD docker-23.0.3.ebuild 8284 BLAKE2B 21e8c4a8cd80f4a6a79d0bd5514da2d653fd163a58589b67e32b4c71176be7f8656df1bcef872f8a5b22e9780d514ce5cca76c1c4db79ce6ce1a58c7e5e460fe SHA512 9a3f51cfa4059d0271baff5413bbe3ae29795f9d912ac912d045359ff1846408c7ad011a08102d3c6a7a560159180acf809d6fa2e7b3751cea6e78d00f209385
 EBUILD docker-23.0.4.ebuild 8287 BLAKE2B ff38c5c75e8bfdde6b0a3f2927090aa41c3cb28509333c254368d9b42a2c4583fd8784d47cb092f1bf91b170a2aea7de3c18b3aff915d5d21a7769cec496b328 SHA512 d471fae81b86e66d34e5d4373f739bc5d15d99abe1e7eca0199d12453e44e7f147813c14b64ab1a595083a731d74b69a9379e39b864cf19996d1bd33e6f90a58
+EBUILD docker-24.0.4.ebuild 7643 BLAKE2B dc1a56c643a76f020a61d96fdc4f65820f0cac9170d7e53d3eafc5f04a658ca388a84d2421e799e24766fc58a1d7a066328c701020ef9dfb57a41aec698315ec SHA512 5c6d1d28d2887d5dbbda72fe3d1b4dc86d0708f3180f3b4f7568806b526a7232b8c1a82f3c2524f216df845a7962ce2f46edaf97942b88dc70bb43729e2f2622
 MISC metadata.xml 1414 BLAKE2B fa9d3dd12a13f980523afebd1eee07a8746c55b7f89e6b1f0d42dc9f64649acc835904ee1dfe09bb4319cd7589dd6e19feb6d646a7ae1b41fb90e54d1f0d0cf0 SHA512 1175abde53b8d4690ffb2586734dd6fab94b3725c83a59f61d4abf53b04bfa8e5128b5cb914a9fd1eb142f77881ad503a40b14b6f5a994d19ca00aabc1b4db3e
diff --git a/app-containers/docker/docker-24.0.4.ebuild b/app-containers/docker/docker-24.0.4.ebuild
new file mode 100644
index 000000000000..155a3ea0ce4e
--- /dev/null
+++ b/app-containers/docker/docker-24.0.4.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/docker/docker
+MY_PV=${PV/_/-}
+inherit linux-info systemd udev golang-vcs-snapshot
+GIT_COMMIT=4ffc61430bbe6d3d405bdf357b766bf303ff3cc5
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs +container-init device-mapper overlay seccomp selinux"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	>=app-containers/containerd-1.7.1[apparmor?,btrfs?,device-mapper?,seccomp?]
+	!app-containers/docker-proxy
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+	selinux? ( sec-policy/selinux-docker )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.16.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+# tests require running dockerd as root and downloading containers
+RESTRICT="installsources strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
+PATCHES=(
+	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
+)
+
+pkg_setup() {
+	# this is based on "contrib/check-config.sh" from upstream's sources
+	# required features.
+	CONFIG_CHECK="
+		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+		~KEYS
+		~VETH ~BRIDGE ~BRIDGE_NETFILTER
+		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+		~NETFILTER_XT_MATCH_ADDRTYPE
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NETFILTER_XT_MATCH_IPVS
+		~NETFILTER_XT_MARK
+		~IP_NF_NAT ~NF_NAT
+		~POSIX_MQUEUE
+	"
+	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
+
+	if kernel_is lt 4 8; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is le 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+		"
+	fi
+
+	if kernel_is le 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is ge 4 15; then
+		CONFIG_CHECK+="
+			~CGROUP_BPF
+		"
+	fi
+
+	# optional features
+	CONFIG_CHECK+="
+		~USER_NS
+	"
+
+	if use seccomp; then
+		CONFIG_CHECK+="
+			~SECCOMP ~SECCOMP_FILTER
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~CGROUP_PIDS
+	"
+
+	if kernel_is lt 6 1; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP
+			"
+	fi
+
+	if kernel_is le 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~!LEGACY_VSYSCALL_NATIVE
+		"
+	if kernel_is lt 5 19; then
+		CONFIG_CHECK+="
+			~LEGACY_VSYSCALL_EMULATE
+			"
+	fi
+	CONFIG_CHECK+="
+		~!LEGACY_VSYSCALL_NONE
+		"
+	WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \
+		Containers with <=glibc-2.13 will not work"
+
+	if kernel_is le 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+	fi
+
+	if kernel_is lt 5; then
+		CONFIG_CHECK+="
+			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~BLK_CGROUP ~BLK_DEV_THROTTLING
+		~CGROUP_PERF
+		~CGROUP_HUGETLB
+		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
+		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
+		~IP_NF_TARGET_REDIRECT
+		~IP_VS
+		~IP_VS_NFCT
+		~IP_VS_PROTO_TCP
+		~IP_VS_PROTO_UDP
+		~IP_VS_RR
+		"
+
+	if use selinux; then
+		CONFIG_CHECK+="
+			~SECURITY_SELINUX
+			"
+	fi
+
+	if use apparmor; then
+		CONFIG_CHECK+="
+			~SECURITY_APPARMOR
+			"
+	fi
+
+	# if ! is_set EXT4_USE_FOR_EXT2; then
+	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
+	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
+	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
+	#	fi
+	# fi
+
+	CONFIG_CHECK+="
+		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+	"
+
+	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
+	#	if is_set EXT4_USE_FOR_EXT2; then
+	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
+	#	else
+	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
+	#	fi
+	# fi
+
+	# network drivers
+	CONFIG_CHECK+="
+		~VXLAN ~BRIDGE_VLAN_FILTERING
+		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
+		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
+	"
+	if kernel_is le 5 3; then
+		CONFIG_CHECK+="
+			~INET_XFRM_MODE_TRANSPORT
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~IPVLAN
+		"
+	CONFIG_CHECK+="
+		~MACVLAN ~DUMMY
+		"
+	CONFIG_CHECK+="
+		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
+	"
+
+	# storage drivers
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~OVERLAY_FS
+	"
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	export GOPATH="${WORKDIR}/${P}"
+	export VERSION=${PV}
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	# build daemon
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+	newbin bundles/dynbinary-daemon/dockerd dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
+	dodoc -r docs/*
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index a51b3c0aff3e..3fecfae8248f 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,5 +1,7 @@
 DIST runc-1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6
 DIST runc-1.1.5.tar.gz 2336539 BLAKE2B 3fcc4c2160f33fcec2efd6bcd755279c535128af870d4ea71dc07c501c0f401f394f2f66219739ca24cc5ec37b5944b0323f8e7ee49c619513ce826159e3a395 SHA512 f3cc9b93b0fe8a4341d410010fe584febb8e975ec9e0fd569d7dff33ab74c5821a2e0c40b7aeafd6b90991a50eae9c352342437f09cf6884dc850ceccdc68944
+DIST runc-1.1.7.tar.gz 2511464 BLAKE2B 63f09052659636b62185abbb178f7e104d22125190899e80e71ed2ba35567eb855abf786d3c7fff3dd9a1ab43ee282fcaecb6650cd8a1ce49c05acefd7c12cde SHA512 e3a18f04ac2c3553a815074ca64e04cfd71af54d78edbd4a13819f187476f96d7311c23bb63fb5c311b91865db4540985a6f9daa84819b0bac5f023b3b2a832c
 EBUILD runc-1.1.4.ebuild 1843 BLAKE2B e390f7829d122bf1b69a366a01e4303bfa54d8362b44b74f9dfc85a88045f458a8e0827311931405b33e56868eddbb995499a169c1bec54bdbe5b2ecc0e07f27 SHA512 1850d961cab32b9b117c910bd05377128a67fdc8d93575395e0f7e913cc2058d55c1c59e38d68f0f07bbdc8777c3696155b0d6e92d02145299351d8aa922576e
 EBUILD runc-1.1.5.ebuild 1846 BLAKE2B ac18b5d3c5a943afd5efc4760cb719da39f18f6d4e7e3f6fba1fdbfff1dd5b29cc3263bde667eb36310444f0249ca4c57b9941a75e059095dfbd4430be2186ca SHA512 71911f78fd46964fa95ca6486473fc835f7535fe5d23538fe5c722af84c3f61738a6961308c622781c040d78d1ff417b64e7eee65e601944b6bf1c3c55faf920
+EBUILD runc-1.1.7.ebuild 1846 BLAKE2B cf76eac1c70cb5d4f691ebe95f3ea60ac1f51064876c6004ffc1b20d5a3c10301e81fdc62a9d42bf5e0298cfe15d4a32dd2614bcb563b6a7b799939fd7a55925 SHA512 d2ddbedeb03b5cc2d2f20899b31b9ab5cfd1e3457639dd3c4a691d352e59446f006f82ce36291bb4f664668b78720ebc3ddedaa0e414f8dd35e008039a61796c
 MISC metadata.xml 759 BLAKE2B 2eefd8bf06b709fe70d91b444fb232fb23e51702d75c29b0fb49675056e9721f8f63dac596b55a2ae33ef7b46825a1543a9ffdaaeddcb80448953daa5505bd60 SHA512 34d1dd28f55a6aff44c2f6dadef2dede502837af0fb8411b55a7f3ef96d35d2ddae9cc0d230525715e41c423d813b0089c36369dfa666c1249f152de90a5c555
diff --git a/app-containers/runc/runc-1.1.7.ebuild b/app-containers/runc/runc-1.1.7.ebuild
new file mode 100644
index 000000000000..0633aa35c491
--- /dev/null
+++ b/app-containers/runc/runc-1.1.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
+RUNC_COMMIT=4ffc61430bbe6d3d405bdf357b766bf303ff3cc5
+CONFIG_CHECK="~USER_NS"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://github.com/opencontainers/runc/"
+MY_PV="${PV/_/-}"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor hardened +kmem +seccomp selinux test"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+
+RDEPEND="
+	${DEPEND}
+	!app-emulation/docker-runc
+	apparmor? ( sys-libs/libapparmor )
+	selinux? ( sec-policy/selinux-container )
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	test? ( "${RDEPEND}" )
+"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	# Taken from app-containers/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usev apparmor)
+		$(usev seccomp)
+		$(usex kmem '' 'nokmem')
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		COMMIT="${RUNC_COMMIT}"
+	)
+
+	emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+	myemakeargs+=(
+		PREFIX="${ED}/usr"
+		BINDIR="${ED}/usr/bin"
+		MANDIR="${ED}/usr/share/man"
+	)
+	emake "${myemakeargs[@]}" install install-man install-bash
+
+	local DOCS=( README.md PRINCIPLES.md docs/. )
+	einstalldocs
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" localunittest
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9f78361fed34..5bc91823cf7d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 548fe70a251b..457c92c11651 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -17,7 +17,9 @@ AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655d
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.20.1.tar.gz 8661660 BLAKE2B ead16f8b1aec8bba3776628b74257c9aec891770c1fa6d5c5e66275db5f078ca59c9944cd2b017453b777ce080f8e5a322f735fab77691479cfad7b881b92830 SHA512 6f57479f13f107cd84f30de5c758eb6b9fc59171329c13e5da6073b806755f8d163eb7bd84767ea861ad6458ea0c9eeb00ee044d3bcad01ef136e9888564b6a2
-DIST krb5-1.21.tar.gz 8622539 BLAKE2B 0f3a899dc1758ea013ebad3aae80605c14f0f6713919d005e799162a0c50a162f33d924c74a6f87ce225e1ab3847df2c0effb25b772fe259e7401531964b696f SHA512 8ee2366888f6d553a44fc642a89c69a57dbc1ec4c89a36b9ba8b00584a9a32c73a2b0566ba5f21852ad9617046666c276dac402393bf8eb19fbe0c07a838071a
+DIST krb5-1.20.2.tar.gz 8662259 BLAKE2B 35f9e82390b5ba7227d0b5c40ab08f128ff27e7264d48585e2bfd08a443cb4b06415216190a3c35c6bc505f33483bcbe11430d9e40c3907f838798b2dc492416 SHA512 69e263ef74116a3332c632a2a243499bcc47b01b1e57d02fe35aa6c2ff655674b6cf2b815457145f788bceac4d466d3f55f8c20ec9ee4a6051128417e1e7e99e
+DIST krb5-1.21.1.tar.gz 8623049 BLAKE2B d90a994b5d39dc88573e5cfca280565b0909b2e9aa8710a6d695e2c1faec37ea0c008d05894e8952dcf72348403f76fd8a124de8d8f34c70fad6de8866a92f0e SHA512 6f04216b0a151d6a9886bf009777bc95a7d3f9bcab30427cc8bbef3357e0130748c1d42b477be0eb2d469d9e0fb65bf5ac5ff05c22d6e1046795e161fe6afbcc
 EBUILD mit-krb5-1.20.1.ebuild 4032 BLAKE2B 3093efdb2b1b0eb52add5cee2057a5519bf4f759faf5d467c0b21c3412575269947f9cac692aaa23e707faaf069225ef0a96f66cf73726af0317425c12882b5d SHA512 501be0d94defce6b3c443b8410c7b11cc653ab8002efaf88b3321ecddb7903e63fde8068d4ae0649e990dcf8b33985a53e13ebe945df9929ab517967806104ea
-EBUILD mit-krb5-1.21.ebuild 3894 BLAKE2B 5146d2999b615775fad40f8e2e04467b79cdb48d8dbe87d50a11e0f129411b015917bef024fa547494b49037fb192bff545779f0a9e7028f2e51502045980418 SHA512 344491c435e0a7c57532b9b52d57aba18e156d5b99ec976183d6f64873fe530826c2705bea1c1780054e73e57cce4e149b4a3aeef620950e5afd28b465169a56
+EBUILD mit-krb5-1.20.2.ebuild 3992 BLAKE2B f21d2c77b38a7b322c1b8ef61117559376ca394c7fda52e4fadfee5d4bd1372b21a5d8cb1c33682a25f2ff7475f0788a9fc6b0ec76fec5bdca17bf89f3bfb347 SHA512 f89f6d6d013f49f4e0cb4fadea42b7d2cbc143e10da917f2c57d242c97ee6892c039583b1b29580628ae6554605fc7519579b68c6417cd448de28e6bf988ddba
+EBUILD mit-krb5-1.21.1.ebuild 3894 BLAKE2B 5146d2999b615775fad40f8e2e04467b79cdb48d8dbe87d50a11e0f129411b015917bef024fa547494b49037fb192bff545779f0a9e7028f2e51502045980418 SHA512 344491c435e0a7c57532b9b52d57aba18e156d5b99ec976183d6f64873fe530826c2705bea1c1780054e73e57cce4e149b4a3aeef620950e5afd28b465169a56
 MISC metadata.xml 884 BLAKE2B 2cf23bd457ce89909ea29759cc029d51823032bb79b3ea94e4692ce10db54cec44389073bc3842ed4111598db86bd2c2b5a8697aca384b81ed317c1dd2af8c6b SHA512 e08399e8b7ae06161272502defb20d336235b605f6b964dd59ae4465a8d1c45340d5ea6ffa4370cff3ef3533911b7a73f2581877211b7aa04f8313779f0f23e5
diff --git a/app-crypt/mit-krb5/mit-krb5-1.20.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.20.2.ebuild
new file mode 100644
index 000000000000..cefab2c0bef0
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.20.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools python-any-r1 systemd toolchain-funcs multilib-minimal
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-alternatives/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? ( dev-util/cmocka )
+	"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_rundir.patch"
+	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+	"${FILESDIR}/${PN}-1.20-missing-time-include.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	AR="$(tc-getAR)" \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.1.ebuild
index c941459ad5db..c941459ad5db 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.21.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.21.1.ebuild
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0c6ef5efac71..486a946212cb 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/zxing-javase/Manifest b/dev-java/zxing-javase/Manifest
index c93ce0615a26..9ffa9f4c03ea 100644
--- a/dev-java/zxing-javase/Manifest
+++ b/dev-java/zxing-javase/Manifest
@@ -1,3 +1,4 @@
+AUX 3.5.1-test-available-formats.patch 1070 BLAKE2B 6c5e38e4db4cb8399648ad2669bb34ced17e010bd309ff5dd359dd8315df12a116ec35b0db6555c63562e329e9d72078f1de17b87830d1e6fc2c90a535f22849 SHA512 7e44f569b354f1bb7fba815483edc67623a45c5f0cab300729db3d0193c06642343915554e31265509a0f20148d527346393058518245ecefd710e5adb0390fc
 DIST zxing-3.5.1.tar.gz 132915650 BLAKE2B f749de7db35f3ce56d80fb1aa547e65d57425a1d1e20dfd9b40e02e24c52e6f488ca26bf8e0217b7d65677441578bf67439ad3a1fca3155ab35598b6d9833ece SHA512 8c093e5b8e4d2cd01e8979b5e9f788ac32a8d0bb49f3c7ad42044e95bb4a352e66e2802f11ad7429ed6ba140b360c596f389cd721521b84a5a93918df19285de
-EBUILD zxing-javase-3.5.1.ebuild 838 BLAKE2B 9dd3bb01ca00021fdf91e98ccf9b81341c97a5712b3b647a3652e9405cf3b1fb8afd706c21ae36469c1fd8520fa2cf3821a939e577ebff5070dcbdc367647a39 SHA512 d8b89fff2a1278feb2c70e349a8b99ad5aaa935946f97b4ce43b78530f39d719fc6efd9f973661c788efcedbb1ef1bfff9e969f9cdf012e84e7d3458dcf8516d
+EBUILD zxing-javase-3.5.1.ebuild 964 BLAKE2B 8cd357345bb17faa396e97dacd8af2def0fe04b37a37b6970d31f115ce5ba5c0cdfef59a8c82742dc62bcdd8c044697a9477ee6d959846cc2e2d9f28f7df48dd SHA512 f6c414ee1a3cc90b841fa0a0c9184f52397971bf9c4496c14af4f4e94feba6c4cdc2ec161a22145ecda6059a120c29bb5133f00ba01c125ce371e9761c78a282
 MISC metadata.xml 571 BLAKE2B 12b2e08bfaeadf4c0575f5a59b56761ca58067fd9ac353171301afce6d380964f9ff411678caee8eb50cbeb5fc66f98c5d8f7b184f8295a242e7a8f7f5f97e7f SHA512 6728b47f22d36df32848eaa681cb94e51162b369cfbd5de0f9985422c70a35ef65213a8dfb02761ee51e4477cbcd6d3d064871e9a27fec496724ce2678d5c23a
diff --git a/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch
new file mode 100644
index 000000000000..62e154f0dad4
--- /dev/null
+++ b/dev-java/zxing-javase/files/3.5.1-test-available-formats.patch
@@ -0,0 +1,31 @@
+https://github.com/zxing/zxing/pull/1668
+https://bugs.gentoo.org/910497
+--- a/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java
++++ b/src/test/java/com/google/zxing/client/j2se/MatrixToImageWriterTestCase.java
+@@ -17,7 +17,9 @@
+ package com.google.zxing.client.j2se;
+ 
+ import com.google.zxing.common.BitMatrix;
++import static org.hamcrest.CoreMatchers.hasItem;
+ import org.junit.Assert;
++import static org.junit.Assume.assumeThat;
+ import org.junit.Test;
+ 
+ import javax.imageio.ImageIO;
+@@ -25,6 +27,7 @@
+ import java.io.IOException;
+ import java.nio.file.Files;
+ import java.nio.file.Path;
++import java.util.Arrays;
+ 
+ /**
+  * Tests {@link MatrixToImageWriter}.
+@@ -52,6 +55,8 @@ private static void doTest(MatrixToImageConfig config) throws IOException {
+   }
+ 
+   private static void doTestFormat(String format, MatrixToImageConfig config) throws IOException {
++    assumeThat(Arrays.asList(ImageIO.getWriterFormatNames()), hasItem(format));
++
+     int width = 2;
+     int height = 3;
+     BitMatrix matrix = new BitMatrix(width, height);
diff --git a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
index 6666b3db9dc2..ef015da75c4b 100644
--- a/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
+++ b/dev-java/zxing-javase/zxing-javase-3.5.1.ebuild
@@ -10,7 +10,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Core barcode encoding/decoding library"
-HOMEPAGE="https://github.com/zxing/zxing/core"
+HOMEPAGE="https://github.com/zxing/zxing"
 SRC_URI="https://github.com/zxing/zxing/archive/zxing-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
@@ -31,7 +31,16 @@ RDEPEND="
 
 S="${WORKDIR}/zxing-zxing-${PV}/javase"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-test-available-formats.patch"
+)
+
 JAVA_AUTOMATIC_MODULE_NAME="com.google.zxing.javase"
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default # apply PATCHES
+	java-pkg-2_src_prepare
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index dad3837073be..e0c00a3c2251 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 61277d79f389..ad7c5b7bcf0b 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -6,6 +6,7 @@ AUX 1.67.1-rustc_expand.patch 53069 BLAKE2B f78a79ebe926aa5acaf40069dfaad8618656
 AUX 1.68.0-ignore-broken-and-non-applicable-tests.patch 1472 BLAKE2B e91233c812ca413ae8b09ff13ddf6d27773c1fce95aa6f637a6dba6ee8115b0913aeec6e045ae01f49c14a9e7537b6506a3a1f9a20c9bd7afa3bc9d9200a9bd6 SHA512 cafc3765cb4e10f17dd2b15e24466d630d8b24b4fbef72571dd7c38d9535cb7661f64c88792254ef52bedac5c6bec15001aafb047543657047bb9ec986b5959a
 AUX 1.70.0-ignore-broken-and-non-applicable-tests.patch 1029 BLAKE2B 42a634c423c57f23bf709294f79024fde03a529c9de6e15554102bfb0a777571e388a8a122d8e01fa8b1889b873083e7802ee30bc9de3c3ebd758a6c7628f295 SHA512 3b0f22370f002934f5237849f2a018989a700e6b4ed5ffe308d5a0acda54c85b67919db88a94eb991568056030899802ceb2bf102ce8eef9745efee40e8f738c
 AUX 1.71.0-fix-bashcomp-installation.patch 968 BLAKE2B 381ef44295257d6131b4ef98036697d90a091bf2b3ea4333301a63a2a9e9d63bb6e2f711332ab8e47a2b362f1157e318dad4a8307665867484f8a5f67af79b7d SHA512 6e1c0a102311e35ecf9ffd3769c8d96a7c24a9772219d68f02afd57834c5bdf830155f515dcdb098bc2d1a6d2aaa0c5b9955282716b3340cdde61bc4b438ab13
+AUX 1.71.0-lint-docs-libpath.patch 1992 BLAKE2B 9b8edcbe8dd8f87861901115511316d770c46c731da2bca6e8f9b62eec25d21303c96ae1665e4cfe04f3cf5e9b9a7ed7123275ee3c0b5cd2dad56c67d660bd5b SHA512 3ecb2ab25de94191ed5de059dc7f3be1efcfab9b0306042f39f3dd98cb7a2561480114f80e9f65ea13753491af19dc95054d31aaece90faa67752f3dbe957edb
 DIST rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz 245636524 BLAKE2B 90e405bc6e7f47aec091924bcd7a35017d591936b2697f2b0ddc5271e65fa431cc193a2b392489b6636896fa2d4f3d8f5096d197cfed36e812ea7f3986130c85 SHA512 c163b19a56148646ebbdb10b5b20459a206b4a1c45a2de9ce69f2e45dc5527cc69920f81007ee6fb75080782d534a2a39f7580d0c8cfdcf36ebed971b2513b63
 DIST rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3ed79e6a5168676c19b9092692576b72b7bee6cc6fc6fc9213d492ac9641974e0bfefd9eee2663852580ee05038becb3045ff4410fe96aa8e529afc4d3652abb SHA512 14e635fbd60512e8d36c50c2c07d510236cc73661a6294f0a01fe260a945581885c60783e72cbcc0d85b87a161e0940b34b496380bbab659c6e5d0dbb4050a4d
 DIST rust-1.64.0-aarch64-unknown-linux-musl.tar.xz 226328036 BLAKE2B 43119c95866b3bd7e1b0832079f4fa23d79f5168e1aeb1d9a984897486cdaabbf035150e5633114c3d87afc8cf47e2d591e7c32961cc7cef99595fec303bc348 SHA512 8af3a7293b73d5f3129a17651cc8009290e5eade4802a872bb2a568444c60b4227a89d419c751fa394bf81a38f553a7418a0abd6ec3234737148d1561b91bace
@@ -264,5 +265,5 @@ EBUILD rust-1.67.1-r1.ebuild 23189 BLAKE2B 7df71d29df716223ca65a4a518cba58caf896
 EBUILD rust-1.68.2.ebuild 23148 BLAKE2B 9f593b00d9efae5da1c7be3b6f06db714374cf7c41964e74e372e51a300da3518cabd0985607882bbb94fec775b4c3bab3ef1808a90f9a6ac7311a4be7199fb9 SHA512 c3d82b5029b604845ab69abfde8ab36e4546e054a61132b6a9b622383158a79453fd0196755672e044a44dea69a87f3e9ca20e2aa062467ef598aa8e1c809619
 EBUILD rust-1.69.0-r1.ebuild 23207 BLAKE2B 6ce30d47568226db5ff1e3cb4755b5e259a404ced2b9ff920b1f393354d9f4abcbedc53102d41f01c09a40c8172f0b6e018035d778060761857065812ebf79d6 SHA512 35a6183369a5d43e58e298a6ed572c38e5e1b328b8028111160a641116d250a8f1025476ccf1eaaf409e4107d38d7f8d95db09d6469d4b0fc0c9820c72181a8f
 EBUILD rust-1.70.0.ebuild 23321 BLAKE2B 4550ae6d02af7539c43eb0925c38b5a5f60fa752f769828028b934b71cf1056737ed4809e098b8a7dbf3002879ab212acc130ed91a7b45312400bc5cf9d05a02 SHA512 1f58200e8af3d6171e9b53f560b0268f6c9c26de4d6af5aa9bb17191a8a0d28849b1c377a27164771fee93d94188e156b9ccb50b22efaf25c81ea04039905254
-EBUILD rust-1.71.0.ebuild 23375 BLAKE2B 399b79b18d2cf19167f8a431e31ce5be804fe987107fa95e006d1b4166636a8e3ce4b79fde4f6193d956dd1d8e47abba2cb0a87ad54e753e54f7fdf5eccb211f SHA512 4ecf8ef4dc353d4b0f821e65f12d4298382d42a36393a4553fbf714136f9e9acb0baeba19c055b896419a513825e027cc5089f8e6746777efdf82ce6460f91b5
+EBUILD rust-1.71.0.ebuild 23421 BLAKE2B 3e465c4e49908c9ba4c006ca3dcf82cedf32b24551ae0026f8d35b8b9beec93e74c4e71d890e0163690fbc538b8b8638f6720493bca7db2dd001b3c736a30f14 SHA512 270ce6ac5c64bf51506bdba5e0ff031104ea72184f3cadb3820272e1947cc5eab7d7d2a563d02ac64fc6d4ee45f87477cac6699e7255178423c15db918ea3525
 MISC metadata.xml 1756 BLAKE2B fab29aa03373b0c47de798165a4cac03501da57e38b686917794a961c7e0491b87c7eabe2613883f7c05b6a5ea2ab225f409599e281b57c26ca8a2a22bbfa795 SHA512 a73f76a803fa7be46e30e87c939fab1ac5514daf15f5ef2800045bd30403a2fb2c69fd776becbc2bce61c67544228f7ddd4b87455982ad38dfb368c620bfb317
diff --git a/dev-lang/rust/files/1.71.0-lint-docs-libpath.patch b/dev-lang/rust/files/1.71.0-lint-docs-libpath.patch
new file mode 100644
index 000000000000..27c673835c7b
--- /dev/null
+++ b/dev-lang/rust/files/1.71.0-lint-docs-libpath.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/910595
+https://github.com/rust-lang/rust/issues/113678
+
+https://github.com/rust-lang/rust/commit/67b5990472e3cac643d8cf90f45fe42201ddec3c
+From: jyn <github@jyn.dev>
+Date: Mon, 10 Jul 2023 15:59:30 -0500
+Subject: [PATCH] Revert "Fix `x test lint-docs` when download-rustc is
+ enabled"
+
+This was not the correct fix. The problem was two-fold:
+- `download-rustc` didn't respect `llvm.assertions`
+- `rust-dev` was missing a bump to `download-ci-llvm-stamp`
+
+The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`.
+--- a/src/tools/lint-docs/src/groups.rs
++++ b/src/tools/lint-docs/src/groups.rs
+@@ -39,7 +39,6 @@ impl<'a> LintExtractor<'a> {
+     fn collect_groups(&self) -> Result<LintGroups, Box<dyn Error>> {
+         let mut result = BTreeMap::new();
+         let mut cmd = Command::new(self.rustc_path);
+-        cmd.env_remove("LD_LIBRARY_PATH");
+         cmd.arg("-Whelp");
+         let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?;
+         if !output.status.success() {
+--- a/src/tools/lint-docs/src/lib.rs
++++ b/src/tools/lint-docs/src/lib.rs
+@@ -403,12 +403,6 @@ impl<'a> LintExtractor<'a> {
+         fs::write(&tempfile, source)
+             .map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?;
+         let mut cmd = Command::new(self.rustc_path);
+-        // NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself.
+-        // Unfortunately, lint-docs is a bootstrap tool while rustc is built from source,
+-        // and sometimes the paths conflict. In particular, when using `download-rustc`,
+-        // the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`.
+-        // Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler.
+-        cmd.env_remove("LD_LIBRARY_PATH");
+         if options.contains(&"edition2015") {
+             cmd.arg("--edition=2015");
+         } else {
diff --git a/dev-lang/rust/rust-1.71.0.ebuild b/dev-lang/rust/rust-1.71.0.ebuild
index 63f051219230..0add3729bd1a 100644
--- a/dev-lang/rust/rust-1.71.0.ebuild
+++ b/dev-lang/rust/rust-1.71.0.ebuild
@@ -163,6 +163,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
 
 PATCHES=(
 	"${FILESDIR}"/1.71.0-fix-bashcomp-installation.patch
+	"${FILESDIR}"/1.71.0-lint-docs-libpath.patch
 	"${FILESDIR}"/1.70.0-ignore-broken-and-non-applicable-tests.patch
 	"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch
 	"${FILESDIR}"/1.67.0-doc-wasm.patch
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 769ea35d35ed..f99918cc1690 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 98b04e66a471..30754ec63008 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,4 +1,6 @@
 AUX libgudev-test-double.patch 923 BLAKE2B e8351510cd918befad8c9059dde42f5ceb6df66028ca38ea7e24db8d357658a1fea00ca66f459731ec8087aeae77092086daa79eb78b6ada62cede12149a7e47 SHA512 4decaa02142dc0c952d1eb8a2d7bd963fc71aa9dcd97e267f464ea64cd9791e64d67507aa1cc0edf3fc30cc40e300dc479a445e2f3af764cf2cc89abff55c64f
 DIST libgudev-237.tar.xz 29060 BLAKE2B 5d39d4d26d8c8b3fa877319c294036294dbda96b340d2d04d7a35449d91b58de876b96b5e3d9423cdf3e1d3e2a94f5a861b1ac1e74a610637e0fc66248c68309 SHA512 2d68981e3ba5c58ee080b6ed5cd5152c1c352b2bdb3ecb5eaf2b91f6800d3369121222a7fe4f82630aabd164069ee7276c52082b2fc2ff5f318481b85b25abc6
+DIST libgudev-238.tar.xz 30548 BLAKE2B 386491e78c82081e89dad897d16ea6733430a67db3f75f2d9fdee5474b074ad6fede9f08e429f4eb6feaa9bbbb982d9d039db738aac5b5ce0ffac2d3a19430d4 SHA512 684061b4fc64a6ea3dd1ac34835279330c7eb2728fad6e3a9d34c0d501be3103d0f96c6d6866c8e257a0027e4f78a6314cb8ba81cda5ddf42ee9ea1a576ec5dc
 EBUILD libgudev-237-r1.ebuild 1252 BLAKE2B 90506ccb4713f761d947cb622fa5bdd4a5d1a49dd002de1f110baf7ecae40b2e8c0a9a6f049470a1a9a9fc3575ddff55630c8a1f32a21a4c4812021af71cab8e SHA512 620ffecc79efba141c6aa081ddd16e35a46fd99e734ffedef8221848c098bd65ade8d321cf534679a14db37de6c399e254ff4ec6c87dbb582d26f0db9ce91b5f
+EBUILD libgudev-238.ebuild 1141 BLAKE2B 82427f0d9122d9e8dc024228bf235741c8771cdfe323955b75b3ef63447bb3fe499b1aaf44683c7d099faee21f111a200831a2dfbaf3ff61c396fcf6dc69a170 SHA512 1abd0ea0c50462146f737407f658591a559bb739c277be66c9a6d3b4e8e119f06e33493b04747dad77a37ad8403f286fbdbdb48682d65575a7274572150f2015
 MISC metadata.xml 433 BLAKE2B c77ed222bd177c28f97dc28ba5361572570604716fb21260de83c5854e87bf8a0aeb41ec61da1e5859da21f50417f8e16e4b41dc052b3c021ccfd8af0ac75c9c SHA512 dff4708abd60c2ffb1d5cf442094b9fc4962346b7cbc8079aa2002258aa195aa636ef04ff1d0d9d0a67904456f5a0c9d05777828da04c0124d05c272c5ab75a3
diff --git a/dev-libs/libgudev/libgudev-238.ebuild b/dev-libs/libgudev/libgudev-238.ebuild
new file mode 100644
index 000000000000..a71d45bcd0ac
--- /dev/null
+++ b/dev-libs/libgudev/libgudev-238.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson-multilib
+
+DESCRIPTION="GObject bindings for libudev"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
+SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="introspection test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+	>=virtual/libudev-251:=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/umockdev[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_feature introspection)
+		-Dgtk_doc=false
+		$(meson_feature test tests)
+		-Dvapi=disabled
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# libsandbox interferes somehow.
+	# There are no access violations, but tests fail.
+	# https://bugs.gentoo.org/805449
+	local -x SANDBOX_ON=0
+	meson-multilib_src_test
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 65bdb36215bb..d005d430857a 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 15f09009179a..bbe03f5481ae 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,7 @@
 DIST qt3d-everywhere-opensource-src-5.15.10.tar.xz 118262456 BLAKE2B eff3ffd0b305e005019ae59c7214f2df12509ce3fe6cde38dc315b8a3062364c714e5b7e3d33fbaa2c7a71ae19077149bbd7e13d49757044c497337ff2c16035 SHA512 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f
 DIST qt3d-everywhere-src-6.5.1.tar.xz 161708832 BLAKE2B b10a61591132d0ad5c6de5a7032ec8a397ff670c0f79376ee6d37dfd9377717912c554fa79637e13f0efe03ef3c003b70424a215cc7bf0f66675a20f05f2293f SHA512 a5b3e4431c8924eb75cd23a806d05334aa9bca884bcbc0973359fb4c79370774fde26ca485826b1aa861362d65b51aafca93a909aed265a59cc0e60d9aceabb3
+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.1.ebuild 958 BLAKE2B e00d4c63841c4f72bcf862f7dd5a68e17b565f0fdfe8acf774942de897c2c2bb857d5de67809d81db013f74d01dcbc2a0dba67b8d7ec8c247400de6529228761 SHA512 e9381edca0e4ea61c424704b2a2fa4f16a8c31d71c40e6d302176159e180125f65702237ef440cb571ec8a12424eaf8e09ca7bd491e98d3e81596bc44fad4b5d
+EBUILD qt3d-6.5.2.ebuild 958 BLAKE2B e00d4c63841c4f72bcf862f7dd5a68e17b565f0fdfe8acf774942de897c2c2bb857d5de67809d81db013f74d01dcbc2a0dba67b8d7ec8c247400de6529228761 SHA512 e9381edca0e4ea61c424704b2a2fa4f16a8c31d71c40e6d302176159e180125f65702237ef440cb571ec8a12424eaf8e09ca7bd491e98d3e81596bc44fad4b5d
 MISC metadata.xml 645 BLAKE2B 6534d1e6a8b8a5d8d41683988ce5001a1c92fe5eecae9fe1942c8a28985ff8a0c60318621f839ab4baa9c6738ce3dd0c4128280c6e1c5b3a8dcd86251a1e08eb SHA512 5f2b1e19665e5f9bda13f708f6f35321fbe6b8451e590a6e29275e23d6df4080d2ddb5bace49cdaeb1352117369b7e01404a64539e3d2edbda41420c95792a61
diff --git a/dev-qt/qt3d/qt3d-6.5.2.ebuild b/dev-qt/qt3d/qt3d-6.5.2.ebuild
new file mode 100644
index 000000000000..d62b749fbe0a
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-6.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="3D rendering module for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+RDEPEND="
+	=dev-qt/qtbase-${PV}*[concurrent,gui,network,opengl,vulkan,widgets]
+	=dev-qt/qtdeclarative-${PV}*[widgets]
+	=dev-qt/qtmultimedia-${PV}*
+	=dev-qt/qtshadertools-${PV}*
+	media-libs/assimp:=
+"
+DEPEND="${RDEPEND}
+	dev-util/vulkan-headers
+"
+
+# No qtgamepad branching since 6.3.
+src_configure() {
+	local mycmakeargs=(
+		-DQT_FEATURE_opengl=ON
+		-DQT_FEATURE_qt3d_animation=ON
+		-DQT_FEATURE_qt3d_extras=ON
+		-DQT_FEATURE_qt3d_input=ON
+		-DQT_FEATURE_qt3d_logic=ON
+		-DQT_FEATURE_qt3d_render=ON
+		-DQT_FEATURE_qt3d_rhi_renderer=ON
+		-DQT_FEATURE_qt3d_system_assimp=ON
+		-DQT_FEATURE_regularexpression=ON
+		-DQT_FEATURE_system_zlib=ON
+		-DQT_FEATURE_vulkan=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
index 13045948ec6c..870905df4c9d 100644
--- a/dev-qt/qt5compat/Manifest
+++ b/dev-qt/qt5compat/Manifest
@@ -1,3 +1,5 @@
 DIST qt5compat-everywhere-src-6.5.1.tar.xz 14638620 BLAKE2B 633f53dff9dd7f586018caf18cfdce0564684e7c9a7e2747dac087501f049370a91a10494e5b7f103fdbac42c163188d5fb6166cfdbaad7bb0f2230e7c14620b SHA512 513de021e2ab3413399b9f8cb7e86e744af468e28f1d11c1024d49650ac6658939e7e96607432511aa4095e6e122b9434f36e43ea712e657b10d7dfa0bd08b7d
+DIST qt5compat-everywhere-src-6.5.2.tar.xz 14638008 BLAKE2B ab16da4c4cdbbfde615e083ebce57352bbee6e37ddd6a9a764a9f93824edb0a230324c989808c859b8142f16cec2f57cfffe33fe20fd1d7b72ec8a1967c87e99 SHA512 c646231f4bece460bfa6b654cba63a91c938c98b4fca8198e63a3fc15a2c7424ef43a765f612d6555b341a8b46f89293d4567257e489569e4669d9beaee6ed66
 EBUILD qt5compat-6.5.1.ebuild 358 BLAKE2B aab99f2828cd5855a96cd9faa547326a7d5ab822b046992e869caf648dd9d2ff5acce124ba012b3a9231d7da66cc316c7e94f3dd48ae4157f8ad74347763085e SHA512 8aed9d94121bad08c4d0d216612bbb94ccbd58d8b0f64d0ad213ae977707b63b9d95d95edebeb0353f4a0f0ed37a9fb962f637434e01837ad6528c052bbd062e
+EBUILD qt5compat-6.5.2.ebuild 353 BLAKE2B b57d7addff3b54eaabae28b20745dace7ecb2c01f2de0117eb83a58ddaa5a2d26c527470953249cae2797d34f81562bb60ea68b2ef05f2350d2546c81dd805eb SHA512 7f3c3a60723674ebeea149c3317d6ce689630fd638a28fb1bd937667d63fb1b20cfa760c848d3dfe54e35a73d572aa00ff7dba2436bd40709b00ff18b66f8c81
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2.ebuild
new file mode 100644
index 000000000000..54dca83e10d2
--- /dev/null
+++ b/dev-qt/qt5compat/qt5compat-6.5.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui,network]
+	=dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 11e78f42ddd4..86c095f5bf08 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -1,4 +1,7 @@
 AUX qtbase-6.5.1-CVE-2023-34410.patch 2731 BLAKE2B a0b894782aad05e904e76112391df4895606fa95cdd6365bdfcf5096be769750c4e3c5a331a43498d5a4c84b712a4df595eb4c629fa47e458fda6475c7ff8451 SHA512 eb19ff548835ca208d1209fc8c712dfb2cca91170b23535e87879e843d599bf5d4939b2f3d9c47ef73c238ff8c939f6fd85f0b5300ee97457a4bae76d0d29f67
+AUX qtbase-6.5.2-CVE-2023-38197.patch 14691 BLAKE2B 68de2edb047871de9608a0a570773c9987474f9977f1dad9a849b8ed18dad6ef966997c0293adaee92fd2fcdb24a79a6bd05a71874c548722bfca64d960f12e3 SHA512 0ee7d66a0894879816454fdfd4c9feb958d82e87f4287935704216330e74135709b23cba7a5c084a6b2617b16c54a96eb6eff785d85f0d79b15ef6ccd9da51c6
 DIST qtbase-everywhere-src-6.5.1.tar.xz 48287392 BLAKE2B 47872492f21a936d980891c28df61591380bc236adc66b57a90fbb87dd292cdeb3c632fb1159231ba40142d25e02944e4c5e8568153f1286e0a1abc8c5b26699 SHA512 7f7b20bbc25cda65266d6067cdd68e3e077636988d67dbf5783f79a61186135fb3a36d57ac72cfe4501012035b630ab1f5849148e4817726d4f459fa1937e91a
+DIST qtbase-everywhere-src-6.5.2.tar.xz 48410716 BLAKE2B 578c69ede6f45a8b21cba0a24674d5d8801722503d13ab9578b06b2446ce15e6a84bcdbd0c5d2c9aa868ec70862f0845406c959ed79b695f82bb398ecf299c63 SHA512 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20
 EBUILD qtbase-6.5.1-r1.ebuild 5080 BLAKE2B 34fe36cf300d39b2592445e47c1bea8dd9f1754378d5c2fa37ed873a145f5e0ae42e0a68fecda5110792acbd7a04c301441dedfb9e0722a136c5023f92328282 SHA512 e62f4294afed0049ad425c4a751cbd2a6f53ff9673741e9049f6ca28ae23f99ca74fa2af715d60bd4d279943b34a364aea432f1cbb85dfb1f2a6067729c2ed0d
+EBUILD qtbase-6.5.2.ebuild 5080 BLAKE2B 025013b416fead6bbe9423f06ad38a9b3750e12ffe70756183af361e825f499cb1356678098c709bc33c72fdddb91972e91116c44bcbf2bf6c8fd796440add5a SHA512 cecb0846a9a3266f98c12423b861930fb050bc4116dc4d2f595678e10a2b6020f7dd4869951f4e4ff458bc25d5c73fe737834587c03f40d9ad59abfe7c684f5b
 MISC metadata.xml 1762 BLAKE2B fd53799e4a3668fb8d32798f1d128df86aaa7181563655ffb71d6c15a7bab33e5fb08f3c5b41695e8fee4a46f5a5216030d0aeb0927eaeec387136ec66964a8f SHA512 6e05599e981d07f7a6d79eda9e1ef9e41383e05aec5442fed8a46be87245b6e9a77fb9b469fe656f9fdd29ffb69767136c0922baed3c5448ca8c58ee70ad713d
diff --git a/dev-qt/qtbase/files/qtbase-6.5.2-CVE-2023-38197.patch b/dev-qt/qtbase/files/qtbase-6.5.2-CVE-2023-38197.patch
new file mode 100644
index 000000000000..220e94d9ca2f
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.5.2-CVE-2023-38197.patch
@@ -0,0 +1,404 @@
+Upstream: https://codereview.qt-project.org/c/qt/qtbase/+/490550
+Upstream: https://lists.qt-project.org/pipermail/development/2023-July/044166.html
+
+From c216c3d9859a20b3aeec985512e89316423fc3a8 Mon Sep 17 00:00:00 2001
+From: Axel Spoerl <axel.spoerl@qt.io>
+Date: Fri, 30 Jun 2023 12:43:59 +0200
+Subject: [PATCH] QXmlStreamReader: Raise error on unexpected tokens
+
+QXmlStreamReader accepted multiple DOCTYPE elements, containing DTD
+fragments in the XML prolog, and in the XML body.
+Well-formed but invalid XML files - with multiple DTD fragments in
+prolog and body, combined with recursive entity expansions - have
+caused infinite loops in QXmlStreamReader.
+
+This patch implements a token check in QXmlStreamReader.
+A stream is allowed to start with an XML prolog. StartDocument
+and DOCTYPE elements are only allowed in this prolog, which
+may also contain ProcessingInstruction and Comment elements.
+As soon as anything else is seen, the prolog ends.
+After that, the prolog-specific elements are treated as unexpected.
+Furthermore, the prolog can contain at most one DOCTYPE element.
+
+Update the documentation to reflect the new behavior.
+Add an autotest that checks the new error cases are correctly detected,
+and no error is raised for legitimate input.
+
+The original OSS-Fuzz files (see bug reports) are not included in this
+patch for file size reasons. They have been tested manually. Each of
+them has more than one DOCTYPE element, causing infinite loops in
+recursive entity expansions. The newly implemented functionality
+detects those invalid DTD fragments. By raising an error, it aborts
+stream reading before an infinite loop occurs.
+
+Thanks to OSS-Fuzz for finding this.
+
+Fixes: QTBUG-92113
+Fixes: QTBUG-95188
+Change-Id: I0a082b9188b2eee50b396c4d5b1c9e1fd237bbdd
+Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
+(cherry picked from commit c4301be7d5f94852e1b17f2c2989d5ca807855d4)
+---
+ src/corelib/serialization/qxmlstream.cpp           | 145 +++++++++++++++++++--
+ src/corelib/serialization/qxmlstream_p.h           |  11 ++
+ .../qxmlstream/tokenError/dtdInBody.xml            |  20 +++
+ .../qxmlstream/tokenError/multipleDtd.xml          |  20 +++
+ .../qxmlstream/tokenError/wellFormed.xml           |  15 +++
+ .../serialization/qxmlstream/tst_qxmlstream.cpp    |  39 ++++++
+ 6 files changed, 242 insertions(+), 8 deletions(-)
+ create mode 100644 tests/auto/corelib/serialization/qxmlstream/tokenError/dtdInBody.xml
+ create mode 100644 tests/auto/corelib/serialization/qxmlstream/tokenError/multipleDtd.xml
+ create mode 100644 tests/auto/corelib/serialization/qxmlstream/tokenError/wellFormed.xml
+
+diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
+index 6e34d4da6e5a..cf46d690f122 100644
+--- a/src/corelib/serialization/qxmlstream.cpp
++++ b/src/corelib/serialization/qxmlstream.cpp
+@@ -185,7 +185,7 @@ WRAP(indexOf, QLatin1StringView)
+     addData() or by waiting for it to arrive on the device().
+ 
+     \value UnexpectedElementError The parser encountered an element
+-    that was different to those it expected.
++    or token that was different to those it expected.
+ 
+ */
+ 
+@@ -322,13 +322,34 @@ QXmlStreamEntityResolver *QXmlStreamReader::entityResolver() const
+ 
+   QXmlStreamReader is a well-formed XML 1.0 parser that does \e not
+   include external parsed entities. As long as no error occurs, the
+-  application code can thus be assured that the data provided by the
+-  stream reader satisfies the W3C's criteria for well-formed XML. For
+-  example, you can be certain that all tags are indeed nested and
+-  closed properly, that references to internal entities have been
+-  replaced with the correct replacement text, and that attributes have
+-  been normalized or added according to the internal subset of the
+-  DTD.
++  application code can thus be assured, that
++  \list
++  \li the data provided by the stream reader satisfies the W3C's
++      criteria for well-formed XML,
++  \li tokens are provided in a valid order.
++  \endlist
++
++  Unless QXmlStreamReader raises an error, it guarantees the following:
++  \list
++  \li All tags are nested and closed properly.
++  \li References to internal entities have been replaced with the
++      correct replacement text.
++  \li Attributes have been normalized or added according to the
++      internal subset of the \l DTD.
++  \li Tokens of type \l StartDocument happen before all others,
++      aside from comments and processing instructions.
++  \li At most one DOCTYPE element (a token of type \l DTD) is present.
++  \li If present, the DOCTYPE appears before all other elements,
++      aside from StartDocument, comments and processing instructions.
++  \endlist
++
++  In particular, once any token of type \l StartElement, \l EndElement,
++  \l Characters, \l EntityReference or \l EndDocument is seen, no
++  tokens of type StartDocument or DTD will be seen. If one is present in
++  the input stream, out of order, an error is raised.
++
++  \note The token types \l Comment and \l ProcessingInstruction may appear
++  anywhere in the stream.
+ 
+   If an error occurs while parsing, atEnd() and hasError() return
+   true, and error() returns the error that occurred. The functions
+@@ -659,6 +680,7 @@ QXmlStreamReader::TokenType QXmlStreamReader::readNext()
+         d->token = -1;
+         return readNext();
+     }
++    d->checkToken();
+     return d->type;
+ }
+ 
+@@ -743,6 +765,11 @@ static constexpr auto QXmlStreamReader_tokenTypeString = qOffsetStringArray(
+     "ProcessingInstruction"
+ );
+ 
++static constexpr auto QXmlStreamReader_XmlContextString = qOffsetStringArray(
++    "Prolog",
++    "Body"
++);
++
+ /*!
+     \property  QXmlStreamReader::namespaceProcessing
+     \brief the namespace-processing flag of the stream reader.
+@@ -777,6 +804,15 @@ QString QXmlStreamReader::tokenString() const
+     return QLatin1StringView(QXmlStreamReader_tokenTypeString.at(d->type));
+ }
+ 
++/*!
++   \internal
++   \return \param loc (Prolog/Body) as a string.
++ */
++static constexpr QLatin1StringView contextString(QXmlStreamReaderPrivate::XmlContext ctxt)
++{
++    return QLatin1StringView(QXmlStreamReader_XmlContextString.at(static_cast<int>(ctxt)));
++}
++
+ #endif // QT_NO_XMLSTREAMREADER
+ 
+ QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack()
+@@ -864,6 +900,8 @@ void QXmlStreamReaderPrivate::init()
+ 
+     type = QXmlStreamReader::NoToken;
+     error = QXmlStreamReader::NoError;
++    currentContext = XmlContext::Prolog;
++    foundDTD = false;
+ }
+ 
+ /*
+@@ -3838,6 +3876,97 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader)
+     }
+ }
+ 
++static constexpr bool isTokenAllowedInContext(QXmlStreamReader::TokenType type,
++                                               QXmlStreamReaderPrivate::XmlContext loc)
++{
++    switch (type) {
++    case QXmlStreamReader::StartDocument:
++    case QXmlStreamReader::DTD:
++        return loc == QXmlStreamReaderPrivate::XmlContext::Prolog;
++
++    case QXmlStreamReader::StartElement:
++    case QXmlStreamReader::EndElement:
++    case QXmlStreamReader::Characters:
++    case QXmlStreamReader::EntityReference:
++    case QXmlStreamReader::EndDocument:
++        return loc == QXmlStreamReaderPrivate::XmlContext::Body;
++
++    case QXmlStreamReader::Comment:
++    case QXmlStreamReader::ProcessingInstruction:
++        return true;
++
++    case QXmlStreamReader::NoToken:
++    case QXmlStreamReader::Invalid:
++        return false;
++    }
++
++    // GCC 8.x does not treat __builtin_unreachable() as constexpr
++#if !defined(Q_CC_GNU_ONLY) || (Q_CC_GNU >= 900)
++    Q_UNREACHABLE_RETURN(false);
++#else
++    return false;
++#endif
++}
++
++/*!
++   \internal
++   \brief QXmlStreamReader::isValidToken
++   \return \c true if \param type is a valid token type.
++   \return \c false if \param type is an unexpected token,
++   which indicates a non-well-formed or invalid XML stream.
++ */
++bool QXmlStreamReaderPrivate::isValidToken(QXmlStreamReader::TokenType type)
++{
++    // Don't change currentContext, if Invalid or NoToken occur in the prolog
++    if (type == QXmlStreamReader::Invalid || type == QXmlStreamReader::NoToken)
++        return false;
++
++    // If a token type gets rejected in the body, there is no recovery
++    const bool result = isTokenAllowedInContext(type, currentContext);
++    if (result || currentContext == XmlContext::Body)
++        return result;
++
++    // First non-Prolog token observed => switch context to body and check again.
++    currentContext = XmlContext::Body;
++    return isTokenAllowedInContext(type, currentContext);
++}
++
++/*!
++   \internal
++   Checks token type and raises an error, if it is invalid
++   in the current context (prolog/body).
++ */
++void QXmlStreamReaderPrivate::checkToken()
++{
++    Q_Q(QXmlStreamReader);
++
++    // The token type must be consumed, to keep track if the body has been reached.
++    const XmlContext context = currentContext;
++    const bool ok = isValidToken(type);
++
++    // Do nothing if an error has been raised already (going along with an unexpected token)
++    if (error != QXmlStreamReader::Error::NoError)
++        return;
++
++    if (!ok) {
++        raiseError(QXmlStreamReader::UnexpectedElementError,
++                   QObject::tr("Unexpected token type %1 in %2.")
++                   .arg(q->tokenString(), contextString(context)));
++        return;
++    }
++
++    if (type != QXmlStreamReader::DTD)
++        return;
++
++    // Raise error on multiple DTD tokens
++    if (foundDTD) {
++        raiseError(QXmlStreamReader::UnexpectedElementError,
++                   QObject::tr("Found second DTD token in %1.").arg(contextString(context)));
++    } else {
++        foundDTD = true;
++    }
++}
++
+ /*!
+  \fn bool QXmlStreamAttributes::hasAttribute(QAnyStringView qualifiedName) const
+ 
+diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h
+index 070424a9f523..f09adaa37e66 100644
+--- a/src/corelib/serialization/qxmlstream_p.h
++++ b/src/corelib/serialization/qxmlstream_p.h
+@@ -297,6 +297,17 @@ public:
+     QStringDecoder decoder;
+     bool atEnd;
+ 
++    enum class XmlContext
++    {
++        Prolog,
++        Body,
++    };
++
++    XmlContext currentContext = XmlContext::Prolog;
++    bool foundDTD = false;
++    bool isValidToken(QXmlStreamReader::TokenType type);
++    void checkToken();
++
+     /*!
+       \sa setType()
+      */
+diff --git a/tests/auto/corelib/serialization/qxmlstream/tokenError/dtdInBody.xml b/tests/auto/corelib/serialization/qxmlstream/tokenError/dtdInBody.xml
+new file mode 100644
+index 000000000000..1c3ca4e2711f
+--- /dev/null
++++ b/tests/auto/corelib/serialization/qxmlstream/tokenError/dtdInBody.xml
+@@ -0,0 +1,20 @@
++<!DOCTYPE TEST [
++   <!ELEMENT TESTATTRIBUTE (CASE+)>
++   <!ELEMENT CASE (CLASS, FUNCTION)>
++   <!ELEMENT CLASS (#PCDATA)>
++
++   <!-- adding random ENTITY statement, as this is typical DTD content -->
++   <!ENTITY unite "&#x222a;">
++
++   <!ATTLIST CASE CLASS CDATA #REQUIRED>
++]>
++<TEST>
++  <CASE>
++    <CLASS>tst_QXmlStream</CLASS>
++  </CASE>
++  <!-- invalid DTD in XML body follows -->
++  <!DOCTYPE DTDTEST [
++    <!ELEMENT RESULT (CASE+)>
++    <!ATTLIST RESULT OUTPUT CDATA #REQUIRED>
++  ]>
++</TEST>
+diff --git a/tests/auto/corelib/serialization/qxmlstream/tokenError/multipleDtd.xml b/tests/auto/corelib/serialization/qxmlstream/tokenError/multipleDtd.xml
+new file mode 100644
+index 000000000000..cd398c0f9fde
+--- /dev/null
++++ b/tests/auto/corelib/serialization/qxmlstream/tokenError/multipleDtd.xml
+@@ -0,0 +1,20 @@
++<!DOCTYPE TEST [
++   <!ELEMENT TESTATTRIBUTE (CASE+)>
++   <!ELEMENT CASE (CLASS, FUNCTION, DATASET, COMMENTS)>
++   <!ELEMENT CLASS (#PCDATA)>
++
++   <!-- adding random ENTITY statements, as this is typical DTD content -->
++   <!ENTITY iff "&hArr;">
++
++   <!ATTLIST CASE CLASS CDATA #REQUIRED>
++]>
++<!-- invalid second DTD follows -->
++<!DOCTYPE SECOND [
++   <!ELEMENT SECONDATTRIBUTE (#PCDATA)>
++   <!ENTITY on "&#8728;">
++]>
++<TEST>
++  <CASE>
++    <CLASS>tst_QXmlStream</CLASS>
++  </CASE>
++</TEST>
+diff --git a/tests/auto/corelib/serialization/qxmlstream/tokenError/wellFormed.xml b/tests/auto/corelib/serialization/qxmlstream/tokenError/wellFormed.xml
+new file mode 100644
+index 000000000000..1b61a3f06225
+--- /dev/null
++++ b/tests/auto/corelib/serialization/qxmlstream/tokenError/wellFormed.xml
+@@ -0,0 +1,15 @@
++<!DOCTYPE TEST [
++   <!ELEMENT TESTATTRIBUTE (CASE+)>
++   <!ELEMENT CASE (CLASS, FUNCTION, DATASET, COMMENTS)>
++   <!ELEMENT CLASS (#PCDATA)>
++
++   <!-- adding random ENTITY statements, as this is typical DTD content -->
++   <!ENTITY unite "&#x222a;">
++
++   <!ATTLIST CASE CLASS CDATA #REQUIRED>
++]>
++<TEST>
++  <CASE>
++    <CLASS>tst_QXmlStream</CLASS>
++  </CASE>
++</TEST>
+diff --git a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
+index 2a340e11bff5..30f54999e7c8 100644
+--- a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
++++ b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
+@@ -590,6 +590,9 @@ private slots:
+ 
+     void entityExpansionLimit() const;
+ 
++    void tokenErrorHandling_data() const;
++    void tokenErrorHandling() const;
++
+ private:
+     static QByteArray readFile(const QString &filename);
+ 
+@@ -1855,5 +1858,41 @@ void tst_QXmlStream::test_fastScanName() const
+     QCOMPARE(reader.error(), errorType);
+ }
+ 
++void tst_QXmlStream::tokenErrorHandling_data() const
++{
++    QTest::addColumn<QString>("fileName");
++    QTest::addColumn<QXmlStreamReader::Error>("expectedError");
++    QTest::addColumn<QString>("errorKeyWord");
++
++    constexpr auto invalid = QXmlStreamReader::Error::UnexpectedElementError;
++    constexpr auto valid = QXmlStreamReader::Error::NoError;
++    QTest::newRow("DtdInBody") << "dtdInBody.xml" << invalid << "DTD";
++    QTest::newRow("multipleDTD") << "multipleDtd.xml" << invalid << "second DTD";
++    QTest::newRow("wellFormed") << "wellFormed.xml" << valid << "";
++}
++
++void tst_QXmlStream::tokenErrorHandling() const
++{
++    QFETCH(const QString, fileName);
++    QFETCH(const QXmlStreamReader::Error, expectedError);
++    QFETCH(const QString, errorKeyWord);
++
++    const QDir dir(QFINDTESTDATA("tokenError"));
++    QFile file(dir.absoluteFilePath(fileName));
++
++    // Cross-compiling: File will be on host only
++    if (!file.exists())
++        QSKIP("Testfile not found.");
++
++    file.open(QIODevice::ReadOnly);
++    QXmlStreamReader reader(&file);
++    while (!reader.atEnd())
++        reader.readNext();
++
++    QCOMPARE(reader.error(), expectedError);
++    if (expectedError != QXmlStreamReader::Error::NoError)
++        QVERIFY(reader.errorString().contains(errorKeyWord));
++}
++
+ #include "tst_qxmlstream.moc"
+ // vim: et:ts=4:sw=4:sts=4
+-- 
+2.16.3
+
diff --git a/dev-qt/qtbase/qtbase-6.5.2.ebuild b/dev-qt/qtbase/qtbase-6.5.2.ebuild
new file mode 100644
index 000000000000..5e1b328fd988
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.5.2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+# Qt Modules
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd"
+REQUIRED_USE="
+	opengl? ( gui )
+	widgets? ( gui )
+	X? ( || ( evdev libinput ) )
+"
+
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
+QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
+IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev wayland"
+# QtPrintSupport = QtGui + QtWidgets enabled.
+# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
+REQUIRED_USE+="
+	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
+	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
+	$(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
+	accessibility? ( dbus X )
+	cups? ( gui widgets )
+	eglfs? ( egl )
+	gtk? ( widgets )
+	gui? ( || ( eglfs X ) || ( libinput X ) )
+	libinput? ( udev )
+	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+	vnc? ( gui )
+	X? ( gles2-only? ( egl ) )
+"
+
+# TODO:
+# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
+# qtnetwork: connman, networkmanager
+DEPEND="
+	app-crypt/libb2
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2:=[pcre16,unicode]
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	media-libs/tiff:=
+	>=sys-apps/dbus-1.4.20
+	sys-libs/zlib:=
+	brotli? ( app-arch/brotli:= )
+	evdev? ( sys-libs/mtdev )
+	freetds? ( dev-db/freetds )
+	gles2-only? ( media-libs/libglvnd )
+	!gles2-only? ( media-libs/libglvnd[X] )
+	gssapi? ( virtual/krb5 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	gui? ( media-libs/libpng:= )
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	libinput? (
+		dev-libs/libinput:=
+		>=x11-libs/libxkbcommon-0.5.0
+	)
+	libproxy? ( net-libs/libproxy )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oci8? ( dev-db/oracle-instantclient:=[sdk] )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tslib? ( >=x11-libs/tslib-1.21 )
+	udev? ( virtual/libudev:= )
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		x11-libs/libdrm
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libxcb-1.12:=
+		>=x11-libs/libxkbcommon-0.5.0[X]
+		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
+	)
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}* )"
+
+PATCHES=( "${FILESDIR}/${PN}-6.5.2-CVE-2023-38197.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
+		-DINSTALL_BINDIR=${QT6_BINDIR}
+		-DINSTALL_DATADIR=${QT6_DATADIR}
+		-DINSTALL_DOCDIR=${QT6_DOCDIR}
+		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
+		-DINSTALL_LIBDIR=${QT6_LIBDIR}
+		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
+		-DINSTALL_QMLDIR=${QT6_QMLDIR}
+		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
+		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
+		-DQT_FEATURE_androiddeployqt=OFF
+		$(qt_feature concurrent)
+		$(qt_feature dbus)
+		$(qt_feature gui)
+		$(qt_feature gui testlib)
+		$(qt_feature icu)
+		$(qt_feature network)
+		$(qt_feature sql)
+		$(qt_feature systemd journald)
+		$(qt_feature udev libudev)
+		$(qt_feature xml)
+		$(qt_feature zstd)
+	)
+	use gui && mycmakeargs+=(
+		$(qt_feature accessibility accessibility_atspi_bridge)
+		$(qt_feature egl)
+		$(qt_feature egl xcb_egl_plugin)
+		$(qt_feature eglfs eglfs_egldevice)
+		$(qt_feature eglfs eglfs_gbm)
+		$(qt_feature evdev)
+		$(qt_feature evdev mtdev)
+		-DQT_FEATURE_gif=ON
+		$(qt_feature jpeg)
+		$(qt_feature opengl)
+		$(qt_feature gles2-only opengles2)
+		$(qt_feature libinput)
+		$(qt_feature tslib)
+		$(qt_feature tuio tuiotouch)
+		$(qt_feature vulkan)
+		$(qt_feature widgets)
+		$(qt_feature X xcb)
+		$(qt_feature X xcb_xlib)
+	)
+	use widgets && mycmakeargs+=(
+		$(qt_feature cups)
+		$(qt_feature gtk gtk3)
+	)
+	if use libinput || use X; then
+		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
+	fi
+	use network && mycmakeargs+=(
+		$(qt_feature brotli)
+		$(qt_feature gssapi)
+		$(qt_feature libproxy)
+		$(qt_feature sctp)
+		$(qt_feature ssl openssl)
+		$(qt_feature vnc)
+	)
+	use sql && mycmakeargs+=(
+		$(qt_feature freetds sql_tds)
+		$(qt_feature mysql sql_mysql)
+		$(qt_feature oci8 sql_oci)
+		$(qt_feature odbc sql_odbc)
+		$(qt_feature postgres sql_psql)
+		$(qt_feature sqlite sql_sqlite)
+		$(qt_feature sqlite system_sqlite)
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	# https://bugs.gentoo.org/863395
+	qt6_symlink_binary_to_path qmake 6
+}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 75b0b28a0991..fc6dff2f9bf7 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,7 @@
 DIST qtcharts-everywhere-opensource-src-5.15.10.tar.xz 4254496 BLAKE2B 9a163371a6360fb39f57d08e282f4bca79c4839ebbb105ebb37f32797d72faac73cdf832eb64cb4d76196447f5feb3089287e98f6979e0bd6b2fba5f7e0d28a7 SHA512 15c76bc6b987b2d89473972df9cd4826913bb0dd2dffdb06fc6dfdbdd1a5676508584d5f0982b06ab513e46cee12871f3eb0ed00f94fccf23ef807079be96961
 DIST qtcharts-everywhere-src-6.5.1.tar.xz 4583760 BLAKE2B 5c9e13a54ae301930b11d96ea19aad327103c240de7763252434fda162b050b12f7439d550614596fa65daaa3063b6e657dd73d683fddcad59c7889ce6457828 SHA512 fe48ce2f4c3ba57f7ab23e7e5c02bdc303f1902ffa5b786e07d62b63b29551a0a3653764ca55c6b57b52f77b7a71795801e2fb942df1d8ccd03f594c92e6f94f
+DIST qtcharts-everywhere-src-6.5.2.tar.xz 4667940 BLAKE2B 36a24659e09e8f6d19c14683e86781ceb04efa80c9dc44e666202507b5d1a0586c1265ed6d5deecbdd18b4d7c0f0d539d9e829f90419ddb05a323ce389bb455c SHA512 913362f21668a81b82eff5125991b0b53ff9eeaf93dc6bf17539d4cffdc60e639a4e3490edec793d02ff942174ea3036854cdc8801382f4b8af341f8cbc3a1f1
 EBUILD qtcharts-5.15.10.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2
 EBUILD qtcharts-6.5.1.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716
+EBUILD qtcharts-6.5.2.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtcharts/qtcharts-6.5.2.ebuild b/dev-qt/qtcharts/qtcharts-6.5.2.ebuild
new file mode 100644
index 000000000000..92c6cf414b07
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-6.5.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Chart component library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui,opengl,widgets]
+	=dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 5d550490b0ed..9d0f2037352a 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -3,7 +3,9 @@ DIST qtdeclarative-5.15.10-gentoo-kde-2.tar.xz 25376 BLAKE2B 90978286216648900b2
 DIST qtdeclarative-5.15.10-gentoo-kde-3.tar.xz 26396 BLAKE2B 07ad0b115316e8eeaa1b9348cb6e742684b11d4d45087e763679938d43d77f90261a905037b07429d78933d7b7c487d3c1f7f1caedfdb5f6b512f4e20f55d946 SHA512 4d44ffaee5a3b1b01e5959f9c94a3daeda1528e4b7c0f267b11efac5a686c257b1f742ef38040a3ebad167faba0f61ffa2afc03d943770a9a9a005bd52ef99f6
 DIST qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz 21596352 BLAKE2B 4259b55b1406694cf10d5ff1c4bc2501b47a7a7ea4a09eeb77c08fa1417d5f8d028df1a0753af0d1ef52d7aa1331343c56b6c72adf462a6d1a1d5097c288ad8f SHA512 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8
 DIST qtdeclarative-everywhere-src-6.5.1.tar.xz 35506504 BLAKE2B 8748a3c29d2bb7888fdb275fe663c39bb9c23e2e8afddbfb2aef11b1b315083da70bb180e10c9474cda4c8df5396d47b0b45b6620618753a455bf68cdc06044a SHA512 7ec840e42b1042263aa41c5d339cfa8a7921e3c5f217e710df0737b2c5c44b1e6c0fae155af934087f5a623d9370f30f83ec5691eb473e52b46486f4938173c7
+DIST qtdeclarative-everywhere-src-6.5.2.tar.xz 35552840 BLAKE2B 048da9ab9433034ede21b51458cd3c7bd09d5364c8e2e65a02905bdc107d456ba0cbf2f9ea459324462c455fb33ef5f9b7bbbbe79e669100c82274476c10b34c SHA512 e6fd9dddbab72ee2e323d8ae0f4ac438b935477ad50b3e069a307993e94b289648d29ee265ac535e1396e4c1ba4bdf7e16b0cdf89a17df8d0a43bbe94f7316ef
 EBUILD qtdeclarative-5.15.10-r1.ebuild 1543 BLAKE2B 4f4d321275787c9e01f85022e3687f2ecd6d96ab6dbd848aa7255d72b9644822bf669ff63d3c98f942e07d36cc6aab65e337a298f0ca5abb0a659843960424a6 SHA512 819e891879cb938d9f7753246a174524ba0dd721314d7c199f086db604f0f5a508a570bffcea0a4f07c75cf814320292279fe64b2f765cc217e919901b70315b
 EBUILD qtdeclarative-5.15.10-r2.ebuild 1537 BLAKE2B ea417da488314eed547e9637796d153a358c8cec1645242338f6fa67605b45a886b9f91de62db4483f1a69b704ce852879948c097c66cdeb4f6e777a81c264f6 SHA512 a34ae5b04825f751715975dc927824b6ba4726564647e50d84f27bc1dc1d8c8a6dde27b02e568b01ee21f6a8476ac27d9db9b72fd3b3a4175be7043e89d7435c
 EBUILD qtdeclarative-6.5.1.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
+EBUILD qtdeclarative-6.5.2.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
 MISC metadata.xml 744 BLAKE2B ef479ad28d7560fc3abd2e743e8994a6a843bc1a4d0644ac037a4fa481f71a6ee73fbf99073769d20fcb245e6432556bc00707d3ecec1fb709ae2622fc9c5e31 SHA512 27d3e595647800c62e1275f2b5bfae0f2644fce547175cd5f63c4907c2313298b988f5378761868d2761c3edf396cfcf4d0c733032026e7ea0a9bf7ba367ecda
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild
new file mode 100644
index 000000000000..8c9a771cc98e
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt Declarative (Quick 2)"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="opengl +sql +widgets"
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=]
+	=dev-qt/qtshadertools-${PV}*
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature opengl)
+		$(qt_feature sql)
+		$(qt_feature widgets)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 03c85ee8e5a2..65984f52a0ef 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,6 +1,8 @@
 DIST qtimageformats-5.15.10-gentoo-kde-1.tar.xz 6944 BLAKE2B a9e43d63cc2db043723ea3403fe24e51df8e4a6be670b7348d97c6518be04a508877868ddf907583de68f7dc209c474bac97a86102af3631c0eae257914760fb SHA512 1f8949fcc6c2733fa9e8da485bffb9e4ea7260bf50146196fabc3264916f240ba2789ebc01c17d8972b2c7d7f96644b0a431de02ffb889cf06369c04df6abd60
 DIST qtimageformats-everywhere-opensource-src-5.15.10.tar.xz 1845088 BLAKE2B ff704a5ea07173f2e6e9fe72f4e9ab11093a6cd80bedc56efeddc68ff4a53ac46bcd6d6871697f5dcaab537a6b3238aa5a61120090670a4ef529bc5173a44b81 SHA512 7373884e5f01da0aae6f7d4575ca953de3be6cd41d3d19aa29bb2a2e5998486407525f23122e8b13c26143e64aa95d4756c5381643e93f930472c9890e6561de
 DIST qtimageformats-everywhere-src-6.5.1.tar.xz 1958432 BLAKE2B 6b7aadd9d8414ab2c767290c4964197230dd73aaa792763216538acc6323d39b4230dfe2c20a8b4988e93a64ed447c7a9bdc63168931c239ad23d266dce853b8 SHA512 41b82b829579d81e964212ecb6adf56a02fbe0293c33718c428977eb55df2008ea0af6214e051b5415fdfc828c532276be7b9cfb1523d8fc4dc07d4b337d49e3
+DIST qtimageformats-everywhere-src-6.5.2.tar.xz 1966744 BLAKE2B 953b0ff7a9f79860c60651645441ebd853b355140a30b34fc0c8dec2d50e532733f3cce11de8315e756abea9f45d8b595aaa6b3a5e1a8cf751ee202f45fe5d67 SHA512 c7262b773642f216b5f6ca3496cce294f1acf7bbf55aa61db1b60ad24ec0c332b83aa9b43e8baa5ce33a54826364385b4de00426e5556fe821c3b5e770d53819
 EBUILD qtimageformats-5.15.10.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
 EBUILD qtimageformats-6.5.1.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
+EBUILD qtimageformats-6.5.2.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild
new file mode 100644
index 000000000000..ffa831e51aa5
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="mng"
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui]
+	media-libs/libwebp:=
+	media-libs/tiff:=
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_FEATURE_jasper=OFF
+		$(qt_feature mng)
+		-DQT_FEATURE_tiff=ON
+		-DQT_FEATURE_webp=ON
+		-DQT_FEATURE_system_tiff=ON
+		-DQT_FEATURE_system_webp=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index f4e79ab552a4..e424b945b52f 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,9 @@
 DIST qtlocation-5.15.10-gentoo-kde-1.tar.xz 3664 BLAKE2B e2d694772a43ca4bc27c819d8fadf5bab3ddb40644d5a08315faa5af63a7aace6475c2dd2b6d612dcb7705113211cd50e6e83ce79773ec6033767be0fb761346 SHA512 c3917fa4db6316c9e173c475d8606b7fd9dc3cfed29487fa23c9b6df68887d799e6260abc3f5cd144e9d8c1e95e66b0de429bf59f15526639aab4d430c3d439a
 DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4
 DIST qtlocation-everywhere-src-6.5.1.tar.xz 3032784 BLAKE2B 78f2254e56d97dcbe380832dade72a0dc47a9f829764b6c4d584acf00b0b64f9ff37135b01fcc34a5efef8f9b5877c511395de69138030c47eb077f5d18346a0 SHA512 31190ca57feb4ed8b72d5bb5896a81da56632f873609470e760b390a3839f84bf8f6771c6acfcccec6781c694642b85ea34b0c7321528df5a0529af3d2bc5ad1
+DIST qtlocation-everywhere-src-6.5.2.tar.xz 3032488 BLAKE2B c8cd34980b0f78326fb70bf76a04094cf3e27afbd6aed6d982ce30abfa9dc4250d164dbe11c1027bedcdeee3b7c907c3716e88f16eeae173b846ccdf2c38d458 SHA512 b1e5c1813deb8a4eb9f8548afa935f1a2145ed3168f0276493ea501057fd4f70b8980ae387248a59e50f0e450ae245a04cd8636fb61d37af9c3634ff1cdd24f3
 DIST qtlocation-mapboxgl-5.15.10-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb
 EBUILD qtlocation-5.15.10.ebuild 1544 BLAKE2B 2943df2242ee45db0180334464d327614bcfb6ad93cd8117e4f6c81c3ef2384199dc547743f5784a0b88e976ea5296a833fbad986eb30eb947d6004283b69dd3 SHA512 453d7c2b6ab694e98c1ec9d08af70994910e8537f75d02aca8117b9887b3e7d98ac27f391b76327668a57d5a0186ebffb4b13f727d87feaaac4f0a0e1d5a2acd
 EBUILD qtlocation-6.5.1-r1.ebuild 433 BLAKE2B b70a66d0ad3fd02696537c32677077786d0f528a7676af4a3e68afca659c64436b398f046d2a88ab513bb1ef4eecde08beb26a6f2cd3a5063f72b0f8fda26489 SHA512 f742f4ee5f73d0a5fcde8bf993c7e09495f852b0b62f2f5fa0925df31a69088c2712518542a06374373a5c3e91098c5f44ec2d0585354effddd44d736a81cdea
+EBUILD qtlocation-6.5.2.ebuild 433 BLAKE2B b70a66d0ad3fd02696537c32677077786d0f528a7676af4a3e68afca659c64436b398f046d2a88ab513bb1ef4eecde08beb26a6f2cd3a5063f72b0f8fda26489 SHA512 f742f4ee5f73d0a5fcde8bf993c7e09495f852b0b62f2f5fa0925df31a69088c2712518542a06374373a5c3e91098c5f44ec2d0585354effddd44d736a81cdea
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-6.5.2.ebuild b/dev-qt/qtlocation/qtlocation-6.5.2.ebuild
new file mode 100644
index 000000000000..0862902e101f
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-6.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[network]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtpositioning-${PV}*
+	=dev-qt/qtshadertools-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index b64a611e3775..83049165b15f 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,6 +1,8 @@
 DIST qtmultimedia-5.15.10-gentoo-kde-1.tar.xz 2420 BLAKE2B 9062d863dc7e47a5690c75a98610ecca442a24ba1fc29ef62ef75db8f2e9cbc7ea02d82fa46dcc78200b6393dc36e726a92fbb95d3e8326395400c36160b77a3 SHA512 acf901d880cfb8478647c62ec349009bfea62bb65fad1f4431a918029f482a493ce4e2d78e8d00815659e3e109cc9f668dd7d1d6b9cb8eb2b41b487a0fceac5c
 DIST qtmultimedia-everywhere-opensource-src-5.15.10.tar.xz 3832156 BLAKE2B 88c01c685294085fdde9f00e2e2ea0952311cef910ee037bd6ee204cf7e00bc25a6aeecbdd70e4822bfe4de40cb6b991a8f4a72bfd74872110d43154aefce0b3 SHA512 a322dba0daced00cf0a7fcd21b7f55c281dec107b7976792406ecc7658c94ea1a40c81c7cbdc0987f1be32cafd2458993c92db87fcbfdc7ba1243d2e0047896e
 DIST qtmultimedia-everywhere-src-6.5.1.tar.xz 6290204 BLAKE2B 3ae21e2d0c50c4d8d99e3d0e2a15405a04c1f0f2d8bef204975185828aada27008a8b03756652b4700afe1b189e391e113c11e2283a39200652a211dc4e0c39b SHA512 2085d223869b627a2e5590a08081eb23ca34f8122c6492867db4596d5414e9c3eeca9338cf1745638ee60f0c559cbaa73aaab14c40785accf60a0d7e177fb937
+DIST qtmultimedia-everywhere-src-6.5.2.tar.xz 6415576 BLAKE2B c0032c405315e6884de6bb851de3aed0b60827a932c15b1022dca70ebfaa5dffb258b2b22f9ab40f57586490db6ec50ea862152fca8429e600f9c6bffe2f42a2 SHA512 e12a2406e78eda8f3f4674b8fe01b06bc2c7b8fcbe5342e25e28340e13c0ab0db44a78c91a8a1f268664e5bb11c3bc7116248700f0c67faa618e058af0dfb1e0
 EBUILD qtmultimedia-5.15.10.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
 EBUILD qtmultimedia-6.5.1-r1.ebuild 1304 BLAKE2B 8d4ebb427a8c00d86b49d6d93f07ef0f0e0431540e471c50e9e741d4f5d8cff40daf4c0a5234b0deb2401a19dc272bbe9e3816a7f964046a5ec2851ae8d6bf0f SHA512 c999d2bef01cf7f01d720128eec4d73366d92c157fbcf365f07f975f633b90fc61e4ac5dfd3e3ac1d568e8736e565fc92d7b8921a15d29cc95dd4ef8e0f21716
+EBUILD qtmultimedia-6.5.2.ebuild 1304 BLAKE2B 8d4ebb427a8c00d86b49d6d93f07ef0f0e0431540e471c50e9e741d4f5d8cff40daf4c0a5234b0deb2401a19dc272bbe9e3816a7f964046a5ec2851ae8d6bf0f SHA512 c999d2bef01cf7f01d720128eec4d73366d92c157fbcf365f07f975f633b90fc61e4ac5dfd3e3ac1d568e8736e565fc92d7b8921a15d29cc95dd4ef8e0f21716
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild
new file mode 100644
index 000000000000..1091cf2d5cf6
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="alsa +ffmpeg gstreamer pulseaudio v4l vaapi"
+
+REQUIRED_USE="
+	|| ( ffmpeg gstreamer )
+	vaapi? ( ffmpeg )
+"
+
+RDEPEND="
+	=dev-qt/qtbase-${PV}*[gui,network,widgets]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtquick3d-${PV}*
+	=dev-qt/qtshadertools-${PV}*
+	=dev-qt/qtsvg-${PV}*
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? (
+		media-libs/libva:=
+		media-video/ffmpeg:=
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+	)
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/libglvnd
+	)
+	pulseaudio? ( media-libs/libpulse[glib] )
+	vaapi? (
+		=dev-qt/qtbase-${PV}*[opengl]
+		media-libs/libglvnd
+		media-libs/libva:=
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-base/xorg-proto )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature alsa)
+		$(qt_feature ffmpeg)
+		$(qt_feature gstreamer)
+		$(qt_feature v4l linux_v4l)
+		$(qt_feature pulseaudio)
+		$(qt_feature vaapi)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 700ae7d8f0df..490648a71545 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,7 @@
 DIST qtnetworkauth-everywhere-opensource-src-5.15.10.tar.xz 144780 BLAKE2B 81a26919bef970538dbaa4f8bb219b694e190cae2cb2e156fdd0af3997fd5b86facb0d4841a92161703c78deb675f76a8950889c9a2c08156f2ce34b4ec88bef SHA512 bfdda139223d183767e50fb95309dee7cd85c42fa09a00246a38987bf1570d84a137fb3fc71119416cc45126f21f6964f430b031e5acd4447caf30d0aac3bc2a
 DIST qtnetworkauth-everywhere-src-6.5.1.tar.xz 150892 BLAKE2B 1654de2db82102845d845592d78e3690bc4d3eb9d7d9c80a7d34ee47e69a003f8450d78e6a580517a066d90add4a6f846db3e3ee5e666e9bb5cc3ecc208be4ac SHA512 04ddad0dd13ccef59790d9f0db394752076b0663a76c049a0a987e4841b5ad72fa053cbbb998cae9120481f683c5a488bb0b980fc3f6801b83078ac423a7079d
+DIST qtnetworkauth-everywhere-src-6.5.2.tar.xz 150416 BLAKE2B 68ed2266051fb3caa0ddb59c1d1591e35b39aea1432da488f563ede86b9e2ecaa1d556b42c9b828910bb30eca5e413f5aa0a81f2196f02456aea303ebe55b084 SHA512 f9374c2729f584532e90114a3bf8939eb27e90e31a2c76c414e8e5fb23a1feac96b23ec31ebfc59122f7d8431ef2ab285a8e840ffba143752e586a0a527d3436
 EBUILD qtnetworkauth-5.15.10.ebuild 402 BLAKE2B f6aada3fab2a9a22353930bcc8c96fd46806ccc46792a9bf770a812245a9b246722101f40c0ac9a8b3fe115a94f38c4d32e988cd23f0f28133ea08e858b95414 SHA512 63a5ddf86500089e2f7fa44ebb585a11bf257222a9a9b96fa8985b5acb56301a8680f04ec0ee4cee0bd9dcd3761031da704f71bd18dfe7c88aeb9fcc308d222b
 EBUILD qtnetworkauth-6.5.1.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514
+EBUILD qtnetworkauth-6.5.2.ebuild 337 BLAKE2B b9d2380c3f88cd04c9ae3c64e799fe978be6d05d6debd960d31018aca0bf67fd7831b17bbb4ed9a917477817b2eb011bbd9141e6b8f4d649179019146de03105 SHA512 11f4aa6fb4fdb30132c344e9fbab81006cba7cc8cf8b5c81339c837940f928a3752ad05d367500811f87f3a606ee432b717cce1dfdf801e6c293e112158cc514
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild
new file mode 100644
index 000000000000..90c313132402
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Network authorization library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[network,widgets]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index ead96189fd0b..9a8e5c509934 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,7 @@
 DIST qtlocation-everywhere-opensource-src-5.15.10.tar.xz 6552240 BLAKE2B 1e44bdafcde01294424cef1963924b85fc4f3cc8ab19b1ae37d79d10cb0bbb1a482f592725fa28e0f039fc84cb2167df4d15e23e4060bd7c49df013c54322665 SHA512 e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4
 DIST qtpositioning-everywhere-src-6.5.1.tar.xz 1455492 BLAKE2B cab4f2f7d08a72ef5de8e3bc668b5949df3bb2a3f200bbe5382b49a21f1e8cc6855b4d8fc51881d56babe3c5212bfabc56f8670832f581e9d900e506b4b8f3d6 SHA512 67006663299b14a85a4a7cab2a03ec39f3b938c0f2f09520e3869509bedd24a2053e6f964bcca4d02df71c21d184b253f46cf1dd59e9da5c22cefbd1910ca305
+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.1.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
+EBUILD qtpositioning-6.5.2.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
 MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild
new file mode 100644
index 000000000000..60873b452acc
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Physical position determination library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[dbus,gui,widgets]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtserialport-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index e37b838c79e9..c000f0f1ad1f 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,3 +1,5 @@
 DIST qtquick3d-everywhere-src-6.5.1.tar.xz 59685252 BLAKE2B 96b47efee68a21602a861017dd99c2ada50ff66728cb3940b2d432f6d46d2afc12064e9370f79df1fd2760cc4ba5329e9305ed88a192376daddc33e9330a426c SHA512 a06ac092d923e103ca2902f363a1a47c7696ba3b356f61473d8b461ef3663aad80c8fbc8a22efd04def76ce2a7b7a3a16b7be5a9f9f58f198b18ee27d2f913e8
+DIST qtquick3d-everywhere-src-6.5.2.tar.xz 59171420 BLAKE2B 91012368061acf6c4057362a380fea2e3fdc46cf63644a667d7b05450fbbeb8c8dae3765c5617fec8c8a1fd3f880fad21c8e6524c3240f040c9dfdbb80869423 SHA512 2a26f4fa4e4d88b4205813a8bba1c83811354e5ad5e7aa832fd46c5956b46d15e690c359d83f85018c1430e15edd151207411a50227855de4fc8451db710ace2
 EBUILD qtquick3d-6.5.1.ebuild 667 BLAKE2B 0cafb500af3c6ee81e35aa86ee82a2d891a4e5537382858d998c865dec646721f698176d523371e4bdbe124dc684900ec08d6a786e0822ca72a3aebecd2bfac6 SHA512 27467129bed7575cdaf45ec48087cce9bc4c5915fc12164dbe710d8096735083ae8fdd671ca184c163194f95dc6c91264fc66623ee1e43ab83dc9e866fe50139
+EBUILD qtquick3d-6.5.2.ebuild 667 BLAKE2B 0cafb500af3c6ee81e35aa86ee82a2d891a4e5537382858d998c865dec646721f698176d523371e4bdbe124dc684900ec08d6a786e0822ca72a3aebecd2bfac6 SHA512 27467129bed7575cdaf45ec48087cce9bc4c5915fc12164dbe710d8096735083ae8fdd671ca184c163194f95dc6c91264fc66623ee1e43ab83dc9e866fe50139
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild
new file mode 100644
index 000000000000..92a82e63dc8d
--- /dev/null
+++ b/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	# Don't clone qtquick3d-assimp.
+	EGIT_SUBMODULES=()
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[concurrent,network,widgets]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtshadertools-${PV}*
+	=dev-qt/qtquicktimeline-${PV}*
+	media-libs/assimp:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_FEATURE_system_assimp=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 53ebe614c2fd..a11729c57d39 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,5 +1,7 @@
 DIST qtquicktimeline-everywhere-opensource-src-5.15.10.tar.xz 105584 BLAKE2B a99e6b3813527ec0f7a835167ae356c555d2e18cc67cf40853264df8e6443543755e82177c8033aaa8ef7a0645a9263fd4b97dc2084b5470b51fd889c1c70e93 SHA512 702f3f260e52659cf58a093e6019e26402db867bd65052c2b01c9ee1a995e8eeb0ad1f1dcaa64a9db4ca56f81ffd2d177319a7a4f379ca0f3bb7f27295f08541
 DIST qtquicktimeline-everywhere-src-6.5.1.tar.xz 113720 BLAKE2B f93083656fc52931e34619605efb37be8c0dbb65a30c8d23a9c41ac948842773570c5251ed135ddad0b42b6d2252e6dfa13e1985b5efbeb684c38e3ae73b3bd1 SHA512 72fa2c96beabf2ad734bf458f5a41edb7178bcf9c53184425ac33e75d648bd617ebc393a4036226846e3ca407fa17fca7bb15a23b7c75f12796353deddb962fc
+DIST qtquicktimeline-everywhere-src-6.5.2.tar.xz 113208 BLAKE2B bdf2537cfa13415e570d66a0b0f96c0852e62c8e2cd746c8ea7618e0eddb89b79dc8b75964460d806ea869b6c4dc1eced7cafa8c63dc2afcce231884cd601045 SHA512 4447973fba264b4a412f7a29b5d32c6ad1c62a5dc72ced8a8f88d565655fec3bab3e5047d0f7323f5415f2c7e5782bf533a67a778f1daa55cda588ccabe0054c
 EBUILD qtquicktimeline-5.15.10.ebuild 366 BLAKE2B b96a5118b144bdd8ecb543224e233d45a30a529a20d9795e1f2c1fe96ec4cbc52a921bf4d294e04cb51f07f866b5f62fcaf5ffb21f8984c387d5971ea78aa128 SHA512 933d5f932a33831742e2fe6001f9db49ab0dbb0cce45d8d42efca9036aa533ef55501b132e61daf03a19be8153defb7bc21e180efabbd9a98a6aa2224239b825
 EBUILD qtquicktimeline-6.5.1.ebuild 349 BLAKE2B 87abc1b15b3f35c9aaa0422bf73321342981ff72d9e2eac71746fb12488a9740f472306a9dc1e7ef04624df47d169a15baee90c66a537432055c1a220e1d2b38 SHA512 40bcd48c890001940463e12a49eff06f600a5dddfe039518b142ce83ccef86d01a2421af8beda249c7c81cc4c9845b6f00e8cdf2a4e74abbec91f25556928504
+EBUILD qtquicktimeline-6.5.2.ebuild 349 BLAKE2B 87abc1b15b3f35c9aaa0422bf73321342981ff72d9e2eac71746fb12488a9740f472306a9dc1e7ef04624df47d169a15baee90c66a537432055c1a220e1d2b38 SHA512 40bcd48c890001940463e12a49eff06f600a5dddfe039518b142ce83ccef86d01a2421af8beda249c7c81cc4c9845b6f00e8cdf2a4e74abbec91f25556928504
 MISC metadata.xml 383 BLAKE2B 8f734db19973b4ebfe57cf9417f7fbf6db00ca254cf2410e336c2f252aff7e85500d5fdb944e511a48bf08ebb3ee74e729073f567b9d7558efb19024f7c1e10e SHA512 c0c9a947c7ab5edce2487560d6d9c215966ba5804e370557f2d2a35d67bc6c1ac8a04afdaac8c733cc66be0977835826ecd817248b83c01f4230f8824fbc41a1
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild
new file mode 100644
index 000000000000..3b0370aab04e
--- /dev/null
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module for keyframe-based timeline construction"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*
+	=dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index c6f78b061d88..ff9bd7c4a959 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,7 @@
 DIST qtscxml-everywhere-opensource-src-5.15.10.tar.xz 437404 BLAKE2B e36e866e4c02722f88499cc92bf27d2401f2b89d19fed83915803f6c8a367007fc386df250d11ecd92e5c80713924dd9992608769dbb0a42071f0d928317d935 SHA512 93e2df05da176802a0439ba752f52d1c84d291a2addf9492aaab2099f06efb32d896edd0660711bb2e0b67f7a9ea2c4d31b4ec3366f6230140d3de0056478923
 DIST qtscxml-everywhere-src-6.5.1.tar.xz 1164020 BLAKE2B c0d5dc1f98cca202923343085097ba0d81ce3b4f0706254792f8e6f60709796f7dad0db9352aaf5d5f9283d5e231d3b927bdc9317d9b7130a19c194efed0bc6a SHA512 5be0c7fc913880500e360860a9b1f50dc868b4e4b02c6e774578221754a88ece44d90d80ea85aa74b23cc3790a20f1e2b00b7d395612143d42e7c63708ed9dd7
+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.1.ebuild 397 BLAKE2B a479e813b27792c70211b5a8c20f473a0dc2517fce50394e233f78de410ee0c42dfb1bf6b4ba966d680516ef3777a2f3859a310d5c121c8a25d8b44c8a9aef30 SHA512 f52bb5c201d5d24944cec6a7385ce8fc5290e6f78f6d13fa652222678295d48ae5fbd24b8222f5add4ccab195b8902fbbbbe53bbf71be56a1f1b76b5ba98dc12
+EBUILD qtscxml-6.5.2.ebuild 397 BLAKE2B a479e813b27792c70211b5a8c20f473a0dc2517fce50394e233f78de410ee0c42dfb1bf6b4ba966d680516ef3777a2f3859a310d5c121c8a25d8b44c8a9aef30 SHA512 f52bb5c201d5d24944cec6a7385ce8fc5290e6f78f6d13fa652222678295d48ae5fbd24b8222f5add4ccab195b8902fbbbbe53bbf71be56a1f1b76b5ba98dc12
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild b/dev-qt/qtscxml/qtscxml-6.5.2.ebuild
new file mode 100644
index 000000000000..2fedc64db025
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-6.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui,network,opengl,widgets]
+	=dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 8caee119cb31..338d0fbd34f7 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,7 @@
 DIST qtserialport-everywhere-opensource-src-5.15.10.tar.xz 324256 BLAKE2B 7d5492648854877b42a4a058ee2e1205f67d2ad949041d62f800f0fde701e02b7651efa16dcfa43d0396675009ebdc9362fd74eccec06f079847b7ffff0efd24 SHA512 59face48cce750fb02c112dbef9c997a5b61d84cf8085a0f8c59c3bb5c93d7110de9c9830f26f3ed61fffb2c23eb8a42d5683211abaa6e5147cf87643469a45e
 DIST qtserialport-everywhere-src-6.5.1.tar.xz 279664 BLAKE2B 5c3990cd08a40cd7db5fb81eaba7b0344c5fe8efc373007510cd241cdebb2d92044a97c3dfebf267b17f7b3d7f1f7ff17e2333d994735cea499d46000f6ae9d0 SHA512 2a85f98d6eca51896a8e32bb531326c8479fde8d09ef2936ba1acb2bbfcf565ccdbffde29fee3b685709b8e1aa3a77437515607f280b483937c417dd15d55793
+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.1.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39
+EBUILD qtserialport-6.5.2.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild
new file mode 100644
index 000000000000..bf569254cd0a
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Serial port abstraction library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui,widgets]
+	virtual/libudev:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
index a3373ecee20f..7e79d1c0dc48 100644
--- a/dev-qt/qtshadertools/Manifest
+++ b/dev-qt/qtshadertools/Manifest
@@ -1,3 +1,5 @@
 DIST qtshadertools-everywhere-src-6.5.1.tar.xz 1061792 BLAKE2B 02e2f3259c2e70b71c227420ab7ac3367bf91d1c64dec960b60af4ffe185e09efa6062bf20bb730e0812fa9be630c770a3e71bc53f686a1f03ffa253577a0343 SHA512 547c5e0c6220c6200f440ed1d6f3373423fceea09de8d1dc81c5d49f7e24beee6d460341828d74844a2e1af1181c702d93247dd95b273a0b1e110dcdcab69557
+DIST qtshadertools-everywhere-src-6.5.2.tar.xz 1061812 BLAKE2B 33b997f121ae408f9cbbba53c08d015f55709b3558e8ef1f0ec41c2313f1d4e51051c4bd540e25b1fa91c1bd9d7dbba381e363ee6fae1df6d728ad95727dc829 SHA512 95a697de1e0b415b700edc86c452847f37478951c547fad42c8373c592a1f474b824df7c2d1ae3b26fb9401df3c523431633e0293f5e472732964cb527def6be
 EBUILD qtshadertools-6.5.1.ebuild 314 BLAKE2B 315c0b8587baa11c5617ba89725807911c0a85e7b25bfd9bf4b6b6a0fd3b463acd9dcc623473a4bed6fd3af1380e8843483390d59469ad37c9a497be579947d7 SHA512 ac316a5580819aebd7b94e2ed7d97baaeb2d054faa0d6d0c21b65bc5b2eeb90feb0a8a9fa66a92e6dd275dbb5e153f7728a930fbeca2d1abe3d17d210e74254c
+EBUILD qtshadertools-6.5.2.ebuild 314 BLAKE2B 315c0b8587baa11c5617ba89725807911c0a85e7b25bfd9bf4b6b6a0fd3b463acd9dcc623473a4bed6fd3af1380e8843483390d59469ad37c9a497be579947d7 SHA512 ac316a5580819aebd7b94e2ed7d97baaeb2d054faa0d6d0c21b65bc5b2eeb90feb0a8a9fa66a92e6dd275dbb5e153f7728a930fbeca2d1abe3d17d210e74254c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild
new file mode 100644
index 000000000000..88a20ffbb689
--- /dev/null
+++ b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 8b94f0f0ed0c..b3cefa085a39 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,6 +1,8 @@
 DIST qtsvg-5.15.10-gentoo-kde-1.tar.xz 5012 BLAKE2B 2eaab709cf165108b6f18ffd88ee7333ebbbca94500fcd426e155c4ef85670b565ed5db6a89c31e542118a4f048bb347375964e9056badd3c7ad5cabe3367d3e SHA512 2d3168540cfbb51302a3824f936c1c33a01864793a5eb56287dd0b13bd2ed3b23df3049d295fa5ecd94d453deed67542f5bcccc6071570a802cf04c1caef6138
 DIST qtsvg-everywhere-opensource-src-5.15.10.tar.xz 1889960 BLAKE2B 14ee7bbf0914e47d8fc39790ce597fca0085e6018d33878752e707a9ece567bb139bc2f1e689840d6641aa6db958240a4f97fab69e7200385ddb2ee53abc5f04 SHA512 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7
 DIST qtsvg-everywhere-src-6.5.1.tar.xz 1728900 BLAKE2B 9003463afefb97fea05dcac2b9a56f31c3e5a64a76e4a3b4b04bccfe73c691f48a4c8696aeda7359d113c6fd7c8ec7c0bc094d092f3db2338e0ca136792b7705 SHA512 4df0e02aa9b21091eb71a536befc52d8e7bd5f6d9fa757fcf0ac2f11e44d3f84b44d73551e44bd6a1045891bc9c0ed471820a94b8f014b3a82cccf32b10ac437
+DIST qtsvg-everywhere-src-6.5.2.tar.xz 1727648 BLAKE2B 65dc5184e89110d3543386526e2625431f162f0da2834e42f0c5f9d3b6e33e74315dfa5f0365d33d0ea1af824d4dbca6a4f4b9bcb8a32d13fcee4b5e82ce426e SHA512 34f572eceb27021d2b55d67ed2de84f9d41c0cb2463c5c8e9c9e270b52782d32f707b83fdc95c67f306bb82a3ea44a5d48921e6bc979197ce6bc94eaf89ccb20
 EBUILD qtsvg-5.15.10.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069ec3917aca6c88c33345109bf127802e01fae1da95a5945fc7e44db8f3a2f3b7f6b699fcfbcc3367b082f2563 SHA512 b94101d98d128f952a0bdc6b14e04c76e492d6925e06d6c0d97d077f908196d944169a196a28e4aac384c261c93a6b5fa2dd94646c4186b392fd1ec57f885e15
 EBUILD qtsvg-6.5.1.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe
+EBUILD qtsvg-6.5.2.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-6.5.2.ebuild b/dev-qt/qtsvg/qtsvg-6.5.2.ebuild
new file mode 100644
index 000000000000..960a981395e2
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-6.5.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="SVG rendering library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui,widgets]
+	sys-libs/zlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 274dd1ca9038..275d8aeadcdf 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,3 +1,5 @@
 DIST qttools-everywhere-src-6.5.1.tar.xz 8592428 BLAKE2B 39a8eef639d4dea838b177285af175983e1e626cd82df8b2201b9380c4f62d5ec3560a7096b6f26a48886989be05bda453e487462d9e200577f15c9cb93eb26a SHA512 fa29a29bf9a723f88aaa5654e333daee90d8dc2f5c88653018a5e754c8115eec3c55940897817e0321dd4c9470d6d008e921ab7e20a714028fa38d04753bfb20
+DIST qttools-everywhere-src-6.5.2.tar.xz 8591336 BLAKE2B 37adbaec83938d4dae096b1ab4e49d1693ab2a926b3b61f5b40f45c8f89ba71ae847abf6eab4db26206dfc9896e5a880de489cfe17c942e66383dcf9b6fc7397 SHA512 d5b858b5307b2abfda2786331034a2957afbaba6299955bc3a2489f15bc8c2613b613b0f6f1fdf2aabfa9929a44eeeae3faeb26e0ab176d347e8ddd47f0e8011
 EBUILD qttools-6.5.1.ebuild 1846 BLAKE2B 6b5787882cb6684fbb3f09c90de1ce9782d3d010ce3ce762f75439fb207d1bde9af9fd6d3a44c081626d12cdab6daf8d8dad7d8cb7d4abbaa8a601337222f60b SHA512 27d05449276f44ea507d3791432bf36c5530846184d98363f7bfa63888781957f6e73bead5c9b4df95891a4855cafc82fce68fa71b74d5f633053519b670e822
+EBUILD qttools-6.5.2.ebuild 1846 BLAKE2B 6b5787882cb6684fbb3f09c90de1ce9782d3d010ce3ce762f75439fb207d1bde9af9fd6d3a44c081626d12cdab6daf8d8dad7d8cb7d4abbaa8a601337222f60b SHA512 27d05449276f44ea507d3791432bf36c5530846184d98363f7bfa63888781957f6e73bead5c9b4df95891a4855cafc82fce68fa71b74d5f633053519b670e822
 MISC metadata.xml 1091 BLAKE2B b10645f2835b9c5163745ff656e5b2a25277f5d1de7de4c294161f85f7eae51a7bf55367215bc9c183eb6700ec12a3f1fe51cad98211c98a2f51df2efc972ae2 SHA512 93d7528b809549f111b61cef09176d62a25b6e67668cdb9cda8d099464496b5ed63eddaa81efed222d7f0afec287d75056a117d6379fe7af61f463ac85e33c1e
diff --git a/dev-qt/qttools/qttools-6.5.2.ebuild b/dev-qt/qttools/qttools-6.5.2.ebuild
new file mode 100644
index 000000000000..e75eadff55af
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.5.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="
+	assistant designer distancefieldgenerator +linguist pixeltool
+	qattributionsscanner qdbus qdoc qdiag qplugininfo
+"
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[network]
+	assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] )
+	designer? ( =dev-qt/qtbase-${PV}*[widgets] )
+	distancefieldgenerator? (
+		=dev-qt/qtbase-${PV}*[widgets]
+		=dev-qt/qtdeclarative-${PV}*
+	)
+	pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdoc? ( sys-devel/clang:= )
+	qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature assistant)
+		-DQT_FEATURE_commandlineparser=ON
+		$(qt_feature designer)
+		$(qt_feature distancefieldgenerator)
+		$(qt_feature linguist)
+		$(qt_feature pixeltool)
+		$(qt_feature qattributionsscanner qtattributionsscanner)
+		$(qt_feature qdbus)
+		$(qt_feature qdoc clang)
+		$(qt_feature qdiag qtdiag)
+		$(qt_feature qplugininfo qtplugininfo)
+		-DQT_FEATURE_thread=ON
+	)
+
+	qt6-build_src_configure
+}
+
+src_install() {
+	qt6-build_src_install
+
+	use assistant && qt6_symlink_binary_to_path assistant 6
+	use designer && qt6_symlink_binary_to_path designer 6
+	use distancefieldgenerator && qt6_symlink_binary_to_path qdistancefieldgenerator 6
+	use linguist && qt6_symlink_binary_to_path linguist 6
+	use pixeltool && qt6_symlink_binary_to_path pixeltool 6
+	use qdbus && qt6_symlink_binary_to_path qdbus 6
+	use qdbus && qt6_symlink_binary_to_path qdbusviewer 6
+	use qdoc && qt6_symlink_binary_to_path qdoc 6
+	use qdiag && qt6_symlink_binary_to_path qtdiag 6
+	use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
+}
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index effd3b7a11bd..f1904d0cc7e5 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,3 +1,5 @@
 DIST qttranslations-everywhere-opensource-src-5.15.10.tar.xz 1635736 BLAKE2B c21f5fed04502622377bc1eaa11dab2d4e693ca7a882ced21920926fac74fc75b92d16a26c35133f1437cef51d1effbcaa292ef2a768e085f54b10774d47f8fd SHA512 94f22857cf9f14f13f774ee5632bfd0fc367ca5fb745cbfb3997fee8651961d9547f0a629afc54c35b2e4493244da9b94214777e20340c2b203c538bc1c84a22
+DIST qttranslations-everywhere-src-6.5.2.tar.xz 1468624 BLAKE2B 4201ecaf6fedb920ff49fafed7579af2a676a9f34e33bda886f3898a111c49a716cf4c161a51724298f4b477320610ffdc03b00555b5d7e4486d729afcd4b162 SHA512 2930153207a6ba7bb6720171f2be1c845e84edef87abd5ec6a4464c4386fb58fbdd59740c210727eb6b058ceffcaaf0aaea99e968215b68b121eb35d6e4f05c2
 EBUILD qttranslations-5.15.10.ebuild 379 BLAKE2B f7a1f63d58d4a09bdf92cf91f2ec0c546a8626cddc7bcc9d55c70eab8db038d3ae6912e0909f660099af7d4998e99353d0eda9d98da253f7021b8008c1d30b41 SHA512 bf741516c6b8ad79fac401a29befc1004926ce203460b0c5f261744c70db5bcc0047b9af8f36153668b1680fefcbd80f50840623d5379be43ce059e1373c4506
+EBUILD qttranslations-6.5.2.ebuild 337 BLAKE2B 8d8a63511ce337c9a7eea482bb42e1297914b0a0665debc3dc6f9b72cc10eb566e541a2077a02fb0c4736f14dfc733eccd154a772ae2dd9c5f90c2247cc0d96e SHA512 8f42f90e1ffaa944ba613596d7ec53248b591cbb4c7bc00da15486267da86905e20285de6216c223c7ee90780bf8d050a30de4b9a08fc5064a9a3532cb7306ef
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild
new file mode 100644
index 000000000000..1e3a9009724f
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Translation files for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="=dev-qt/qtbase-${PV}*"
+BDEPEND="=dev-qt/qttools-${PV}*[linguist]"
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index de92e7f5e3ca..14f755fa9e87 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -4,7 +4,9 @@ AUX qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch 1451 BLAKE
 DIST qtwayland-5.15.10-gentoo-kde-1.tar.xz 42480 BLAKE2B 3902ecb713b8f35922b0d19bef0b2ec340ca52feb4b61de629dfa6b344d7f550de3e509e265f4476eb907f78b55d5c50c21d9dfeeb7e2e8f680a43fffc911ed4 SHA512 6a131ca2db008a2d224ee6733f47d05a455a8487d38b45cf63882e98e2c29d8163ac5d2f2c2e043f03103bada6e212b5d33cbf11677f8ca2b86fdbf02fc2b239
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-src-6.5.1.tar.xz 1059936 BLAKE2B 5b54804df8106b0585fa44612c3d688b89aaea7bd49f2420e2a44472ced9ed51c2aba1d0baf2e4636a58937e7393e6d4b1ad8c7d937dfbf96e5a90bba5393cca SHA512 9074adfb5ea9cc18896dade6706ef5a863033130f23aa11e0a7b2ae6e4df2fb64b636815e2489debb1032919a8ad20d39813d40b3ba7a87cebd801c9fae0d4f0
+DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
 EBUILD qtwayland-5.15.10-r1.ebuild 1415 BLAKE2B e2ff44624faaca5a03484cf049c9177a3c3648e47b4708845f02853838dc8b219e2bb33508d52f4b3f6f0e5efad5d3ca9c59119937029ddddd05d1223d514dfc SHA512 d275d7cf88fb626d7fd55b5348a5252d182af4c491cd082f3226f405d921cdc905f1ece714aecbc1e2979ca9cfa970a451f01ef1f435e948c842bb3192a5690e
 EBUILD qtwayland-5.15.10.ebuild 1257 BLAKE2B e1d7fc2d838ac7f95fa4132967f05cb11dad6f10cf80e947a5bebaf762b225ad415e4378409910899b8948ccf17bf582eed025407e4d7b18e68e8c8a2c53a17d SHA512 867d80826da07db5bafc98136616b8217dfb26eeea9ed76cdaf641022819da2d6ebd4f8331dfd44f4b74ebf80a956e77b0c382d23ab6c499d5d04964f9f66ae7
 EBUILD qtwayland-6.5.1-r1.ebuild 442 BLAKE2B 844f06e4063c17dd8b3e0a8835aeda220a0ade9d07213a42abbc38d37b3e1b6fa71423e07e2ef66d0628a9bb4afa9656c68dd9d7fb73b3e3a597e6d573f84587 SHA512 9f6235b34e56466eea51dd3513f53d0387d4a068a9f429ecb84f90f32f257967e2940e6d48a6029c6a2118915fd5592d14e73a6ef5aeac8e4429a6b2fc4ef8bf
+EBUILD qtwayland-6.5.2.ebuild 442 BLAKE2B 844f06e4063c17dd8b3e0a8835aeda220a0ade9d07213a42abbc38d37b3e1b6fa71423e07e2ef66d0628a9bb4afa9656c68dd9d7fb73b3e3a597e6d573f84587 SHA512 9f6235b34e56466eea51dd3513f53d0387d4a068a9f429ecb84f90f32f257967e2940e6d48a6029c6a2118915fd5592d14e73a6ef5aeac8e4429a6b2fc4ef8bf
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-6.5.2.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2.ebuild
new file mode 100644
index 000000000000..14d6b705e8ef
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.5.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+BDEPEND="dev-util/wayland-scanner"
+DEPEND="
+	dev-libs/wayland
+	=dev-qt/qtbase-${PV}*[egl,gui,opengl]
+	=dev-qt/qtdeclarative-${PV}*
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 1eadc699a635..5632e32daf20 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,6 +1,8 @@
 DIST qtwebchannel-5.15.10-gentoo-kde-1.tar.xz 5808 BLAKE2B 4aa01535519811778a3b7242e36197bcccebfe47403fd11a12950d1a797b29cc93c3b9eaee3bf6554d5d3a9f3fba2e5691abcea7f86e75edd5b6710970d123f4 SHA512 19ed01169598dda4cfddbf3dd886fbe4d6aa94262846fcc430f9668782f261e3cb212584ccb3b025d9d96953e90a552002d4dbdfcc0eaf9be246979d29309873
 DIST qtwebchannel-everywhere-opensource-src-5.15.10.tar.xz 211876 BLAKE2B fcc3a198a90826b2d16d3a9ed950b4e00d9a7645231c26af79f3271ad3dacb981f1c057ec95b9c3c71f2baf05e0b71a4fc4d5121cc3fc8ebe101cf21fc404d11 SHA512 ed8349820c623dd7abcd34244a2f05426667d6997a8952567c3cbe785bb2ea92f03dd931bb53f77b34faff16d04dd7d39e4165c75d7a9ebb4ae225d7582355bc
 DIST qtwebchannel-everywhere-src-6.5.1.tar.xz 214404 BLAKE2B 37785146f6590dfde2b3af112b46025a6b5639554bcaf0302a9cad35cc2df28efc03ec91252eb9a01b20c0628f1d1637908f686b089f4b3f08d03ab8190b186f SHA512 a61a22b84f10f1ca5272e87de501f1c75f15a8f9a0aa5ff18d4df74a60bb8bec589289164863b6539cff4796c7c19a5ba126027e41107fccc43cf7523def1b0c
+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.1.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9
+EBUILD qtwebchannel-6.5.2.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild
new file mode 100644
index 000000000000..e82c78f55aca
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt WebChannel"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[concurrent]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtwebsockets-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 5238b4839669..e1140cf6da5f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,6 +5,8 @@ DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc581
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
 DIST qtwebengine-everywhere-src-6.5.1.tar.xz 412377436 BLAKE2B 1ff179daf1433246b931558f52f1cf193eff4a1d646e6f6037a40fe85fa28cf944b7f361fd68cb01b1247680d376762c2c5317be125f5b24cc08e4bbfa6f0def SHA512 68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428
+DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
 EBUILD qtwebengine-5.15.10_p20230623.ebuild 8404 BLAKE2B 0b82f31c53c3391042014b1e0f953169b74bb83221958717f645b585815388ae945343aa153f44c9754c2e4160a113d994156cfec77a4c3d683fceaf074f3920 SHA512 83ef513c0d3afe9e216ca477a30a96db233a67b70ca0570e15587f96cf525b06877f7e40115019b367e8166742ec2c5d527a750afa1445a9549f44b4158b392f
 EBUILD qtwebengine-6.5.1.ebuild 7523 BLAKE2B 13dcff549ee7cc6277ad70db8fbdd6afb775e4b31db5adeceaa8a9e8d0c338fbcbd0374dc3d13ae9d287b921407ec41c631f09a8ef8516f158f917762a4a3396 SHA512 a612a406e55a1709269b897ea320374b5e43d7f9207bf05652c3bc0ac2a173a92463cd78a3c1c7ce3c0de21fc4513402292752dbd912274a35373936a4beb91f
+EBUILD qtwebengine-6.5.2.ebuild 7446 BLAKE2B d06a5f4f4eb19571a0844f4461147ae2c785ef15ae27ef03c29581a5dc622ca3d87a2096b57280fdd4e9d0be9d7303711031e8fab35163ff7686218c0b7c8ef8 SHA512 1355586e7a78304b882dff212d0432a038f624dc0b650c4fe4d77384a24d5a1658408e63556dfb73f9e4f4748df4f4b56280769ae9f296df210ea565d2d678d0
 MISC metadata.xml 1152 BLAKE2B 2975a3fabc6464a6207a6b1a9da943baa16bc9a3b77a987cffeb6ea7c8791c5d09171b74825e6f218612144d862de1f2865c60fb6c4c187a1c5f6940112117e9 SHA512 aa3ed598b19be8adceb5a9b90bbc5d5d2521aa1a742210f536d11cf0466204ac3dc373ccee5a9a6cf523827589d17022ca2b54c8e142e6bb3b2afcfc98fa242d
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
new file mode 100644
index 000000000000..062731444eb5
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
@@ -0,0 +1,244 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+CHROMIUM_VER="108.0.5359.181"
+CHROMIUM_PATCHES_VER="113.0.5672.126"
+
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="
+	alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+	+system-icu widgets
+"
+REQUIRED_USE="designer? ( widgets )"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	net-libs/nodejs[ssl]
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtwebchannel-${PV}*
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	>=media-libs/libvpx-1.5:=[svc(+)]
+	media-libs/libwebp:=
+	media-libs/openjpeg:2=
+	media-libs/opus
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib[minizip]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libxcb:=
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libxshmfence:=
+	x11-libs/libXtst
+	alsa? ( media-libs/alsa-lib )
+	geolocation? ( =dev-qt/qtpositioning-${PV}* )
+	kerberos? ( virtual/krb5 )
+	pulseaudio? ( media-libs/libpulse:= )
+	screencast? ( media-video/pipewire:= )
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	widgets? (
+		=dev-qt/qtbase-${PV}*[widgets]
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/libglvnd
+"
+
+python_check_deps() {
+	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+	# bug #307861
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+	fi
+	eshopts_pop
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# (check-reqs added for bug #570534)
+	#
+	# Estimate the amount of RAM required
+	# Multiplier is *10 because Bash doesn't do floating point maths.
+	# Let's crudely assume ~2GB per compiler job for GCC.
+	local multiplier=20
+
+	# And call it ~1.5GB for Clang.
+	if tc-is-clang ; then
+		multiplier=15
+	fi
+
+	local CHECKREQS_DISK_BUILD="7G"
+	local CHECKREQS_DISK_USR="150M"
+	if ! has "distcc" ${FEATURES} ; then
+		# bug #830661
+		# Not super realistic to come up with good estimates for distcc right now
+		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+	fi
+
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	qtwebengine_check-reqs
+}
+
+pkg_setup() {
+	qtwebengine_check-reqs
+	python-any-r1_pkg_setup
+}
+
+pkg_preinst() {
+	elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
+	elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
+	elog "list of backports is impossible to evaluate, but always bound to be behind"
+	elog "Chromium's release schedule."
+	elog "In addition, various online services may deny service based on an outdated"
+	elog "user agent version (and/or other checks). Google is already known to do so."
+	elog
+	elog "tldr: Your web browsing experience will be compromised."
+}
+
+src_unpack() {
+	# bug 307861
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+		ewarn
+	fi
+	eshopts_pop
+
+	case ${QT6_BUILD_TYPE} in
+		live)    git-r3_src_unpack ;&
+		release) default ;;
+	esac
+}
+
+src_prepare() {
+	# bug 620444 - ensure local headers are used
+	find . -type f -name "*.pr[fio]" -exec \
+		sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
+
+	if use system-icu; then
+		# Sanity check to ensure that bundled copy of ICU is not used.
+		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+		local file
+		while read file; do
+			echo "#error This file should not be used!" > "${file}" || die
+		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+	fi
+
+	qt6-build_src_prepare
+}
+
+src_configure() {
+	export NINJA_PATH="${BROOT}"/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local mycmakeargs=(
+		#-DQT_FEATURE_accessibility=off
+		#-DQT_FEATURE_force_asserts=off
+		#-DQT_FEATURE_opengl=off
+		#-DQT_FEATURE_printer=off
+		-DQT_FEATURE_qtpdf_build=off
+		-DQT_FEATURE_qtpdf_quick_build=off
+		-DQT_FEATURE_qtpdf_widgets_build=off
+		-DQT_FEATURE_qtwebengine_build=on
+		-DQT_FEATURE_qtwebengine_quick_build=on
+		-DQT_FEATURE_qtwebengine_widgets_build=on
+		#-DQT_FEATURE_ssl=off
+		#-DQT_FEATURE_static=off
+		#-DQT_FEATURE_system_zlib=off
+		#-DQT_FEATURE_system_png=off
+		#-DQT_FEATURE_system_jpeg=off
+		#-DQT_FEATURE_system_freetype=off
+		#-DQT_FEATURE_system_harfbuzz=off
+		#-DQT_FEATURE_use_gold_linker=off
+		#-DQT_FEATURE_use_lld_linker=off
+		-DQT_FEATURE_webengine_embedded_build=off
+		-DQT_FEATURE_webengine_extensions=on
+		#-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+		-DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
+		-DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
+		#-DQT_FEATURE_webengine_jumbo_file_merge_limit
+		-DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
+		-DQT_FEATURE_webengine_native_spellchecker=off
+		-DQT_FEATURE_webengine_ozone_x11=on
+		-DQT_FEATURE_webengine_pepper_plugins=on
+		-DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
+		-DQT_FEATURE_webengine_printing_and_pdf=on
+		-DQT_FEATURE_webengine_sanitizer=on
+		-DQT_FEATURE_webengine_spellchecker=on
+		-DQT_FEATURE_webengine_system_opus=on
+		-DQT_FEATURE_webengine_system_libwebp=on
+		-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
+		-DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
+		-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
+		-DQT_FEATURE_webengine_system_libevent=on
+		-DQT_FEATURE_webengine_system_libopenjpeg2=on
+		-DQT_FEATURE_webengine_system_libpci=on
+		-DQT_FEATURE_webengine_system_libpng=on
+		-DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
+		-DQT_FEATURE_webengine_system_zlib=on
+		-DQT_FEATURE_webengine_webchannel=on
+		-DQT_FEATURE_webengine_webrtc=on
+		-DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
+		#-DQT_FEATURE_xcb=off
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index bbee6646e505..1786cc83d5d3 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,6 +1,8 @@
 DIST qtwebsockets-5.15.10-gentoo-kde-1.tar.xz 1516 BLAKE2B e58309d058b7ba0233f774686a770b5af88fbcf435b9bd4cca959b6bfbf79e73744f6e6a6b0bb98bd99cff65aa5c6f2b6d41c9b86c05fbcd988e25ba752ecad6 SHA512 6f2fb9ae5473ff8c4eb266e1b644a93c02b7f1b98a021ac9ace1b30caec667bd79b235936f7d2e5f91b687a8707019a4a9de449cc4e41f7b0ef39de08d173a75
 DIST qtwebsockets-everywhere-opensource-src-5.15.10.tar.xz 261792 BLAKE2B 67461c8d87dfff155817489a30e1f0a100851523ead230600c3f6487d0006db78c5506af68d4b576dc89f445d52d97acbd8f83d179f2ecbf3b3bdde25c11d996 SHA512 b9a2593169f0ff8e3e77c178de689dacfed564b2100ae67194f3636bf6d2300be3531a01b7158b06657f4a2d2a32453a98b96c6ab13fb9d8094e7ceeb5fdcbe3
 DIST qtwebsockets-everywhere-src-6.5.1.tar.xz 460056 BLAKE2B 66c7f0b545ab88fceb61a1ec1211d255dca77c7678f4fc65d83a8bedc1d2b4590aaf1f93370637e73102179051c22eb6c67881da67ffe65da72287800f4b88f4 SHA512 cd11d6b50e60c5246cd6469a0bf4ce75afd3ab57c8e082a71c25d5a0662e1a23276e232106dd3e8893ce60ca86cc2ab6c213433fbb194efdf1a9be4ae53f2b4d
+DIST qtwebsockets-everywhere-src-6.5.2.tar.xz 459540 BLAKE2B 486fcfe061fe27c512714e3c54c6cb382806b8fcff17bd6e88228f57972b107a654a64956989072cbb235ae5420ddda2ccbe5498334b43e336672a8a16482cd0 SHA512 0ede50ef09ec92cc9ff73ac8287d93c82eddaaefb8df05687f24fa1b9fcafe0e34cdef324ad81c89353ea9e21509243efce63bb42b640050309c61d100d354a7
 EBUILD qtwebsockets-5.15.10.ebuild 578 BLAKE2B c89a75bff2dc425ed95717e37c667136a5082535d19fd58b341e7da4b210224bf9142da7abbf24130abc4c4e36ee4e5f59eb32505c0be39cf22c8bbdaedd8261 SHA512 b5baa375f6484fd77203b7402fa3e1555a214e6cca44405b44eadf0e201e546026af97675dd01daf8513ddc6a575a4f30a4ed1ba23985cd200058e631d593369
 EBUILD qtwebsockets-6.5.1.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
+EBUILD qtwebsockets-6.5.2.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild
new file mode 100644
index 000000000000..abdcffa9a067
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[network]
+	=dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 76e54ab697e5..3d5b6cd4a915 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/muon/Manifest b/dev-util/muon/Manifest
index 3ccc1f286610..6287591c4d83 100644
--- a/dev-util/muon/Manifest
+++ b/dev-util/muon/Manifest
@@ -1,5 +1,3 @@
-AUX muon-0.1.0-fix-potential-overflow.patch 1437 BLAKE2B 1aca2550d95961834953eacf019a644e97d1e88a0fb07af86663f49913966a921e3aae178990da3305cd82d91e7d17dee2be60b8016c52e9727fc0cc9b3b2a76 SHA512 ee1c156ab71e8ac9abc4adfd0c345e8d7d0a6ed8a991019961d06a9bc5e67cdd2126af3284cfc46eb31dd3bc239cfcb44c7de658fb270d9dc929ddc016429edd
-AUX muon-0.1.0-test-Wincompatible-function-pointer-types.patch 873 BLAKE2B 492a63c022c38199dd21c1038342385632189a7d23d0f0d977c301eed21fc7873daad1b643066ff903931189f48f505c40d8ec066633f321cc32846a73762b14 SHA512 c82ccc3d59c60a718b35c1a3cd9ab94c7838591bb3053aa48a47a07811cbb158f21ee3f87fccd5b2a8e305f571f20e7b844cbde39730e43f1b0b9a43548346b0
 DIST meson-docs-0.64.1-19-g39c6fa4bc.tar.gz 78525 BLAKE2B 19f4768e70f38f744de9bebfcc7416f8ab7f414693dc1f3e379bbbc8370e3d3187e6a9e311a08c054bdfaf1d15efd225558de7d41d688fc4c4a10e3215af85ae SHA512 59c986c4c4d545a6488cd74a2b6563b867716b74aab95fd19a745ce46a99fe5222232e132c80c5ed80f3e61d13e74cf2dc13b1b6d4638fd40a69d82d0d74faaa
 DIST muon-0.2.0.tar.gz 510533 BLAKE2B 6ec67f8875e84fbc2f23f412825dd47b820cd44e97a16d9ac0ab0ba9db6e755a604b66b79d3dbe13d99440daf21c2f0ccbe69661b1fb3c7df3f636c61a0e4dcb SHA512 b2e90048756bdc26bdea24fe227a87ad4d0e57176e217e22ea492a55229c62e2a70243f60af1e162e2dde8468fdda9662a32ea5cfadd69fab95a83499efa077b
 EBUILD muon-0.2.0-r1.ebuild 1488 BLAKE2B 85769edb7bf1d6a9b8075d1f60e42078b2618bc1f380c6a1c789b147fd14711d1974d8e53168c69c073dacb242b0d7976b20a767d5770c0b2ac8f3767f61288d SHA512 5a9e59ee7bd928842f958e6095822f0b032e3f3ab0c21a420d9d91b2436b84640f0ae62a924e1c0a96877d6a8059aa82004cb0cbd1abc114592deec76e9f13b9
diff --git a/dev-util/muon/files/muon-0.1.0-fix-potential-overflow.patch b/dev-util/muon/files/muon-0.1.0-fix-potential-overflow.patch
deleted file mode 100644
index fc33cb98f611..000000000000
--- a/dev-util/muon/files/muon-0.1.0-fix-potential-overflow.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 44daee7db0e6cc32f67ad2e944e7e68d73d3acc4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Sun, 20 Nov 2022 22:23:33 +0100
-Subject: [PATCH] build_target: Fix possible out-of-bounds edge case
-
-Detected on Tinderbox with FORTIFY_SOURCE=3.
-
-Bug: https://bugs.gentoo.org/882295
----
- src/functions/kernel/build_target.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/functions/kernel/build_target.c b/src/functions/kernel/build_target.c
-index 07b20e29..2ecc27c4 100644
---- a/src/functions/kernel/build_target.c
-+++ b/src/functions/kernel/build_target.c
-@@ -307,7 +307,6 @@ determine_target_build_name(struct workspace *wk, struct obj_build_target *tgt,
- 	obj name_pre, obj name_suff, char plain_name[BUF_SIZE_2k])
- {
- 	const char *pref, *suff, *ver_suff = NULL;
--	uint32_t i;
- 
- 	switch (tgt->type) {
- 	case tgt_executable:
-@@ -341,10 +340,7 @@ determine_target_build_name(struct workspace *wk, struct obj_build_target *tgt,
- 		suff = get_cstr(wk, name_suff);
- 	}
- 
--	i = snprintf(plain_name, BUF_SIZE_2k, "%s%s", pref, get_cstr(wk, tgt->name));
--	if (suff) {
--		snprintf(&plain_name[i], BUF_SIZE_2k, ".%s", suff);
--	}
-+	snprintf(plain_name, BUF_SIZE_2k, "%s%s%s%s", pref, get_cstr(wk, tgt->name), suff ? "." : "", suff ? suff : "");
- 
- 	tgt->build_name = make_strf(wk, "%s%s%s", plain_name, ver_suff ? "." : "", ver_suff ? ver_suff : "");
- 	return true;
--- 
-2.34.5
-
diff --git a/dev-util/muon/files/muon-0.1.0-test-Wincompatible-function-pointer-types.patch b/dev-util/muon/files/muon-0.1.0-test-Wincompatible-function-pointer-types.patch
deleted file mode 100644
index cdf0ebd5ceff..000000000000
--- a/dev-util/muon/files/muon-0.1.0-test-Wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5362fa8b5182c72d4d58b6569e65c0bdd988320e Mon Sep 17 00:00:00 2001
-From: Stone Tickle <lattis@mochiro.moe>
-Date: Sat, 17 Dec 2022 20:23:59 -0500
-Subject: [PATCH] fix signature of thread entrypoint function
-
----
-https://git.sr.ht/~lattis/muon/commit/5362fa8b5182c72d4d58b6569e65c0bdd988320e
-https://bugs.gentoo.org/885567
-
- tests/project/common/94 threads/threadprog.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/project/common/94 threads/threadprog.c b/tests/project/common/94 threads/threadprog.c
-index 7bfb7c44..787b8472 100644
---- a/tests/project/common/94 threads/threadprog.c	
-+++ b/tests/project/common/94 threads/threadprog.c	
-@@ -22,7 +22,7 @@ int main(void) {
- #include<pthread.h>
- #include<stdio.h>
- 
--void* main_func(void) {
-+void *main_func(void *_) {
-     printf("Printing from a thread.\n");
-     return NULL;
- }
--- 
-2.34.5
-
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2b2714092e4e..4123e3cd5fed 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pulsemixer/Manifest b/media-sound/pulsemixer/Manifest
index ce7d53a54c5d..a3b146fa24e7 100644
--- a/media-sound/pulsemixer/Manifest
+++ b/media-sound/pulsemixer/Manifest
@@ -1,5 +1,5 @@
 DIST pulsemixer-1.5.1.tar.gz 21789 BLAKE2B 4a20be7b6499501adc64f5ac33b30ad1ea9418190104fbf452e1ed2bd3585552033c042554948b78b41e6a48c22ac62a42f4117b0311300bda738f7556ef1dc3 SHA512 c07b5e5fffa71ca60ed41e4c28a0f4ae5c8b5df9f269ea7376ed835b35536300f34504da724899bab5277f0c39a4c345654b99930ec8bdf4b43374d9b6d331be
-EBUILD pulsemixer-1.5.1-r2.ebuild 622 BLAKE2B 9bd99887d6d4bce1b323282df25456fb253eac7d84ea78a9ede002621ced1304054f77833e48dafee4437fca75126c03ef1a5b3d34e7fda9b4da513a758877e4 SHA512 2ff8ae54babfacf994c82bfd9036e312397d529ae5d29a7354cb952bfffa1ab8486068b994e246bc7954ce70fed067b92b7f30c0ba66c06fb1ad479b9cb3e1b9
+EBUILD pulsemixer-1.5.1-r2.ebuild 621 BLAKE2B 6fc69f5a62eb919fe45f3365c78bb2dd2b17e488c1a140ea44091f7fc2d0ad11eabd0fae36658f970106b4d4a6bb64558973cb8fd7a6df4550871f48a6b1cb54 SHA512 e96c1dfec888de5eaa962a1261afe6b36beade2b7e15e9d7f2ca6f68f86ca982f9e93d55ad81bc4da8bf2a1c1b27b42a12934e650a7b7497a238868a0b9e454f
 EBUILD pulsemixer-1.5.1.ebuild 592 BLAKE2B 66ee46a549ec544f429e32e929a104ceccffbe20a00089de0b8d84e7f03439ea242c0e40b7d15c8b14f38aafb8bdb0a1d3e3d6dfce7932e0e309c2b0809c3c38 SHA512 e284542b6b3ef65954a827ca393604b60e79e2ed75a9e5b04d52cfe52af8bb7899ef39a66974106f49439ca695778195dd7770071c11e529f63ad40f2f09dffb
 EBUILD pulsemixer-9999.ebuild 623 BLAKE2B 8ec434dadc3f14310559f254361da200521507f42f33c3077f07cf96a18251e0bd5e20f0f5ffd55e8f769ca579c71d176f915a2222acced5868dd6af675f4ba3 SHA512 71134708edb328c073855fb56c4c72f641bfd22e615688d2d6c8904fb93a430e8cf86e48072c4e324a88ffb2669ff2b4d27a7e5d0a27b130338bf220eb5c2dbb
 MISC metadata.xml 417 BLAKE2B 267271b586eec63c18fd18569725926390af968f2f0e2f97acec8de1d8ea2142e9141f9f10e1c2394503c6cde38708f827bb5c502881e3194f408a626692c8d2 SHA512 4df4b25df556c4cd5847d37cca815807c878027a49054a9a76b749981c649921100600daf9874ca1632628bde98a8a1ea4581ffa1907fb505c930009e1a5c26b
diff --git a/media-sound/pulsemixer/pulsemixer-1.5.1-r2.ebuild b/media-sound/pulsemixer/pulsemixer-1.5.1-r2.ebuild
index e7f978e3d5e8..6f2490c54558 100644
--- a/media-sound/pulsemixer/pulsemixer-1.5.1-r2.ebuild
+++ b/media-sound/pulsemixer/pulsemixer-1.5.1-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/GeorgeFilipkin/${PN}"
 else
 	SRC_URI="https://github.com/GeorgeFilipkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c97b5c8e8e30..f1124d5724e9 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 610b494e76b5..14d507a4163f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Jul 2023 17:40:04 +0000
+Thu, 20 Jul 2023 23:40:02 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b937735fc6ee..f642e78c54be 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-07-20T17:40:07Z
+TIMESTAMP 2023-07-20T23:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmS5cXdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmS5xdVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBhKw/9Gnt0CMhnh1lTNpShbhy1/He0zf6oMy4uMwD0xzmF7qegJmHW6QYErqA6
-jyqQEdiNRAO2thLMOiGg4PePoGgUfdSue+wx45FCEEh9P0hu6vraW8AhxqWHwxPc
-zzBpXCL9RVgHBgJmv8eWCVcSOPegTsio7awghxDPkUPobIG5mb4+4G3csQWIx93g
-A+JbPvdvTTWqyqSfzdCKeCxc+ZEj4vnSavPYUwop9BjYJSniixAgaE/4GmB10NgE
-eIHbxybSplvGyvQ+rGsSG+yCPspC/ZOrppWDDL3bp2v9kho/3sBYNyVMN8wCbCiJ
-5oj19C1jBhvoVCzO2eSj+6d2+6YtFGtkU1RGTViU9auzwbXIPKoStchPpow9fNwd
-kFRuP/NL1l+r2euXHfOen9Vt99x2anP73lUY9wJRkMvEanF/F/sOatxG1I7IxnGC
-QJw33jPWZ8JC+MwZtAuftVgvwpPCWU5V/F4/OOgFbjG91UtTRwj2Xzivzh8hPo63
-EmrP0Es2DOOWGuKejLcFbqN8IkqMePxeOC9U3GC8/2jqPVpizmkDB9yf7Cp2coph
-XWsByqVHmgkecbdGtXbPLlWgjF23EwmNil+M0g0cHNnre8n5AjMnXXUrZNpmJhfx
-mb47QD6DxMlQI3frK8gwnJFe57JRLrtbWMNn8zBYoDHVHgpF4NU=
-=sFE7
+klDmlxAAh9Eai1zJgMydYnJvs/XWRpDDhdURlpENKSEhNl24X4UB+Q+JTYx00Jwj
+hRG27of47rxiJyEycb9fMOw3F840Zn4+K7Uc99OvtzKQhVBi8LHHUwx3eI7Sm7+l
+535uNb/x8lhde7Zp/lUsCRObAfB8QvBTmREg9HOrjrgyHK0NrmU7TUCHxP16L/JC
+jsM1qLkWsNC+RBqBQV8mK67g9UXEG9qIIMtMFcQIy9wEv78z8+3ppCWZU9sWVoVW
+gWMmsTtYNVkr+WsLfxEHr4ctpdARtWCubsyYrL3NRmMxVfj/a1LE2zaM19AG+jCB
+s1chxqM+pHl4rnqWTw5H0IQpVi3g2tMw2U7jW7FC1moAiqGE89Gg1p2YzzFBJAke
+qZlor5oQWdvC/EWYvs8xzwgTwbj5V753FTfoVi1fphRp6LyDNtEZl/IPz7hhMi/g
+LtX7YMwnj6Kc3bJSP6EBWeLDJCRND5SledGYIuEEE/5612CGTLlWCg1hqEw2S19Z
+BOhzM2EnOKAIDg2NjRrhnrjZujKud+7IsjvX9h9e58Txl2/U1IVeUzLHT2Nkv7j+
+nyfP5u7YpDtpyqngY6hyw5YN520upg8W1jTzqbAwJi87lkGVH2AfRHXU0vIMDsSc
+Js/2FR8tPfimOtWYOfCt8HV9oL8nnRzpeIXNioDIMsUHPUz448E=
+=Ejq+
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 610b494e76b5..14d507a4163f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Jul 2023 17:40:04 +0000
+Thu, 20 Jul 2023 23:40:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 781cef0a105c..6e2bfedda242 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index f1c3600acd7b..7b8d041506e0 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/metalog-20230707 b/metadata/md5-cache/app-admin/metalog-20230719
index b864b9575e7d..52e25dac977e 100644
--- a/metadata/md5-cache/app-admin/metalog-20230707
+++ b/metadata/md5-cache/app-admin/metalog-20230719
@@ -2,7 +2,7 @@ BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-p
 DEFINED_PHASES=configure install postinst preinst prepare
 DEPEND=dev-libs/libpcre2
 DESCRIPTION=A highly configurable replacement for syslogd/klogd
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/hvisage/metalog
 INHERIT=autotools systemd
 IUSE=unicode
@@ -10,6 +10,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre2
 SLOT=0
-SRC_URI=https://github.com/hvisage/metalog/archive/metalog-20230707.tar.gz
+SRC_URI=https://github.com/hvisage/metalog/archive/metalog-20230719.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=51812d56825896d27ab3247bf0fbc538
+_md5_=59752535df143ecf6b8a2889b640e7fa
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index c5ffde39cdba..9c1308f50d7a 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/containerd-1.7.1 b/metadata/md5-cache/app-containers/containerd-1.7.1
new file mode 100644
index 000000000000..ffb6650bf8dc
--- /dev/null
+++ b/metadata/md5-cache/app-containers/containerd-1.7.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-go/go-md2man virtual/pkgconfig >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=A daemon to control runC
+EAPI=8
+HOMEPAGE=https://containerd.io/
+INHERIT=go-module systemd
+IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-containers/runc-1.1.7[apparmor?,seccomp?]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.7.1.tar.gz -> containerd-1.7.1.tar.gz
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=fbbfbda9c30f9c0aaf42dd872c0d7162
diff --git a/metadata/md5-cache/app-containers/docker-24.0.4 b/metadata/md5-cache/app-containers/docker-24.0.4
new file mode 100644
index 000000000000..c300ae194859
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-24.0.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16.12 dev-go/go-md2man virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.10
+DEFINED_PHASES=compile install postinst postrm setup unpack
+DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+INHERIT=linux-info systemd udev golang-vcs-snapshot
+IUSE=apparmor btrfs +container-init device-mapper overlay seccomp selinux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl >=app-containers/containerd-1.7.1[apparmor?,btrfs?,device-mapper?,seccomp?] !app-containers/docker-proxy container-init? ( >=sys-process/tini-0.19.0[static] ) selinux? ( sec-policy/selinux-docker )
+RESTRICT=installsources strip test
+SLOT=0
+SRC_URI=https://github.com/moby/moby/archive/v24.0.4.tar.gz -> docker-24.0.4.tar.gz
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	80659643e60eb07e6df6ff936b7d5f66	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=9ae5b71796186a51f40358abec8bc427
diff --git a/metadata/md5-cache/app-containers/docker-buildx-0.10.4 b/metadata/md5-cache/app-containers/docker-buildx-0.10.4
deleted file mode 100644
index e28e61b83cd0..000000000000
--- a/metadata/md5-cache/app-containers/docker-buildx-0.10.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-lang/go-1.20 ) >=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DEPEND=app-containers/docker
-DESCRIPTION=Docker CLI plugin for extended build capabilities with BuildKit
-EAPI=8
-HOMEPAGE=https://github.com/docker/buildx
-INHERIT=go-module
-IUSE=test
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=app-containers/docker
-RESTRICT=!test? ( test ) strip
-SLOT=0
-SRC_URI=https://github.com/docker/buildx/archive/refs/tags/v0.10.4.tar.gz -> docker-buildx-0.10.4.tar.gz
-_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=17282f2eac04709311798cd14d921bc8
diff --git a/metadata/md5-cache/app-containers/docker-buildx-0.10.2 b/metadata/md5-cache/app-containers/docker-buildx-0.11.2
index 77a06d269597..76c3ae33a7c1 100644
--- a/metadata/md5-cache/app-containers/docker-buildx-0.10.2
+++ b/metadata/md5-cache/app-containers/docker-buildx-0.11.2
@@ -1,16 +1,15 @@
 BDEPEND=test? ( >=dev-lang/go-1.20 ) >=dev-lang/go-1.18 app-arch/unzip
 DEFINED_PHASES=compile install test unpack
-DEPEND=app-containers/docker
 DESCRIPTION=Docker CLI plugin for extended build capabilities with BuildKit
 EAPI=8
 HOMEPAGE=https://github.com/docker/buildx
 INHERIT=go-module
 IUSE=test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-containers/docker
+RDEPEND=app-containers/docker-cli
 RESTRICT=!test? ( test ) strip
 SLOT=0
-SRC_URI=https://github.com/docker/buildx/archive/refs/tags/v0.10.2.tar.gz -> docker-buildx-0.10.2.tar.gz
+SRC_URI=https://github.com/docker/buildx/archive/refs/tags/v0.11.2.tar.gz -> docker-buildx-0.11.2.tar.gz
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5e53561615a2bdc4fdf5318009b784a3
+_md5_=c9b48871275b96a7bba09213903097a5
diff --git a/metadata/md5-cache/app-containers/docker-buildx-9999 b/metadata/md5-cache/app-containers/docker-buildx-9999
index bae18aa46df9..c918eb727c83 100644
--- a/metadata/md5-cache/app-containers/docker-buildx-9999
+++ b/metadata/md5-cache/app-containers/docker-buildx-9999
@@ -11,4 +11,4 @@ RDEPEND=app-containers/docker-cli
 RESTRICT=!test? ( test ) strip
 SLOT=0
 _eclasses_=git-r3	97f7f638070d17e4c2b6542589bb4575	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=3e278711e37dbe25ad47e80c896e92c0
+_md5_=c9b48871275b96a7bba09213903097a5
diff --git a/metadata/md5-cache/app-containers/docker-cli-24.0.4 b/metadata/md5-cache/app-containers/docker-cli-24.0.4
new file mode 100644
index 000000000000..25868fde5503
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-cli-24.0.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16.6 >=dev-lang/go-1.10
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=the command line binary for docker
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+INHERIT=bash-completion-r1 golang-vcs-snapshot
+IUSE=hardened selinux
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=!<app-containers/docker-20.10.1 selinux? ( sec-policy/selinux-docker )
+RESTRICT=installsources strip test
+SLOT=0
+SRC_URI=https://github.com/docker/cli/archive/v24.0.4.tar.gz -> docker-cli-24.0.4.tar.gz https://dev.gentoo.org/~williamh/dist/docker-cli-24.0.4-man.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	80659643e60eb07e6df6ff936b7d5f66	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=76e4802718c56411cedfd50912b2f46e
diff --git a/metadata/md5-cache/app-containers/runc-1.1.7 b/metadata/md5-cache/app-containers/runc-1.1.7
new file mode 100644
index 000000000000..9642c2972e43
--- /dev/null
+++ b/metadata/md5-cache/app-containers/runc-1.1.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-go/go-md2man test? ( seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) selinux? ( sec-policy/selinux-container ) ) >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=runc container cli tools
+EAPI=8
+HOMEPAGE=http://github.com/opencontainers/runc/
+INHERIT=go-module linux-info
+IUSE=apparmor hardened +kmem +seccomp selinux test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0 BSD-2 BSD MIT
+RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) selinux? ( sec-policy/selinux-container )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/opencontainers/runc/archive/v1.1.7.tar.gz -> runc-1.1.7.tar.gz
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=06605e27b049f3f874da7b1df1e04972
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index f8fa45e7a02f..92478079c61b 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/mit-krb5-1.20.2 b/metadata/md5-cache/app-crypt/mit-krb5-1.20.2
new file mode 100644
index 000000000000..dade22f9d1d5
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.20.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-alternatives/yacc cpu_flags_x86_aes? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) doc? ( virtual/latex-base ) test? ( dev-util/cmocka ) 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/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!!app-crypt/heimdal >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb:= ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd )
+DESCRIPTION=MIT Kerberos V
+EAPI=8
+HOMEPAGE=https://web.mit.edu/kerberos/www/
+INHERIT=autotools python-any-r1 systemd toolchain-funcs multilib-minimal
+IUSE=cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
+RDEPEND=!!app-crypt/heimdal >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb:= ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.2.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=10307c1474f778d664de21747fcfc9cb
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.21 b/metadata/md5-cache/app-crypt/mit-krb5-1.21.1
index 34c64d5e9540..5ecf9f4c6fd8 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.21
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.21.1
@@ -11,6 +11,6 @@ LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 ||
 RDEPEND=!!app-crypt/heimdal >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb:= ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.21/krb5-1.21.tar.gz
+SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.21/krb5-1.21.1.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
 _md5_=9a2e9002a2488f68e5ec219b80f4428a
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 599d4f4defe3..f2341d86451b 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/zxing-javase-3.5.1 b/metadata/md5-cache/dev-java/zxing-javase-3.5.1
index 42a2ac0a9d66..d4c40d5e2acb 100644
--- a/metadata/md5-cache/dev-java/zxing-javase-3.5.1
+++ b/metadata/md5-cache/dev-java/zxing-javase-3.5.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=dev-java/jcommander:0 dev-java/zxing-core:3 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
 DESCRIPTION=Core barcode encoding/decoding library
 EAPI=8
-HOMEPAGE=https://github.com/zxing/zxing/core
+HOMEPAGE=https://github.com/zxing/zxing
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/zxing/zxing/archive/zxing-3.5.1.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	1c8a695f6cae6a50261276f4b3da9914	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=dca2a0c193dba3970f9f56ebcd7297ec
+_md5_=3652497e8415bc9eaad890765242d27b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5a2adddde98f..c0849c0b4bd8 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/rust-1.71.0 b/metadata/md5-cache/dev-lang/rust-1.71.0
index 35a36096f014..5b4b12fee0f5 100644
--- a/metadata/md5-cache/dev-lang/rust-1.71.0
+++ b/metadata/md5-cache/dev-lang/rust-1.71.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.71
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.71.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.71.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.70.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-i686-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.70.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.70.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.70.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.70.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.70.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.70.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( abi_mips_o32? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.70.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-mips-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.70.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-mipsel-unknown-linux-gnu.tar.xz.asc ) ) ) abi_mips_n64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.70.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.70.0-mips64el-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc ) ) ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.70.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( big-endian? ( https://static.rust-lang.org/dist/rust-1.70.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) ) !big-endian? ( https://static.rust-lang.org/dist/rust-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.70.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.70.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	5b4ee8759b4e9eec5cb48b46975ca56c	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	rust-toolchain	5240c941287da6157cbaccd40b91a53c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=eee4bce116120e5dc17e2595d9b0ad39
+_md5_=2b0417c8ed9d67d70943002d90fbf444
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 621497ee0043..b7182fbfd579 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/libgudev-238 b/metadata/md5-cache/dev-libs/libgudev-238
new file mode 100644
index 000000000000..1b8f676b35b2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgudev-238
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.38.0:2[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/libudev-251:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) test? ( dev-util/umockdev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=GObject bindings for libudev
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
+INHERIT=meson-multilib
+IUSE=introspection 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.38.0:2[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/libudev-251:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+RESTRICT=!test? ( test )
+SLOT=0/0
+SRC_URI=https://download.gnome.org/sources/libgudev/238/libgudev-238.tar.xz
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	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	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=fdcb6ceaba86621a2644c0b32c2a273c
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 8aa2b7733f58..722b60606aa1 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/qt3d-6.5.2 b/metadata/md5-cache/dev-qt/qt3d-6.5.2
new file mode 100644
index 000000000000..e188093cc3cd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt3d-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[concurrent,gui,network,opengl,vulkan,widgets] =dev-qt/qtdeclarative-6.5.2*[widgets] =dev-qt/qtmultimedia-6.5.2* =dev-qt/qtshadertools-6.5.2* media-libs/assimp:= dev-util/vulkan-headers
+DESCRIPTION=3D rendering module for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[concurrent,gui,network,opengl,vulkan,widgets] =dev-qt/qtdeclarative-6.5.2*[widgets] =dev-qt/qtmultimedia-6.5.2* =dev-qt/qtshadertools-6.5.2* media-libs/assimp:=
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b8eb0dc8f1cde6162b01f8b41b83c267
diff --git a/metadata/md5-cache/dev-qt/qt5compat-6.5.2 b/metadata/md5-cache/dev-qt/qt5compat-6.5.2
new file mode 100644
index 000000000000..6b3cfd37c0fb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[gui,network] =dev-qt/qtdeclarative-6.5.2*
+DESCRIPTION=Qt module containing the unsupported Qt 5 APIs
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[gui,network] =dev-qt/qtdeclarative-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=646db3b936e655b1a0100295102514e1
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.5.2 b/metadata/md5-cache/dev-qt/qtbase-6.5.2
new file mode 100644
index 000000000000..71b073c5aa43
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtbase-6.5.2
@@ -0,0 +1,18 @@
+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
+DEPEND=app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode] dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= media-libs/tiff:= >=sys-apps/dbus-1.4.20 sys-libs/zlib:= brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) gssapi? ( virtual/krb5 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) gui? ( media-libs/libpng:= ) icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) jpeg? ( media-libs/libjpeg-turbo:= ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) libproxy? ( net-libs/libproxy ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:= >=x11-libs/libxkbcommon-0.5.0[X] 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 ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=Cross-platform application development framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X brotli gssapi libproxy sctp +ssl vnc freetds mysql oci8 odbc postgres +sqlite cups gtk icu systemd +udev wayland debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=wayland? ( =dev-qt/qtwayland-6.5.2* )
+RDEPEND=app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode] dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= media-libs/tiff:= >=sys-apps/dbus-1.4.20 sys-libs/zlib:= brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) gssapi? ( virtual/krb5 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) gui? ( media-libs/libpng:= ) icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) jpeg? ( media-libs/libjpeg-turbo:= ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) libproxy? ( net-libs/libproxy ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:= >=x11-libs/libxkbcommon-0.5.0[X] 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 ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=opengl? ( gui ) widgets? ( gui ) X? ( || ( evdev libinput ) ) accessibility? ( gui ) egl? ( gui ) eglfs? ( gui ) evdev? ( gui ) gles2-only? ( gui ) jpeg? ( gui ) libinput? ( gui ) tslib? ( gui ) tuio? ( gui ) vulkan? ( gui ) X? ( gui ) brotli? ( network ) gssapi? ( network ) libproxy? ( network ) sctp? ( network ) ssl? ( network ) vnc? ( network ) freetds? ( sql ) mysql? ( sql ) oci8? ( sql ) odbc? ( sql ) postgres? ( sql ) sqlite? ( sql ) accessibility? ( dbus X ) cups? ( gui widgets ) eglfs? ( egl ) gtk? ( widgets ) gui? ( || ( eglfs X ) || ( libinput X ) ) libinput? ( udev ) sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) ) vnc? ( gui ) X? ( gles2-only? ( egl ) )
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ec048e37629c7b836a122b5bee89884b
diff --git a/metadata/md5-cache/dev-qt/qtcharts-6.5.2 b/metadata/md5-cache/dev-qt/qtcharts-6.5.2
new file mode 100644
index 000000000000..9bf727c94678
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcharts-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[gui,opengl,widgets] =dev-qt/qtdeclarative-6.5.2*
+DESCRIPTION=Chart component library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[gui,opengl,widgets] =dev-qt/qtdeclarative-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=559ce1369ce2ce824dc1ae552bbb2a45
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2 b/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2
new file mode 100644
index 000000000000..d9d378df19bd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-6.5.2*
+DESCRIPTION=Qt Declarative (Quick 2)
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=opengl +sql +widgets debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=69405b5e7b90dad785b8c447a2bcdbc2
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-6.5.2 b/metadata/md5-cache/dev-qt/qtimageformats-6.5.2
new file mode 100644
index 000000000000..de5a6422e9ae
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=mng debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d0163720a720b4a68710be009b8ed352
diff --git a/metadata/md5-cache/dev-qt/qtlocation-6.5.2 b/metadata/md5-cache/dev-qt/qtlocation-6.5.2
new file mode 100644
index 000000000000..1767daa01120
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtlocation-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[network] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtpositioning-6.5.2* =dev-qt/qtshadertools-6.5.2*
+DESCRIPTION=Location (places, maps, navigation) library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[network] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtpositioning-6.5.2* =dev-qt/qtshadertools-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7c30307ba203176ddcf7c254bf1bdb80
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2 b/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2
new file mode 100644
index 000000000000..f2fb5e325afd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.5.2
@@ -0,0 +1,17 @@
+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
+DEPEND==dev-qt/qtbase-6.5.2*[gui,network,widgets] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtquick3d-6.5.2* =dev-qt/qtshadertools-6.5.2* =dev-qt/qtsvg-6.5.2* alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-libs/libva:= media-video/ffmpeg:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse[glib] ) vaapi? ( =dev-qt/qtbase-6.5.2*[opengl] media-libs/libglvnd media-libs/libva:= ) gstreamer? ( x11-base/xorg-proto ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=alsa +ffmpeg gstreamer pulseaudio v4l vaapi debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[gui,network,widgets] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtquick3d-6.5.2* =dev-qt/qtshadertools-6.5.2* =dev-qt/qtsvg-6.5.2* alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-libs/libva:= media-video/ffmpeg:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse[glib] ) vaapi? ( =dev-qt/qtbase-6.5.2*[opengl] media-libs/libglvnd media-libs/libva:= )
+REQUIRED_USE=|| ( ffmpeg gstreamer ) vaapi? ( ffmpeg )
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d1b32d1a58a331ca80ddbc5259e44703
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2 b/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2
new file mode 100644
index 000000000000..4387292f8a1d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[network,widgets]
+DESCRIPTION=Network authorization library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[network,widgets]
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4366026d4d58d07020d5dd4075e29258
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.5.2 b/metadata/md5-cache/dev-qt/qtpositioning-6.5.2
new file mode 100644
index 000000000000..56f8c47b1fe5
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[dbus,gui,widgets] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtserialport-6.5.2*
+DESCRIPTION=Physical position determination library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[dbus,gui,widgets] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtserialport-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=78f6e17abcd406b1b6178483e59a6e8c
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.5.2 b/metadata/md5-cache/dev-qt/qtquick3d-6.5.2
new file mode 100644
index 000000000000..3d5d384d43bf
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[concurrent,network,widgets] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtshadertools-6.5.2* =dev-qt/qtquicktimeline-6.5.2* media-libs/assimp:=
+DESCRIPTION=Qt module and API for defining 3D content in Qt QuickTools
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[concurrent,network,widgets] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtshadertools-6.5.2* =dev-qt/qtquicktimeline-6.5.2* media-libs/assimp:=
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=88d66c9c0fc8b3942d9239598af8e46a
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2
new file mode 100644
index 000000000000..1577f642195c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2* =dev-qt/qtdeclarative-6.5.2*
+DESCRIPTION=Qt module for keyframe-based timeline construction
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2* =dev-qt/qtdeclarative-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d8c0e1f3fe76ddcc5cdde1a80b7f5eae
diff --git a/metadata/md5-cache/dev-qt/qtscxml-6.5.2 b/metadata/md5-cache/dev-qt/qtscxml-6.5.2
new file mode 100644
index 000000000000..22e16575ca8a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscxml-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[gui,network,opengl,widgets] =dev-qt/qtdeclarative-6.5.2*
+DESCRIPTION=State Chart XML (SCXML) support library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[gui,network,opengl,widgets] =dev-qt/qtdeclarative-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7ec2d08841aeca21134a5e11b6d0a9c1
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.5.2 b/metadata/md5-cache/dev-qt/qtserialport-6.5.2
new file mode 100644
index 000000000000..b42af05e34fc
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[gui,widgets] virtual/libudev:=
+DESCRIPTION=Serial port abstraction library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[gui,widgets] virtual/libudev:=
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=82efa76a5d737a5baa4f941bcbb26a64
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.5.2 b/metadata/md5-cache/dev-qt/qtshadertools-6.5.2
new file mode 100644
index 000000000000..f83701e25643
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[gui]
+DESCRIPTION=Qt APIs and Tools for Graphics Pipelines
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[gui]
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=94a2405520e768f88bd7ee051f817283
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.5.2 b/metadata/md5-cache/dev-qt/qtsvg-6.5.2
new file mode 100644
index 000000000000..9791f02c383e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[gui,widgets] sys-libs/zlib:=
+DESCRIPTION=SVG rendering library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[gui,widgets] sys-libs/zlib:=
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=15a850936b3acb2a361469ef64e5af78
diff --git a/metadata/md5-cache/dev-qt/qttools-6.5.2 b/metadata/md5-cache/dev-qt/qttools-6.5.2
new file mode 100644
index 000000000000..bb6e5c5326ca
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttools-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[network] assistant? ( =dev-qt/qtbase-6.5.2*[sql,widgets] ) designer? ( =dev-qt/qtbase-6.5.2*[widgets] ) distancefieldgenerator? ( =dev-qt/qtbase-6.5.2*[widgets] =dev-qt/qtdeclarative-6.5.2* ) pixeltool? ( =dev-qt/qtbase-6.5.2*[widgets] ) qdbus? ( =dev-qt/qtbase-6.5.2*[widgets] ) qdoc? ( sys-devel/clang:= ) qdiag? ( =dev-qt/qtbase-6.5.2*[opengl,widgets] )
+DESCRIPTION=Qt Tools Collection
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=assistant designer distancefieldgenerator +linguist pixeltool qattributionsscanner qdbus qdoc qdiag qplugininfo debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[network] assistant? ( =dev-qt/qtbase-6.5.2*[sql,widgets] ) designer? ( =dev-qt/qtbase-6.5.2*[widgets] ) distancefieldgenerator? ( =dev-qt/qtbase-6.5.2*[widgets] =dev-qt/qtdeclarative-6.5.2* ) pixeltool? ( =dev-qt/qtbase-6.5.2*[widgets] ) qdbus? ( =dev-qt/qtbase-6.5.2*[widgets] ) qdoc? ( sys-devel/clang:= ) qdiag? ( =dev-qt/qtbase-6.5.2*[opengl,widgets] )
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7623271915c5f31e4d3eae7124bde971
diff --git a/metadata/md5-cache/dev-qt/qttranslations-6.5.2 b/metadata/md5-cache/dev-qt/qttranslations-6.5.2
new file mode 100644
index 000000000000..09c369c1c949
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttranslations-6.5.2
@@ -0,0 +1,15 @@
+BDEPEND==dev-qt/qttools-6.5.2*[linguist] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.5.2*
+DESCRIPTION=Translation files for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RESTRICT=test
+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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=14da926e283e8a7eb405d4700637f5ab
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.5.2 b/metadata/md5-cache/dev-qt/qtwayland-6.5.2
new file mode 100644
index 000000000000..0bc0fcc19ca9
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/wayland-scanner >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/wayland =dev-qt/qtbase-6.5.2*[egl,gui,opengl] =dev-qt/qtdeclarative-6.5.2* media-libs/libglvnd x11-libs/libxkbcommon
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/wayland =dev-qt/qtbase-6.5.2*[egl,gui,opengl] =dev-qt/qtdeclarative-6.5.2* media-libs/libglvnd x11-libs/libxkbcommon
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a6e6fefeaa8abeaf775a7a3d599a8db3
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2 b/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2
new file mode 100644
index 000000000000..df1cd81671fb
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[concurrent] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtwebsockets-6.5.2*
+DESCRIPTION=Qt WebChannel
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[concurrent] =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtwebsockets-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=bd6870facbf3573f46920465593e186a
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.5.2 b/metadata/md5-cache/dev-qt/qtwebengine-6.5.2
new file mode 100644
index 000000000000..a6389c60e1b7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.5.2
@@ -0,0 +1,17 @@
+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 dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtwebchannel-6.5.2* media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libxcb:= x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libxshmfence:= x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( =dev-qt/qtpositioning-6.5.2* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtbase-6.5.2*[widgets] ) media-libs/libglvnd
+DESCRIPTION=Library for rendering dynamic web content in Qt6 C++ and QML applications
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtdeclarative-6.5.2* =dev-qt/qtwebchannel-6.5.2* media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libxcb:= x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libxshmfence:= x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( =dev-qt/qtpositioning-6.5.2* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtbase-6.5.2*[widgets] )
+REQUIRED_USE=designer? ( widgets )
+RESTRICT=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	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	aa1d1fa7be37663d48162ac963b22692	estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=da0ce151fad5c871f6b6ef43997566b3
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2 b/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2
new file mode 100644
index 000000000000..de393fd1ecec
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.5.2
@@ -0,0 +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
+DEPEND==dev-qt/qtbase-6.5.2*[network] =dev-qt/qtdeclarative-6.5.2*
+DESCRIPTION=Implementation of the WebSocket protocol for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.5.2*[network] =dev-qt/qtdeclarative-6.5.2*
+RESTRICT=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	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	qt6-build	d25735138e197debc35a0dbf34a24048	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b872320f84089c0540455ea8951b4592
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9704e1703d76..15fcafb7c1fb 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/pulsemixer-1.5.1-r2 b/metadata/md5-cache/media-sound/pulsemixer-1.5.1-r2
index 5efa9df06588..b4ff8ca39006 100644
--- a/metadata/md5-cache/media-sound/pulsemixer-1.5.1-r2
+++ b/metadata/md5-cache/media-sound/pulsemixer-1.5.1-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/GeorgeFilipkin/pulsemixer
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=media-libs/libpulse python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/GeorgeFilipkin/pulsemixer/archive/1.5.1.tar.gz -> pulsemixer-1.5.1.tar.gz
 _eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=6fa76a12da47f8dfd1d9b686fde6d828
+_md5_=97c9cd372fd72169046cc3ed281e5678
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b131364b61ed..e78d2b48941f 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/ospd-openvas-22.5.1 b/metadata/md5-cache/net-analyzer/ospd-openvas-22.5.3
index 4e686a80f00d..8e0bbce654fe 100644
--- a/metadata/md5-cache/net-analyzer/ospd-openvas-22.5.1
+++ b/metadata/md5-cache/net-analyzer/ospd-openvas-22.5.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( acct-user/gvm dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-3.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-gnupg-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/paho-mqtt-c app-misc/mosquitto app-admin/sudo >=net-analyzer/openvas-scanner-22.5.1 notus? ( >=net-analyzer/notus-scanner-22.4 ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[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 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig
+BDEPEND=test? ( acct-user/gvm dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-3.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-gnupg-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/paho-mqtt-c app-misc/mosquitto app-admin/sudo >=net-analyzer/openvas-scanner-22.5.3 notus? ( >=net-analyzer/notus-scanner-22.4 ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[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 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=acct-user/gvm dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-3.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-gnupg-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/paho-mqtt-c app-misc/mosquitto
 DESCRIPTION=This is an OSP server implementation to allow GVM to remotely control OpenVAS
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 systemd
 IUSE=doc +notus test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3+ GPL-2+
-RDEPEND=acct-user/gvm dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-3.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-gnupg-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/paho-mqtt-c app-misc/mosquitto app-admin/sudo >=net-analyzer/openvas-scanner-22.5.1 notus? ( >=net-analyzer/notus-scanner-22.4 ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+RDEPEND=acct-user/gvm dev-python/defusedxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/redis-3.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-gnupg-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/paho-mqtt-c app-misc/mosquitto app-admin/sudo >=net-analyzer/openvas-scanner-22.5.3 notus? ( >=net-analyzer/notus-scanner-22.4 ) 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 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/greenbone/ospd-openvas/archive/v22.5.1.tar.gz -> ospd-openvas-22.5.1.tar.gz
+SRC_URI=https://github.com/greenbone/ospd-openvas/archive/v22.5.3.tar.gz -> ospd-openvas-22.5.3.tar.gz
 _eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
 _md5_=cb89e546cec82b45433400f29984428c
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 4f950f1272a3..827fc785c517 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/nghttp3-0.13.0 b/metadata/md5-cache/net-libs/nghttp3-0.13.0
index 0a9b910cf9b7..0a0799cb14e1 100644
--- a/metadata/md5-cache/net-libs/nghttp3-0.13.0
+++ b/metadata/md5-cache/net-libs/nghttp3-0.13.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ngtcp2/nghttp3/
 INHERIT=cmake-multilib
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~hppa
+KEYWORDS=~amd64 ~arm64 ~hppa
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/ngtcp2/nghttp3/releases/download/v0.13.0/nghttp3-0.13.0.tar.xz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=44d26cc1b90b8ea6d23df6e613698f5e
+_md5_=d73ac294d13173367001cbeee35d2165
diff --git a/metadata/md5-cache/net-libs/ngtcp2-0.17.0 b/metadata/md5-cache/net-libs/ngtcp2-0.17.0
index ed1e59311ae6..f0a3499b12cf 100644
--- a/metadata/md5-cache/net-libs/ngtcp2-0.17.0
+++ b/metadata/md5-cache/net-libs/ngtcp2-0.17.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ngtcp2/ngtcp2/
 INHERIT=cmake-multilib
 IUSE=+gnutls openssl +ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~hppa ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.7.2:0= ) openssl? ( >=dev-libs/openssl-1.1.1:0= ) )
 REQUIRED_USE=ssl? ( || ( gnutls openssl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/ngtcp2/ngtcp2/releases/download/v0.17.0/ngtcp2-0.17.0.tar.xz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b9ec1784b752a555a1941217366e02c8
+_md5_=d89ec0d0cf3e9563f14f479715a47721
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a2d3368fe8bb..0a458e557a4e 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/r8125-9.008.00 b/metadata/md5-cache/net-misc/r8125-9.008.00
deleted file mode 100644
index 5a1b0776708e..000000000000
--- a/metadata/md5-cache/net-misc/r8125-9.008.00
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
-EAPI=8
-HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
-INHERIT=linux-info linux-mod
-IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.008.00.tar.bz2
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	65030ccb60b8a236bc29c8caa76e3815	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=4e19a4ece6e8976b8313060953ec0fc2
diff --git a/metadata/md5-cache/net-misc/r8125-9.008.00-r1 b/metadata/md5-cache/net-misc/r8125-9.008.00-r1
new file mode 100644
index 000000000000..064b2fd2df28
--- /dev/null
+++ b/metadata/md5-cache/net-misc/r8125-9.008.00-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
+EAPI=8
+HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.008.00.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=963573907350e7c01130d3128931a65a
diff --git a/metadata/md5-cache/net-misc/r8125-9.009.01 b/metadata/md5-cache/net-misc/r8125-9.009.01
deleted file mode 100644
index 8296a00e4362..000000000000
--- a/metadata/md5-cache/net-misc/r8125-9.009.01
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
-EAPI=8
-HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
-INHERIT=linux-info linux-mod
-IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.009.01.tar.bz2
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	65030ccb60b8a236bc29c8caa76e3815	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=7f4eda59a29bfe4ddc403ccb04e86958
diff --git a/metadata/md5-cache/net-misc/r8125-9.009.01-r1 b/metadata/md5-cache/net-misc/r8125-9.009.01-r1
new file mode 100644
index 000000000000..1f6a4eea5c27
--- /dev/null
+++ b/metadata/md5-cache/net-misc/r8125-9.009.01-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
+EAPI=8
+HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.009.01.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=176e50c01ad53ab309042226f7929005
diff --git a/metadata/md5-cache/net-misc/r8125-9.009.02 b/metadata/md5-cache/net-misc/r8125-9.009.02
deleted file mode 100644
index 50640548c919..000000000000
--- a/metadata/md5-cache/net-misc/r8125-9.009.02
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
-EAPI=8
-HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
-INHERIT=linux-info linux-mod
-IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.009.02.tar.bz2
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	65030ccb60b8a236bc29c8caa76e3815	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=43929f965e85da3466547b81a25ad1ae
diff --git a/metadata/md5-cache/net-misc/r8125-9.009.02-r1 b/metadata/md5-cache/net-misc/r8125-9.009.02-r1
new file mode 100644
index 000000000000..1ca956ef7357
--- /dev/null
+++ b/metadata/md5-cache/net-misc/r8125-9.009.02-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
+EAPI=8
+HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.009.02.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=781c2cba8f642c0766cec7d2bbb52e12
diff --git a/metadata/md5-cache/net-misc/r8125-9.011.01 b/metadata/md5-cache/net-misc/r8125-9.011.01
deleted file mode 100644
index 4ac7573d99f7..000000000000
--- a/metadata/md5-cache/net-misc/r8125-9.011.01
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
-EAPI=8
-HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
-INHERIT=linux-info linux-mod
-IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.011.01.tar.bz2
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	65030ccb60b8a236bc29c8caa76e3815	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=1a3d2eb7a35c6e32428e9740aaecb8f1
diff --git a/metadata/md5-cache/net-misc/r8125-9.011.01-r1 b/metadata/md5-cache/net-misc/r8125-9.011.01-r1
new file mode 100644
index 000000000000..478daa15cd02
--- /dev/null
+++ b/metadata/md5-cache/net-misc/r8125-9.011.01-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig )
+DEFINED_PHASES=compile install postinst setup
+DEPEND=virtual/linux-sources
+DESCRIPTION=r8125 vendor driver for Realtek RTL8125 PCI-E NICs
+EAPI=8
+HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=linux-mod-r1
+IUSE=+multi-tx-q ptp +rss use-firmware dist-kernel modules-sign +strip
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+SLOT=0
+SRC_URI=http://rtitwww.realtek.com/rtdrivers/cn/nic1/r8125-9.011.01.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	3adf4125a2c5f60764f8d3bba0d4111b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=1452845ad6229fe145e9c3e0913a934c
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 30290406cb7d..969494b4658e 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/cartopy-0.21.1-r1 b/metadata/md5-cache/sci-libs/cartopy-0.21.1-r1
index 5b668442dd95..ced4724ac225 100644
--- a/metadata/md5-cache/sci-libs/cartopy-0.21.1-r1
+++ b/metadata/md5-cache/sci-libs/cartopy-0.21.1-r1
@@ -1,11 +1,11 @@
 BDEPEND=python_single_target_python3_10? ( dev-python/setuptools-scm[python_targets_python3_10(-)] dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools-scm[python_targets_python3_11(-)] dev-python/cython[python_targets_python3_11(-)] ) test? ( python_single_target_python3_10? ( dev-python/filelock[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] dev-python/flufl-lock[python_targets_python3_10(-)] dev-python/pytest-mpl[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/filelock[python_targets_python3_11(-)] dev-python/mock[python_targets_python3_11(-)] dev-python/flufl-lock[python_targets_python3_11(-)] dev-python/pytest-mpl[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) sci-libs/gdal[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sci-libs/geos python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/numpy-1.19[python_targets_python3_11(-)] dev-python/shapely[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] dev-python/pillow[jpeg,python_targets_python3_11(-)] dev-python/pyproj[python_targets_python3_11(-)] sci-libs/pyshp[python_targets_python3_11(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.3.1[python_targets_python3_11(-)] ) ) 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/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_11(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) sci-libs/gdal[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sci-libs/geos python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/numpy-1.19[python_targets_python3_11(-)] dev-python/shapely[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] dev-python/pillow[jpeg,python_targets_python3_11(-)] dev-python/pyproj[python_targets_python3_11(-)] sci-libs/pyshp[python_targets_python3_11(-)] )
+DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) sci-libs/gdal[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sci-libs/geos python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/numpy-1.19[python_targets_python3_11(-)] dev-python/shapely[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] dev-python/pillow[jpeg,python_targets_python3_11(-)] dev-python/pyproj[python_targets_python3_11(-)] sci-libs/pyshp[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
 DESCRIPTION=Python package for geospatial data processing and analysis
 EAPI=8
 HOMEPAGE=https://scitools.org.uk/cartopy
-INHERIT=distutils-r1 multibuild virtualx
-IUSE=test test python_single_target_python3_10 python_single_target_python3_11 test
+INHERIT=distutils-r1 multibuild multiprocessing virtualx
+IUSE=test test python_single_target_python3_10 python_single_target_python3_11 debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) sci-libs/gdal[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sci-libs/geos python_single_target_python3_10? ( >=dev-python/numpy-1.19[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] dev-python/pillow[jpeg,python_targets_python3_10(-)] dev-python/pyproj[python_targets_python3_10(-)] sci-libs/pyshp[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/numpy-1.19[python_targets_python3_11(-)] dev-python/shapely[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] dev-python/pillow[jpeg,python_targets_python3_11(-)] dev-python/pyproj[python_targets_python3_11(-)] sci-libs/pyshp[python_targets_python3_11(-)] ) python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SciTools/cartopy/archive/v0.21.1.tar.gz -> cartopy-0.21.1.gh.tar.gz
 _eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	virtualx	817571665ee28575da44ee08135089e5
-_md5_=6b69db9c6d0da3ee9d8536096135f2be
+_md5_=96cf833985b1ca50d08ee781f774aa5b
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 39ac790f8546..9443495bf30e 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/musl-locales-0.1.0 b/metadata/md5-cache/sys-apps/musl-locales-0.1.0
index 33a8b7ee6114..69f335976ac0 100644
--- a/metadata/md5-cache/sys-apps/musl-locales-0.1.0
+++ b/metadata/md5-cache/sys-apps/musl-locales-0.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Locale program for musl libc
 EAPI=8
 HOMEPAGE=https://git.adelielinux.org/adelie/musl-locales
 INHERIT=cmake
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3 MIT
 RDEPEND=!sys-libs/glibc
 SLOT=0
 SRC_URI=https://git.adelielinux.org/adelie/musl-locales/uploads/7e855b894b18ca4bf4ecb11b5bcbc4c1/musl-locales-0.1.0.tar.xz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c55c25541dfb39566498c4f9d8b32e9e
+_md5_=4e909f6a028671a37d82f9e9ed2f4cb5
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 0432ce956e51..e65e9a4db23c 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/udisks-2.10.0 b/metadata/md5-cache/sys-fs/udisks-2.10.0
index 9071747ecb32..de76d6463efa 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.10.0
+++ b/metadata/md5-cache/sys-fs/udisks-2.10.0
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) dev-libs/gobject-introspection-common sys-devel/autoconf-archive 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/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=sys-auth/polkit-0.114[daemon] >=sys-libs/libblockdev-3.0:=[cryptsetup,lvm?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.68:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-kernel/linux-headers-3.1
+DEPEND=>=sys-auth/polkit-0.114[daemon] >=sys-libs/libblockdev-3.0:=[cryptsetup,lvm?,nvme] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.68:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-kernel/linux-headers-3.1
 DESCRIPTION=Daemon providing interfaces to work with storage devices
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
@@ -8,9 +8,9 @@ INHERIT=autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
 IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=sys-auth/polkit-0.114[daemon] >=sys-libs/libblockdev-3.0:=[cryptsetup,lvm?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.68:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit ) virtual/tmpfiles
+RDEPEND=>=sys-auth/polkit-0.114[daemon] >=sys-libs/libblockdev-3.0:=[cryptsetup,lvm?,nvme] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.68:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit ) virtual/tmpfiles
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.10.0/udisks-2.10.0.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bb87d3c7b633601923c9d91970ec2da4
+_md5_=dd5bbd72a141b1561b689dc7072200c9
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index d6599cc06eec..a79cd7e8448c 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/queue-standalone-0.1-r1 b/metadata/md5-cache/sys-libs/queue-standalone-0.1-r1
index e6b0d2d30d6c..386d32f30de8 100644
--- a/metadata/md5-cache/sys-libs/queue-standalone-0.1-r1
+++ b/metadata/md5-cache/sys-libs/queue-standalone-0.1-r1
@@ -3,7 +3,7 @@ DEPEND=!sys-libs/glibc
 DESCRIPTION=Install <sys/queue.h> from glibc
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv x86
 LICENSE=BSD
 SLOT=0
-_md5_=29c61aa8df39774cd46778b0436ddf69
+_md5_=3fd9348b18d5ce65249b3f9b312ac5f8
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index c8f5577ba71a..7912945d663d 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/libudev-251 b/metadata/md5-cache/virtual/libudev-251
new file mode 100644
index 000000000000..e5c508bdc988
--- /dev/null
+++ b/metadata/md5-cache/virtual/libudev-251
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libudev providers
+EAPI=8
+INHERIT=multilib-build
+IUSE=systemd 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
+RDEPEND=!systemd? ( >=sys-apps/systemd-utils-251[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(-)?] ) systemd? ( >=sys-apps/systemd-251:0/2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/1
+_eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=28248cdb084c68f2de2bd7cc1b2b123e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9d64fda89a60..6b539da139ab 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-07-20T17:40:07Z
+TIMESTAMP 2023-07-20T23:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmS5cXdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmS5xdVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAXuxAAhzorVX+IjCMP/+kB5qw/0ylzWjHUGj1+RskejbqKv9aOwJ9Yh288JDL9
-RGQx2Jjb1eNfkvU7wOBiP0s3EoDOdu6Hzj5CCP1ezdiIA+NY9m3qOnqIYnYAHPry
-GPU2PZmYG5mUvKZuvFoQZswDqP4IgRywhT8DYUGKqCr3Vd0k84kkGsjsXe/FtHHC
-HTh1+hcEEyGtZqiKIKW+VWUuZK9XJkiq3rWB3OAv72OzRgQm7ZeFxI0e03RN+Oe6
-9JUUr3xLzyTNx9vN7b5L6lZ6B1UYrL55a7JUsIr0NiKS2vTM0hChazpJGhwpHFY6
-7rorM2r//L/o8RZgOMhBPRD1vMrzRUG9GNoTRdrU8R10ihpLVUvABZpGiEDxq8vc
-JNE/2pXRzaHdQ8k7KGNLq26r7X9fZoAyCfc30QBI988FFksa9W3uviudUDUuh5Oj
-/ICZ+0tAq/cA50SbN0LB+1AtWpJl6ypaQ4DI73jSRmLj1djjYeie+girJYZJZoHL
-XS/FtrOZpg/wQNBtvG1lTg6GjS3P1mwcatTK9JNYoM+IPE2phGam8WLWkoF2RoaK
-ulxSr9DkKs+E0/ibs+Y52LeI3d1S9fpOxp/dEx/A3bBu6aLItGAojHYJdsGwgiD7
-HWnIKBSIL9eNYnlg8Osb9TXasx9q0v2I+cm9PcItFHVmQhksAdk=
-=Ks0X
+klCFZg/8D8D/1+RPSiZAkYIiDAEpl+FAfE3ifCLjf5EXE7deekopdaFkaIjaNbjt
+qhLXm7mFqMLK995zbVu2j1G+yFidpOXtICtcFPecQf+gAvXAineiOq14DlyMq9XA
+C/1kd/wgHS8x79WFKamw8bsiyvfphqmkbZ7ZKc1zXpD5/vukS0aUVCJ890ZHFrSC
+H0WzsDXHVpcAk/wV9C7UlzRBV8QjbC67XUfmjrqKculvip2RGlKDMLLOXahAAxLq
+TnJzt1WPX3El6GbhNXd/fLeMSykB8DIIpGaHt7Uw2jH16ogswiwGFPHxmtwLdtsI
+BOyrgHfp7ZTg7Fo7tRRWXEfY81T7XtHK2v7H1kV5JRuX/c8pYQVA4yBxRHH3hhtk
+GbV97yYaPKz4QAQ3u8tqnQGtmYdd79/hx+LkYDqT2aDb5cCMvTZh8mQMh4J1Ow+u
+G+kFk2Gg2NRXqK0jiItNi0TMMn2y9NkwH+g6h1R3UYeD/Z44/1Q98QWjOh123H0J
+uL9R5kfquKj9Adg68lhngEg8DwIHpd8b0SZy6Gaa3hDD3uruf4Fw69Rsa/d5vhf0
+yOe9Rlr6LnnfqFrOddqIv/Pz9h04FYyL5kUIJ0GvnnkgY7R3vVheJV3dZYHCTEDA
+zsn8MPLS+s+DDP09/ljzPPsHB0yslTjT4zkEUWdk4qaX3OlYyF4=
+=scK6
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 610b494e76b5..14d507a4163f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Jul 2023 17:40:04 +0000
+Thu, 20 Jul 2023 23:40:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 67aa67a54ed4..3a62cd28fcdf 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jul 20 05:40:04 PM UTC 2023
+Thu Jul 20 11:40:02 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a4d65ceed63d..4197678dcf04 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Jul 2023 17:45:01 +0000
+Thu, 20 Jul 2023 23:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 17169858c2a8..7ee4d06c6a67 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-eec1a5f924d47fb9a03ffc7d49c2b625ca9bd04e 1689869391 2023-07-20T16:09:51+00:00
+8745ff51ec933d28ca7143910ab0191ceb31f0c0 1689893054 2023-07-20T22:44:14+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 585a2c06437a..a3df6688a962 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1689874801 Thu 20 Jul 2023 05:40:01 PM UTC
+1689896401 Thu 20 Jul 2023 11:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 610b494e76b5..14d507a4163f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 20 Jul 2023 17:40:04 +0000
+Thu, 20 Jul 2023 23:40:02 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8b21e842ccd2..d672e96435f7 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index c0b6823343f2..e1521eabefa1 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -4,7 +4,7 @@ AUX ospd-openvas.initd 491 BLAKE2B 1020cec8fba128547e7d0606c60989b74103b0d324ee7
 AUX ospd-openvas.service.conf 208 BLAKE2B b392bddb4caa281087a238c79c368bdf38439c9ddaf470e034db60d9847269966e19d6a111218fe92e6c5f05dc414ab88c0fefd1916c0d5c5bca28b30d92824a SHA512 ea1e59e1c4e6d98ca0058f42bd7454768cafb8c410611350eaaa7e232d7c580f61986f41de5fdeb752b73bd9cafd04c1e9ab44975b8d177e63537ed991418fc4
 AUX ospd-openvas.service_notus.conf 479 BLAKE2B f0c63fdd48396c39001823890aafe08228b2b37d14b81b02350b9ab0c31c02905c4b407785ca7b325f1ef48f92e38bf6f4bba287c406a274974c51d402a35dce SHA512 5d95f366f7b139717897b668e86d3f98ef98d7744106ecf456e5ba6bcf37ea6baa19a7925a46853a5f31a76c94a2537309fd944d5b99b07da19c020128937153
 DIST ospd-openvas-21.4.4.tar.gz 173368 BLAKE2B 4568eb45bb999d0ff2cf91652dd56000bceb967f5c37c3061735322d1c72165f9b869c8b48694b37fd6d684679fa1bbff4a5550076bbcfcee5936b470cb04700 SHA512 3981b0a9044f90243fe06f15b0d8ee5a6b1a334556f6de76955aecda0404da2f8bd1d39bf547093a31c244f0aabae819f5e45e8c518984fc7d50764a267086e9
-DIST ospd-openvas-22.5.1.tar.gz 253605 BLAKE2B 6f4ecc31f1c47941154973bfca92818fdfe6942b5091d84234d81e287c0871f91deefc25f16790015ab1c57366b92ae42e236673c44848fdaab491caa042693f SHA512 2f92a09b4b9abced9f122eb2ac2dedf652b8c673e3d4ce5676a356da573816cd0f20769540a94919b35d6612ffb8a86b75dc704eae75c1e63150255e564e3349
+DIST ospd-openvas-22.5.3.tar.gz 250022 BLAKE2B 277180051216527ce5889257a362219bdf11e88670e5fcde1cd4f1e687fbe7d56301d28d9a95982443bb1ecf9bb2553b7fcd6784cedad0139ad34cbdde142c39 SHA512 12be93803d52b46ec24760f07b7ace47b6383e5d84bf8903ea07d0e55889d149564b37e5be15ae5a33f03449bf2499d4e5220220d5ebec99629ee64548bb00f8
 EBUILD ospd-openvas-21.4.4-r4.ebuild 1902 BLAKE2B 67a71298b7506ca6906599d8e7c9edb8b6f98337f267913849a5cc112dc949559114914c0e8116cf8945e4b344ff2e15e1f4bcdab4980fa9bf849405b8b02c2f SHA512 f636d9181d96010c7367912d6421f2ab12d55df26bed987e77ab77e26d745002775ff2236c5325950e8ceaf6fc3b3746c9e0944602c0547f31b213bf8347afe3
-EBUILD ospd-openvas-22.5.1.ebuild 1952 BLAKE2B 2f172ac7eb7212ae18a6466646715e8e03cb3650260adf0cd75343c2e348b35ee25b49f491a2bc1dc7f95a1fc20811eda471a7a16cf2252bcdf77ad5cfc0564f SHA512 f4312c3fc63a87d615a2daaf78c245b662a7efcde939460a62aa7da02a2522137466f87e793c61923b755d671dc5e38f3a874bffb1f3992cd6e8dfbf0aa67af1
+EBUILD ospd-openvas-22.5.3.ebuild 1952 BLAKE2B 2f172ac7eb7212ae18a6466646715e8e03cb3650260adf0cd75343c2e348b35ee25b49f491a2bc1dc7f95a1fc20811eda471a7a16cf2252bcdf77ad5cfc0564f SHA512 f4312c3fc63a87d615a2daaf78c245b662a7efcde939460a62aa7da02a2522137466f87e793c61923b755d671dc5e38f3a874bffb1f3992cd6e8dfbf0aa67af1
 MISC metadata.xml 1029 BLAKE2B 603e12bc771225baa50afc6e5254b64215055d9399c9d1862611150a49a74f397af610676ca273506f2359513b42d91786ef9f7c9100789437c00b8e59f6ccb2 SHA512 bf49f3444f277ae4b798a5c01d4c4dc5804187479774e85a9ea7481bae3b596df6f330979560ed43aa310cab72ba50dae4eeefe65a8e7dc6ada14659122ccaf7
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.5.1.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.5.3.ebuild
index 5aa80f75d415..5aa80f75d415 100644
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.5.1.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-22.5.3.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index d1a06d396d5f..ea75a0544a65 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/nghttp3/Manifest b/net-libs/nghttp3/Manifest
index db6df432b5a9..aced472c2647 100644
--- a/net-libs/nghttp3/Manifest
+++ b/net-libs/nghttp3/Manifest
@@ -3,6 +3,6 @@ DIST nghttp3-0.12.0.tar.xz 369576 BLAKE2B 552fab00de7c6d1917ac1b680547aa57e02ae3
 DIST nghttp3-0.13.0.tar.xz 367992 BLAKE2B 381677866a327cbb5638aa2e6f4a770d15879d05ca432c3fca7e92a8a815ae62857c386ba660805e97f649f9bc7c9c4c7077a92d2296b3303347e3d1dff12b6c SHA512 63de094ae62c641388ea909b28df2cce58df5e372237519fb6ef62bbd937ff20f6e571cb99f0fac8b8781e619fc229ec931fb5c6a1165727829d6b0c3a779ef8
 EBUILD nghttp3-0.11.0.ebuild 878 BLAKE2B 49d670331582f6d8c895b3bceab220312346e8988b728c6912f480f141ea14a097d63dba4b7e1decacb42b1b26871d63ce69565003fa9230b339498bbdce0339 SHA512 0e2a1cc0513f808cb8cbf1777fb1d45f1f69972da89bd7b80502ee59c2e03741a6a096d6050567f2c1d2aff8227df05c0163582d1920749fe60c7ba772bb4050
 EBUILD nghttp3-0.12.0.ebuild 878 BLAKE2B 49d670331582f6d8c895b3bceab220312346e8988b728c6912f480f141ea14a097d63dba4b7e1decacb42b1b26871d63ce69565003fa9230b339498bbdce0339 SHA512 0e2a1cc0513f808cb8cbf1777fb1d45f1f69972da89bd7b80502ee59c2e03741a6a096d6050567f2c1d2aff8227df05c0163582d1920749fe60c7ba772bb4050
-EBUILD nghttp3-0.13.0.ebuild 878 BLAKE2B 49d670331582f6d8c895b3bceab220312346e8988b728c6912f480f141ea14a097d63dba4b7e1decacb42b1b26871d63ce69565003fa9230b339498bbdce0339 SHA512 0e2a1cc0513f808cb8cbf1777fb1d45f1f69972da89bd7b80502ee59c2e03741a6a096d6050567f2c1d2aff8227df05c0163582d1920749fe60c7ba772bb4050
+EBUILD nghttp3-0.13.0.ebuild 885 BLAKE2B 9e709b6314c028a423eee32ae4503483b02036e12b0eeeb7a505bd86603ae6f02a48fe5b01d61d2ee408d485c23b0015600f4c23a185d9e94822c8243aaa5dcc SHA512 2cede4f0b685686965caf4b56a35b31983adebfd2f019b2a5e715a8a4caab2f3835e49a2b1ae88370534b070d79a803198da483d362a0b679e69b88e111b0d63
 EBUILD nghttp3-9999.ebuild 878 BLAKE2B 49d670331582f6d8c895b3bceab220312346e8988b728c6912f480f141ea14a097d63dba4b7e1decacb42b1b26871d63ce69565003fa9230b339498bbdce0339 SHA512 0e2a1cc0513f808cb8cbf1777fb1d45f1f69972da89bd7b80502ee59c2e03741a6a096d6050567f2c1d2aff8227df05c0163582d1920749fe60c7ba772bb4050
 MISC metadata.xml 327 BLAKE2B 57c198cb15bb8a8982d7c93149b595e0fd03fb0b63cde2d49349dc3dcefa7873f310a4c6accf7089320c6a38376aef8bf6d98afe689d743c96636eebc53a2365 SHA512 580f5c33715cac0b138070349342d4d2e62c179e05aa1e66fc801001fa8dbb064d1291f8c38ff3b0e68cb392bc2f339c28afeab1d9a77d786497968fae2505a8
diff --git a/net-libs/nghttp3/nghttp3-0.13.0.ebuild b/net-libs/nghttp3/nghttp3-0.13.0.ebuild
index 719966f4eab6..7f4078fba594 100644
--- a/net-libs/nghttp3/nghttp3-0.13.0.ebuild
+++ b/net-libs/nghttp3/nghttp3-0.13.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/nghttp3/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~hppa"
+	KEYWORDS="~amd64 ~arm64 ~hppa"
 fi
 
 DESCRIPTION="HTTP/3 library written in C"
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 987ec4ca83dd..a6df6ad56614 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -5,6 +5,6 @@ DIST ngtcp2-0.17.0.tar.xz 590752 BLAKE2B 584dc4137ff572f1e433420d8dfb4a91eb8c505
 EBUILD ngtcp2-0.14.1.ebuild 1203 BLAKE2B 86097d800387aaa54520fc35b0ccd853c917efd6ba5146c9fd7412cf5cfb200220894c3b1913fbd83610b0e46a2b1e19bb79e94b8a83da283b3472272aea9712 SHA512 21813964a13f7bb518d9076411f711eb787ce6e838b070f17e260513c17812f6c0339bc063703a3a814886beafa9cb29dba03fcfe479d4f8ba01daf38a668e5b
 EBUILD ngtcp2-0.15.0.ebuild 1205 BLAKE2B a444ae2277c73772ce81d0b0c1e3555a90f3092930a474f0a947bf00e208e461bc64e04a7a9e05c5226ed9c8cbc847dd6fb8793a62a434f40e1e67308a57187c SHA512 9374dd426c1d95a812550b296d6054b4617e5a58e3b8e0dc1c00edb5c8684419ee696ce6e8a94adafd5ad47113e9f8bbce4dd81e5d68a1bc8d5f690372dcbb50
 EBUILD ngtcp2-0.16.0.ebuild 1205 BLAKE2B a444ae2277c73772ce81d0b0c1e3555a90f3092930a474f0a947bf00e208e461bc64e04a7a9e05c5226ed9c8cbc847dd6fb8793a62a434f40e1e67308a57187c SHA512 9374dd426c1d95a812550b296d6054b4617e5a58e3b8e0dc1c00edb5c8684419ee696ce6e8a94adafd5ad47113e9f8bbce4dd81e5d68a1bc8d5f690372dcbb50
-EBUILD ngtcp2-0.17.0.ebuild 1205 BLAKE2B a444ae2277c73772ce81d0b0c1e3555a90f3092930a474f0a947bf00e208e461bc64e04a7a9e05c5226ed9c8cbc847dd6fb8793a62a434f40e1e67308a57187c SHA512 9374dd426c1d95a812550b296d6054b4617e5a58e3b8e0dc1c00edb5c8684419ee696ce6e8a94adafd5ad47113e9f8bbce4dd81e5d68a1bc8d5f690372dcbb50
+EBUILD ngtcp2-0.17.0.ebuild 1212 BLAKE2B 3875ba79a79fed3e82d572c597975c7cfa27c67412219ece93fb475391f602412741de8c8ab220d56330890a27a3a874948d68361894744b3fb827b0677ca1e0 SHA512 128f037131ce220e3f9d51ebe05cef17470138d1e2a71ef4a2b64253291e4c95fe6da14232dac89f8ccc15b295b399fdcd7dd68e5b2497c283731f4e16beb4cb
 EBUILD ngtcp2-9999.ebuild 1205 BLAKE2B a444ae2277c73772ce81d0b0c1e3555a90f3092930a474f0a947bf00e208e461bc64e04a7a9e05c5226ed9c8cbc847dd6fb8793a62a434f40e1e67308a57187c SHA512 9374dd426c1d95a812550b296d6054b4617e5a58e3b8e0dc1c00edb5c8684419ee696ce6e8a94adafd5ad47113e9f8bbce4dd81e5d68a1bc8d5f690372dcbb50
 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/ngtcp2-0.17.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.17.0.ebuild
index 4d3a4cbaa377..c50194288f25 100644
--- a/net-libs/ngtcp2/ngtcp2-0.17.0.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-0.17.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~hppa ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
 fi
 
 DESCRIPTION="Implementation of the IETF QUIC Protocol"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d90dc308fd4a..aedf6447e21d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index 6c813b42c95c..96c7422442a0 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -2,12 +2,13 @@ AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb67161
 AUX r8125-9.008.00-linux-5.18.patch 1247 BLAKE2B 47f7aa546b6df11b8e1a95ff4be4c6964120421026da8977d67da0050395e5f1cff64f5cdbba28da5f502eff95e3db728b1acc834b82a8d186843b7fd0a14964 SHA512 577c0c5b69f6b41b4474404abd99bb946939373612eb23e320a9c014011f643d173c1597ba6f60a8a350f4c095eeddd99ce837fe5da884320229b047616309df
 AUX r8125-9.009.01-linux-5.19.patch 1423 BLAKE2B 3b587a9261aa695cb9fc5e27032d23b15ff557aa1a467985448ce38b5e259d08d5690406b42d1dc068a82a748de0dff53607bf70ac5515d5c9ced0e7803ef4c0 SHA512 803c1f70d9af86f4ba28e72338c3fff2b2976bc9dac5ca2f733f11382afc0a2a4ac018560e70cbae8ecbd3928ea2a79b010630420f4af66475ce5c9bb3ef73a8
 AUX r8125-9.011.00-linux-6.1.patch 1141 BLAKE2B b018c01a34b1fdf6f3cdaebfeff0a2d3dee4ddc0e47cb4f7a2e1953af9a7d7354e161ab9687e5c927135cf945597a7d276fa5ee3f1a9c9f17ed5e294c7e123ab SHA512 0a23b8477cb6d1de10f6b5fedabc0d8de25963f038b425c3e17851cf5eb4bd7cd76c52625c27be71ff5129fc78cc2325cba6ec26acd5bbc9f0995eeec5970587
+AUX r8125-9.011.01-linux-6.2.patch 1523 BLAKE2B bb8d828940f2a94c11c73ff6bcabdc63a4dbd8426fdc6fc53c2416784248a93f8e071af1a25c2df57e5799031061664fcf5a1eea77812f62a222e4dbe9201e07 SHA512 03e7148d2d1363cca8bce1a7a35f28379d059a515e2107db59cf43623b4a7d67ec148bf3363c71c81f68cf667dfe2cbd1637210f06b031bfa21a8c65a2246daa
 DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
 DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
 DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe
 DIST r8125-9.011.01.tar.bz2 97867 BLAKE2B 0981c71795d3e839b97f7b41dbaddcc0743676c6bd0b656258e6e9b2e0879128ae4869e9ab3ab837d0ae10eb8c963177c3779b4e4a69d8a5c3d95b7b8d54f9c5 SHA512 833199cc0ce8179ef93c202fc89d4c4368b73e9515d1ef2550ebb209243dd2c8943aa9f267903d8fa21c46304b7703410f1c354d4ce1b6f6aee7ece97017dba2
-EBUILD r8125-9.008.00.ebuild 1505 BLAKE2B 7eaed2d4118916c7160f66a83d8187261aacbac2bb2d79754474652040afa56ad5c221c00d82e27698f92e7fcbd2e01592b9543a7de85ab25e99b3bc2b777405 SHA512 5d69f6d2614955afc7bc519c45a53f12a26e8545071559a92e83c3b960b3ec598a7f222512eb3b12f0d6473fb8242223b19fd2dfc0c88bc5497b9ac4da22c3f2
-EBUILD r8125-9.009.01.ebuild 1291 BLAKE2B 09509ab84c55c23fd7a17ec3690ce1790df4a4b69ce3fee94d0542b5a379486fa6d4df658a9f02f68f1fb56f7da75c5bc00b494862fb25c54d6fc661cebf7fbb SHA512 28914ec05c9afae5e1936013488dc84161e16c1227b0756909013665e82c9237695390147cf855828af229fbdea3e00617f49c22637a6d8ebac71445a204e200
-EBUILD r8125-9.009.02.ebuild 1184 BLAKE2B 9a503dffad1c25db533f5af0889b1cb9b2978792f162decee7429a2988bed82c3ee408e9234da519ed304eefe8d344577e1c93098db9856d34ee886479967a72 SHA512 04f23d18649ff16c1c693d295f279999a3ad5026540b82385128b98d1fced33fa781a859168e605ec161c3b347b014b26d21130eb0fa31c0648d90e002e1f407
-EBUILD r8125-9.011.01.ebuild 1178 BLAKE2B 82a51fce6106e019d4062f3cea4cb050b3aba4247dbccbb73e4be92d11154450e83a051d0b97a956e7c64487b93dbbed658c810595ca4c8339fc1e39c7a5aec9 SHA512 c341dc8af0fcb33b5155d6583a61da1cb7cb1d0e59df6b86fb3d01ce04924117bd5a1eb23620a00d2a73d5f9ac743bae7269d03824caeec67b250aef952e2088
+EBUILD r8125-9.008.00-r1.ebuild 1510 BLAKE2B 19d165085a3119a70df54e997300f88bdae903b6a34fbb558143a80ca3984732e37c647e7a3f5d0892ec267807d9fce2d40a8c377144ba59022de1475d50155d SHA512 702b348c97f4a2f41c7f2bb95b8319c13b1717b000344f741869e2ccee2a5470138fbc786329c856dc55a981d384e3f7b2ee78f3351f95cb327c880a664ced7d
+EBUILD r8125-9.009.01-r1.ebuild 1296 BLAKE2B dd4c6e2b6a59186d9ac1341bcf14b125c8b28206b09586e6c10def5399e9adf7912cf97c924c66705acc060622e139bbce0859d3344c44dc674a60aae7c9d0e4 SHA512 86bea15e017ae59010d2f73853710b88804bedab4099858de352e19729d56f055dacf7c7a2ca54120be57632b681c8910871c717aad7f93fdb0ff63cfec1e777
+EBUILD r8125-9.009.02-r1.ebuild 1189 BLAKE2B 491fe1a223eeeaa66c9b844acbf05677715dc269acc2bb9468ccc40d01b5e0ccc8786d8ea377e92985f42d3df28ce5c7964902ef193b7a544b19fdd6c275bd50 SHA512 5fd5df7b14030b4cc137e6f0c71d34c4e4cdaee32bd65c8e3773cc5b188367dbcca58f30bcea8068d180b6daf35d0605f0de5cdb6af5c31060b31c1e5896269c
+EBUILD r8125-9.011.01-r1.ebuild 1252 BLAKE2B 50c40497895db2585554335f560a773dc9bd781b8d2f99b077bbc70165c7a8a8557a6b3cf6061232903ab6a9b830c3a684a3acb4a7b74e6589a0422103e8b2a7 SHA512 1a1051ea7007a2aa73a87f335a43bbb8efb68e7eb21396a023ae5cee0f710196158dbd3bf44e4d2b9d690e74cd23d317aeef4f6f8e00d6376b9b1c05749ee74f
 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f
diff --git a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
new file mode 100644
index 000000000000..26bb8620fbfd
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
@@ -0,0 +1,42 @@
+From 2ef10e8ccbd16a67a1585ebb627af0f1ae172e0f Mon Sep 17 00:00:00 2001
+From: Evgeny Grin <k2k@narod.ru>
+Date: Tue, 27 Jun 2023 11:16:26 +0300
+Subject: [PATCH] Patched PTP functionality for Linux 6.2+
+
+---
+ src/r8125_ptp.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/r8125_ptp.c b/src/r8125_ptp.c
+index 6010a18..b92fb18 100644
+--- a/src/r8125_ptp.c
++++ b/src/r8125_ptp.c
+@@ -195,6 +195,13 @@ static int rtl8125_phc_adjfreq(struct ptp_clock_info *ptp, s32 delta)
+         return 0;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)
++static int rtl8125_phc_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
++{
++        return rtl8125_phc_adjfreq(ptp, scaled_ppm_to_ppb(scaled_ppm));
++}
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
++
+ static int rtl8125_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts64)
+ {
+         struct rtl8125_private *tp = container_of(ptp, struct rtl8125_private, ptp_clock_info);
+@@ -296,7 +303,11 @@ static const struct ptp_clock_info rtl_ptp_clock_info = {
+         .n_per_out  = 0,
+         .n_pins     = 0,
+         .pps        = 1,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)
+         .adjfreq    = rtl8125_phc_adjfreq,
++#else  /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
++        .adjfine    = rtl8125_phc_adjfine,
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
+         .adjtime    = rtl8125_phc_adjtime,
+         .gettime64  = rtl8125_phc_gettime,
+         .settime64  = rtl8125_phc_settime,
+-- 
+2.41.0.windows.1
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00-r1.ebuild
index ba9eb264d3da..3779fd117278 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
@@ -16,8 +16,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-MODULE_NAMES="r8125(net:${S}/src)"
-BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
@@ -25,21 +23,23 @@ PATCHES=(
 	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
 	"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
 	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
 )
 
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
-	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
-	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
+src_compile() {
+	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
+	local modargs=(
+		# Build parameters
+		KERNELDIR="${KV_OUT_DIR}"
+		# Configuration settings
+		ENABLE_PTP_SUPPORT=$(usex ptp y n)
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
+		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+	)
+
+	linux-mod-r1_src_compile
 }
diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01-r1.ebuild
index a88080038413..87bff3e7fb42 100644
--- a/net-misc/r8125/r8125-9.009.01.ebuild
+++ b/net-misc/r8125/r8125-9.009.01-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
@@ -14,29 +14,29 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-MODULE_NAMES="r8125(net:${S}/src)"
-BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
 	"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
 	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
 )
 
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
-	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
-	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
+src_compile() {
+	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
+	local modargs=(
+		# Build parameters
+		KERNELDIR="${KV_OUT_DIR}"
+		# Configuration settings
+		ENABLE_PTP_SUPPORT=$(usex ptp y n)
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
+		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+	)
+
+	linux-mod-r1_src_compile
 }
diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02-r1.ebuild
index bdeb5b0245c5..61bad3803fde 100644
--- a/net-misc/r8125/r8125-9.009.02.ebuild
+++ b/net-misc/r8125/r8125-9.009.02-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
@@ -14,27 +14,27 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-MODULE_NAMES="r8125(net:${S}/src)"
-BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+	"${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
 )
 
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
-	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
-	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
+src_compile() {
+	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
+	local modargs=(
+		# Build parameters
+		KERNELDIR="${KV_OUT_DIR}"
+		# Configuration settings
+		ENABLE_PTP_SUPPORT=$(usex ptp y n)
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
+		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+	)
+
+	linux-mod-r1_src_compile
 }
diff --git a/net-misc/r8125/r8125-9.011.01.ebuild b/net-misc/r8125/r8125-9.011.01-r1.ebuild
index d09aaaa2e674..ed61c4d34909 100644
--- a/net-misc/r8125/r8125-9.011.01.ebuild
+++ b/net-misc/r8125/r8125-9.011.01-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-mod-r1
 
 DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
@@ -14,24 +14,28 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-MODULE_NAMES="r8125(net:${S}/src)"
-BUILD_TARGETS="modules"
 IUSE="+multi-tx-q ptp +rss use-firmware"
 
+PATCHES=(
+	"${FILESDIR}/${P}-linux-6.2.patch" # bug 908645
+)
+
 CONFIG_CHECK="~!R8169"
 WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-	BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)"
-	BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
-	BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
-	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
-	BUILD_PARAMS+=" ENABLE_PAGE_REUSE=y ENABLE_RX_PACKET_FRAGMENT=y"
-}
-
-src_install() {
-	linux-mod_src_install
-	einstalldocs
+src_compile() {
+	local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
+	local modargs=(
+		# Build parameters
+		KERNELDIR="${KV_OUT_DIR}"
+		# Configuration settings
+		ENABLE_PTP_SUPPORT=$(usex ptp y n)
+		ENABLE_RSS_SUPPORT=$(usex rss y n)
+		ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
+		ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
+		ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP
+		ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP
+	)
+
+	linux-mod-r1_src_compile
 }
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index d72f0899ab98..4636df0a8e64 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 6fd7e41bd0d6..8cdf781c1ba4 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,5 +1,5 @@
 AUX cartopy-0.21.1-fix-test.patch 1108 BLAKE2B c88a6a68bf0c0737d31049ac2c5a24791779ccc2b29f767056796c138928b04ffea47d8989dec02ed19725527d512920f07c991eb80f1534b83bf842df48b30e SHA512 010f1c844d21c60dca18dbc5530fcbebb5da99bd4a126e6c844bcb32c55533114c53694fbfc381e9a3aecabab8d11d9fb33a826597b9b66eae30c07f304f44e6
 DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788 SHA512 de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1
-EBUILD cartopy-0.21.1-r1.ebuild 2097 BLAKE2B f129371845e40b9479ea9eb3d510bb29879fffafd5f474d8fa32cfe1cb8e376fdb47c0ba73ad2f5cf582ad1b05a50f3fd54078695fbe5606f2370e19c37d7aad SHA512 44606f3615b49c86fabba1752a48df65922d4d58f9184fb4b51ee7a7eba89fe07c0e11787597107f5c4ced70db7a5dc0c97ac4a8b43d7ba6ca4773448a27ad5d
+EBUILD cartopy-0.21.1-r1.ebuild 2151 BLAKE2B 25c47b8b533e6884160a5a411679e1372f0ddebc1f812f43c0edbdbd43b6ac8c8d4a4e312b787f22b8df295270484cd25b2c7fd38bb834aec642671cd74507cd SHA512 6fa0cd826569b598173568ccb80751cacaaa6ba627b2e785b9781c1a05496935d568b46bcb381eeba93d5c622e2a79d6e64153af33da12494256027f0e9ca8cb
 EBUILD cartopy-0.21.1.ebuild 2103 BLAKE2B 40b5cbc22d3ecae968c8e7739264ff3b80c2953d2644e2df0c5d0e82a283a74e583129dea6c4c5b381738527607dc6cc378421c9ac233831b9e55b29e4244016 SHA512 276ac9f06c63821133e8a0d6e752d7a96a09bd1ebc60acbf74825b56ef7f2e2fdad5e874611612c3889aa285348f561776bdaa9d0ac9a00b50183fd2661b3de7
 MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591
diff --git a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
index 29d90378d1ef..80e71d718b8f 100644
--- a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
@@ -4,10 +4,11 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_EXT=1
 PYTHON_COMPAT=( python3_{9..11} )
 
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 multibuild virtualx
+inherit distutils-r1 multibuild multiprocessing virtualx
 
 MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
@@ -80,5 +81,5 @@ python_test() {
 	cd "${BUILD_DIR}" || die
 
 	# Drop all tests needing network access
-	virtx epytest -m "not network and not natural_earth" || die "test failed"
+	virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed"
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a552c7972b89..4766f5b573bd 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/musl-locales/Manifest b/sys-apps/musl-locales/Manifest
index 95792f4b5123..292be8ddeb87 100644
--- a/sys-apps/musl-locales/Manifest
+++ b/sys-apps/musl-locales/Manifest
@@ -1,3 +1,3 @@
 DIST musl-locales-0.1.0.tar.xz 26744 BLAKE2B 9ad696e7006a124f2e633e3f5476b68806659ddeac2e7cbd0ce485087870463256f3dcc11c3d37074cfc863ce8afed1b31bdf7c80435cce182fce95e81bf16b0 SHA512 bc1e581676ef21aa22b85932186189ba5fd0b1701feef4906f42baa296a90fc6886101d02a46a9560b883aad42aa4808ed46c5dddc09d97d1a0f75943a0d456a
-EBUILD musl-locales-0.1.0.ebuild 511 BLAKE2B f568918b300f63b8c24e5ccf96dcfbf8da3920d0e6748db0fe1eaad354aff234b411e87e917ed7bed93a08e9f36058dfacfe2cf806bed1de5ca74d0373f6fb31 SHA512 eb5690ac6115c16269cbf6fa4cbb76da291050c64bc08a35640f51054bdea69d4bdf37b105e3975440f840e4fc40a2664adfcec537d61c25b643625265b11916
+EBUILD musl-locales-0.1.0.ebuild 525 BLAKE2B e65949cfe8aa7c627c7f152f628194f68ccc0328471b9b3c5a48e45caca16ca93a560a0a1b18f8ab4627676f5ea4c0c79cd855292561cd0882230fa176ed19d2 SHA512 632dbbf8c8b35f25eaeae74357cc04f779132753fc1a8f59fe795d2a85b9f031ffa92fc7243a379546c3c9bf7502cd9268f7687a4602bd3fef328991b14c6bf9
 MISC metadata.xml 217 BLAKE2B b827888fdd4e1572aade77387c9e6e702b7637e5fb50e47c163308d2e1609967e473611061373febf39543bd178c2b753ed43043b5d3e875e1dc30ddaa5db943 SHA512 a425ec31e1d9f15041755a5b4102c69b4500955ffe8872a6bc90b8ccb731693ee1c6a194928c0e042ffbaa8e09818d170baac66e1b2b5fc6940cf80a4356369e
diff --git a/sys-apps/musl-locales/musl-locales-0.1.0.ebuild b/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
index 664db0dd372e..627e4b746c89 100644
--- a/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
+++ b/sys-apps/musl-locales/musl-locales-0.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.adelielinux.org/adelie/musl-locales/uploads/7e855b894b18ca4
 
 LICENSE="LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="!sys-libs/glibc"
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 73103090f353..f35a2fc0eabd 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index a49515cc53c4..dd9509ce1325 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,6 +1,6 @@
 AUX udisks-2.9.4-undefined.patch 6251 BLAKE2B 1c2eb5b5448686dcd343fd582e5e79ecb38bbfae4108a56c5b27de9c446a49b7ec1e22f7f55778f7ace7f309b4d2bb7bae99932411917abbefbc58b62fd7dae0 SHA512 103cf151084dd239baa40554cfc2396281e478d8ca9e73c848cd4af42716d7677a50a7dd1b18d8a84a3f97210c695f392ea3556104ed03b50640d0cca96303cd
 DIST udisks-2.10.0.tar.bz2 1784010 BLAKE2B a3923433408ab87448ea0b6dcafcf329b1392f5810ca6d1bcb52da90aad02578f9e533041a5ad62258c485e43b834a60b28fc66ade0aa241c1cdfafdb130bf65 SHA512 3c9dc18dd5f6d61442205f4df2592ebf79211d12d71168f96e6814c2ce16f7a46cda7c0a5ccf47b7dc8b655d8af654d5a62e54b04e5b600af0b15558442cf3ed
 DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
-EBUILD udisks-2.10.0.ebuild 3670 BLAKE2B 3faa9f8728d46baaf2601f2fe233f392d9ee64b0f889c813cf9506d96ada07ce87fd02178a56030ad0ca0c03290d2e91539a065ba060c4d70559e8614b918b4a SHA512 f8596ed778884c920f4ac347f1c576c429787932c44220c2ad3cf97260f4c1595761224384869a22b1761add69dde5b5ad1dd6cd83fe52feb6c221a82a15a7d7
+EBUILD udisks-2.10.0.ebuild 3675 BLAKE2B 42ff1bda6fc256e2e29bbe49b5ef4bce0ee94f7529d7757d8aa3a752f3af04c6ba3e16cde8355dc13098bc6adadc0bb020d276461c0b912a03da450c80e9a5b0 SHA512 86a18d5d8f7bca8c51439c144ce1e9528c2f9af495054c81c1d4c1d7cc2e8340b4b002cd8569c561d87d0f69eea5809632b88aeb3b94a61f7cf983067549b290
 EBUILD udisks-2.9.4-r3.ebuild 3953 BLAKE2B 3412b2ef36590314f4e52ac99509bbb48ced853dc96d60241beacc921a0426c2798d54a9b04b96d2f7526762098888da05fc4b374d70c12a29d9d4cb39e6ea0a SHA512 0f89f6457e62cb74ffe6e7d59fb46844595f1ad4289d26ea11c0a6f03ad0cc0df27b0ac2ba4c65a78443e0432ff1c68d45d881408dc9dcded332cd65e4298c75
 MISC metadata.xml 817 BLAKE2B 8de63b889a0237db873c61e20fd4c03e0b3cba0e76af124ccc6ce8240557c6cb60b15e566918a358714a7c9c981fba2581c155a22fc8ca81bfc363012426b000 SHA512 26df20e075b5f6f23d78ee21c52908c54bd499502208570b575227464f4105044d08421c01e025cbd15fb5d003190f72ded2ea905bc037746b3df452a50999df
diff --git a/sys-fs/udisks/udisks-2.10.0.ebuild b/sys-fs/udisks/udisks-2.10.0.ebuild
index b42b82eab9dd..fe76f3d7cce0 100644
--- a/sys-fs/udisks/udisks-2.10.0.ebuild
+++ b/sys-fs/udisks/udisks-2.10.0.ebuild
@@ -24,7 +24,7 @@ BLOCKDEV_MIN_VER="3.0"
 
 COMMON_DEPEND="
 	>=sys-auth/polkit-0.114[daemon]
-	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?]
+	>=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,nvme]
 	virtual/udev
 	acl? ( virtual/acl )
 	daemon? (
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 55dafc696eb4..31c5cfb31475 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/queue-standalone/Manifest b/sys-libs/queue-standalone/Manifest
index a06c26b8a51c..443800d064f7 100644
--- a/sys-libs/queue-standalone/Manifest
+++ b/sys-libs/queue-standalone/Manifest
@@ -1,3 +1,3 @@
 AUX queue.h 19539 BLAKE2B e3a4433d8b0a36bf8beb2678521a45b104ee0bbed2c32cd52d8bc60443fe97aa682c78b3fa65b40813e6bd0cd3b6a6bf75836f630c83dcbf7ba6e682547c0879 SHA512 0bd66194fc3c6ee185948d17cc34475afd19a7a3b6c1d2531fb7fac68bee6fd170428188b2c0c74a918adbfded43c4fb36892823c78c197e0af484d24601adef
-EBUILD queue-standalone-0.1-r1.ebuild 417 BLAKE2B 319620fb00c4329bc909e6dc56f623a5b036b46b77b5398ba5bb657a98e32f579a7e888f9adf1617729923b88ab8bc5a40ccc0a63e6182d4f610365e4d186751 SHA512 7da1f6575fa19100f787c0ce6dea161f6e3c65b566636f863702dbdda92c4103166b7f383402cd4c7f86bb4ceee078d009861ebb33a6eba908638359e60c8685
+EBUILD queue-standalone-0.1-r1.ebuild 423 BLAKE2B 61f2141c7a720aa2c9d7204e5db9b29ee5b7096e74040db425b55f25460cdc717a9a6f0be408c0f34e717e71da7099f43166ce4c9ca2b5cb07cd4e5a1434fda1 SHA512 bb16d3aa329436910f6a293a54d3bc8d1de2585f01550df7975f0670564e5687daa43f0bee73614d46d8b877d82926609c92c42af5857b008bcace2a69a05d7c
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild b/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
index 54d56b494c09..709080527b31 100644
--- a/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
+++ b/sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv x86"
 
 DEPEND="
 	!sys-libs/glibc"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 7e8d319c5eea..e62247b74db2 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/libudev/Manifest b/virtual/libudev/Manifest
index 1e1221ca9161..4625a6ab2d09 100644
--- a/virtual/libudev/Manifest
+++ b/virtual/libudev/Manifest
@@ -1,2 +1,3 @@
 EBUILD libudev-232-r8.ebuild 499 BLAKE2B c3ac3d4c797e7b57d0734fc03e3c0894d7bfe6807baa78e601fc0f2c8a7b6be162411c434b761369ba375d9f63d7d99b757222f4eb2f7f1f5dd1ed1b0880c35c SHA512 3e43990f9641fa6e95a88b202e62e6bca1cad2cb427835dd335e833465ee14a77064f300a3187826526aad7616c143579f9d3a6058d32db30967e10e1fc38c67
+EBUILD libudev-251.ebuild 540 BLAKE2B b1996a5ff5fce602c8404915e5dec66759bd423d51f9d86bccb78d8f63bfcb7ddeab4ff57e33dd17f1c2879e767d98c9b9036d8bf74c5a38be3428e175684cf6 SHA512 ec23562f20418d99e3f7d8b029be8c1c3d6d16fd56fe9cefaeba16c55839d91317904754ba35f9ce82cccda13a55cc55a28a4f0dc01325d62d9fa111abb74a2e
 MISC metadata.xml 322 BLAKE2B 974312e3d51dfdefe0a216044b7bd6366ba1f7077ce3aa6129b7dd0befef0898a0c53186e97cb2a950fe436408490c346a558b829e38a670034ae8afaf8dcf1c SHA512 43abbe0769a99d3064a9727d9d730adef57e958c03aa3dc9220adc7cdc84898282a8c600d0892c47de0b0391db58caa901a8a809718fd20eee88dbb5efb08890
diff --git a/virtual/libudev/libudev-251.ebuild b/virtual/libudev/libudev-251.ebuild
new file mode 100644
index 000000000000..feae96ea89ed
--- /dev/null
+++ b/virtual/libudev/libudev-251.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for libudev providers"
+
+SLOT="0/1"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="systemd"
+
+# eudev does not provide v251 APIs, see
+# https://github.com/eudev-project/eudev/issues/249
+RDEPEND="
+	!systemd? ( >=sys-apps/systemd-utils-251[udev,${MULTILIB_USEDEP}] )
+	systemd? ( >=sys-apps/systemd-251:0/2[${MULTILIB_USEDEP}] )
+"