gentoo auto-resync : 03:09:2024 - 12:28:20

30 files changed, 113 insertions, 108 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index f5dd834c1b07..0b238e69748a 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 30a74788fd8b..8e57e82cc2b8 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -3,6 +3,6 @@ DIST qt3d-everywhere-src-6.7.2.tar.xz 141589248 BLAKE2B cb775f7e66a3c5a42a665605
 EBUILD qt3d-5.15.14.ebuild 948 BLAKE2B 398c6ec0d38bca086daab3d2cae7a7afe107f977bd980cac0dee1c5919d28024ebce2fdf492c3d14c798e229a13d375d22188613da0d067ebbbe526799364e3a SHA512 e9503b5e06159e4a13e1ed08abb181d4cc7162f15398f1d4907c30a85d798c87793cca1e8fbb1a7c0a5759f6f246f60d7fffd3aecf23a2896a6db9090a4c189a
 EBUILD qt3d-6.7.2.ebuild 819 BLAKE2B 9203d5455ee0d393559998f08a30e3db9f897f841dcfb4aaba947cb1170c1d9ed1e693bfc0dc240e59209d7181849e5ed729e005d354413f1be6cba33d5b3b60 SHA512 5e38c8c4f0ef1d2dd9b6797640fba79da4a00b16979a08a7ea302f028eab8a78eb5153db51aaf4d0e9a6a0d79605948eead999c6f6a98c535a75c02604aafdef
 EBUILD qt3d-6.7.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417
-EBUILD qt3d-6.8.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417
-EBUILD qt3d-6.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417
+EBUILD qt3d-6.8.9999.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00
+EBUILD qt3d-6.9999.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00
 MISC metadata.xml 692 BLAKE2B 807ac52bd34ad8ea6471eb7b03703f20951c941a2b5841fa173796b4d9b3bdee1afc79fb83057a5bd6329db5cf656c0c5afdc6ece087684c14e0a581c91eed69 SHA512 5894daabb0fbee32e8fbcdc35f720f2f3225bd78ac632491d4603650db49c79c41fbe84d1cfde15870ed7a17c39c98cb5572ca5ed1da7fe5311faa7b2b750aec
diff --git a/dev-qt/qt3d/qt3d-6.8.9999.ebuild b/dev-qt/qt3d/qt3d-6.8.9999.ebuild
index 5e1b7809f57e..c67d6bef95e6 100644
--- a/dev-qt/qt3d/qt3d-6.8.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.8.9999.ebuild
@@ -30,7 +30,6 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
 		-DQT_FEATURE_qt3d_system_assimp=ON
-		-DQT_UNITY_BUILD=OFF # fails to build
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qt3d/qt3d-6.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild
index 5e1b7809f57e..c67d6bef95e6 100644
--- a/dev-qt/qt3d/qt3d-6.9999.ebuild
+++ b/dev-qt/qt3d/qt3d-6.9999.ebuild
@@ -30,7 +30,6 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
 		-DQT_FEATURE_qt3d_system_assimp=ON
-		-DQT_UNITY_BUILD=OFF # fails to build
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index e1ed19137529..b5519f90f5c0 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -5,11 +5,12 @@ AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f75
 AUX qtbase-6.7.2-CVE-2024-39936.patch 7171 BLAKE2B d1b6e9a35e35f1e6b3e7a7c975fb6719b8594ee5f3212bc18bfe4a1990d70424a682071551c5971d62d6351a38e36b6f4c4acb9241af1ad2e64ec604ca440394 SHA512 cd6b48ebe7c1dc1224a54f0d32845e598223a3c40c6da11b4639646fb073c6b5a2e54d9625ba0413afb876a83c2d50bdf616f4876154fb33fa941d6cbf053291
 AUX qtbase-6.7.2-float16-sse2.patch 1773 BLAKE2B c5b8bb7065db6186d81fb9267235327eba698c096d3e8051a2671d4655ada21ff063b297b00b8da098bb07b6a4abc9fb42fb7652e9de8aa759a349f8f1e58afc SHA512 af4b3c014ce86de25c02d7846ff0e354762513313d353971e6259da1dea20d6bc5ae7fb475469d29c3251d4e9e6446afda8b21086df50ba1108083d112bbfe73
 AUX qtbase-6.7.2-gcc15-odr.patch 1162 BLAKE2B 640688d21fb70ce67378e0f8ac5ddac12b657a9802c0f2e524e6c210cf055955cda41300dd792949541e085d5e8a7ef19dcceaa36f6f73da651f89e88dab2ff4 SHA512 3dd8f26d02fb11075f97b3284e8c0ed1bcff5feafc6535026078dc5b38ed106ae144c18db1fff502b1cebb06761f55d995a8e31c8a6b701f08d21fdbb170bba1
-AUX qtbase-6.7.2-qcontiguouscache.patch 518 BLAKE2B f73e6e208894ae2887099d281a5359251c027284d0a02969c501a041c29c2b89a41094da3d0fea4e05148d5ed7f8f1ab25ff3ada07fa5b349c33efef90b55cdd SHA512 5be69a05a10905ce46031ad531001446d1a45d40a405c07a4bc17fe033475dd25846ea11c3fd3e7021a8e767eb4ad747509dc4e2196e14c672d60591ccd3a9f4
+AUX qtbase-6.7.2-qcontiguouscache.patch 310 BLAKE2B 736663ba1d07285fb5bb6b050b88cec9beaf20fdb7815fe1c2008872c6d076e04c76ae1b54c930c7096043ceba7285e4ac85c46c67720afb105a0647d0baa200 SHA512 81d7942275695fa82a2794792f5e4a5d6b7aa93515017146a55c52f0ba3edb9f2f4252f317978bfaf52856ef1c3295ad4fe5c21a55502c8c8b22f305a0753bb6
 AUX qtbase-6.7.2-qwindowprivate-crash.patch 1337 BLAKE2B 1d8e354dc0db89744073bf555263129904592fb7c05b315713a21eae94b52a4b847dae906700cc5551fa21f828373ed044903dd10e8b86670b9296aa2009a3a3 SHA512 30e54110b9351aa2f7614a416b1fdf0d192a42386bdc5e75bd91fa2ecb98c48066b4e3858f97e00abbcbf2ddd5e90eab1594e285434d083215eaa34463dfa65b
+AUX qtbase-6.8.0-qcontiguouscache.patch 526 BLAKE2B b701f92d8365e8408a2ff79c812c397ac0042aa6b6316cf167a7877d48044ffaa0d2683fa27ffcbe80c8e74f8ff0c8af220b927889e83340c6b5325b1fbf16ab SHA512 19f33f2dd856c8328b9175458250929f3da34cde179d5f52ec1982e5e5f1772412f2541e146763a6258ce3377e0b624f07926fe4af56de7364c34835151b8995
 DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b
 EBUILD qtbase-6.7.2-r4.ebuild 10267 BLAKE2B 86090d41433852a3cca5e3e1c893d9c94d44b2e0783194779c9f501f8f32d5001fb2fb8786eac4991b3ae4ad3db97320fb245669d65e8213178432ae02570ff1 SHA512 28a2ea55c6a3e5a99d7baff53d787983af9b288b515fbf9f29d71b4ef885a6b363d35e2c970f919653ebb98472603a0d59ba54353096698e37ef1a4358cd5f5e
-EBUILD qtbase-6.7.9999.ebuild 10032 BLAKE2B aecd7b39e82de87079747523533032f9e5a51502e96a319012500924d6bbcfa4fdb820a0cb9f27773cd9fb37af339e9e40de7eaa8dec8235c8b52a92ce034485 SHA512 c74e4d08358cc78952bb5d8d6e7513859ef32fd4827077e736789e6506c21ed2809d5d468fd6755366e23d31655261828c8bcfb2c03840e598704bbfe09b530b
-EBUILD qtbase-6.8.9999.ebuild 10471 BLAKE2B 04c272ab4d67c0be36759a78032cd215ccf83b92860523ce7f4749991e4bd3755729a0975f351113dd7df98783695c8f419b2687f9557b6cdcab9f8c8b5640dc SHA512 3d11bed6c7b0182542ea7186752f3a8fd15f1daa594d7ced4835e9e31ef49e4e4bec2f103b04eeab29c7e1205e568093310ce56a3922f36481d4c9cc7db98ccc
-EBUILD qtbase-6.9999.ebuild 10471 BLAKE2B 04c272ab4d67c0be36759a78032cd215ccf83b92860523ce7f4749991e4bd3755729a0975f351113dd7df98783695c8f419b2687f9557b6cdcab9f8c8b5640dc SHA512 3d11bed6c7b0182542ea7186752f3a8fd15f1daa594d7ced4835e9e31ef49e4e4bec2f103b04eeab29c7e1205e568093310ce56a3922f36481d4c9cc7db98ccc
+EBUILD qtbase-6.7.9999.ebuild 10017 BLAKE2B 2d8d281b680059466fd16962380e338dcd115d2e3c77cfc88e0ceae1337f49ede09534bb8f923108bce66a3b993a753744ca99a3c2d9e27d080115a3e1ef6f23 SHA512 f6b94592da24dee07c3a488d45c2c18aa421c47c65180cd954f9252835bdc0109bc9de61b72be9842ceef7b93f30f5c1fc1a0f1006a3bb4e0cfd1246625efdea
+EBUILD qtbase-6.8.9999.ebuild 10554 BLAKE2B 64b0c95b5763f5e772e643cde8b11118034ddc303707e8c8b2cc7086f2b36f21ccff7b225d5a6aa818c65a63aa89d57127cbb985a486842f6746e0da2b85a0bb SHA512 bb42ddd44da538c8b229d150a02692524065afafe347268c0f2cf1e77cb8a8b310f9d8bac110dce3063d0203c7b74d4fa52b5a72b5eb8cc48e3b00d185d7df11
+EBUILD qtbase-6.9999.ebuild 10504 BLAKE2B e5eee3ef59d52086f340b5669ef9cdbb35b31238dc5894860c694677bc0d2150e8204f5933f77495c6435355ce21731be5a5f41310fe8148f9b8919236fcb33c SHA512 861bcf82a0a283ef56265cc707184eba9533e2e351de9bf92cc395b0527075c0476ed7afe341af75205e3f31cbbdabe18f2f903561c34ea12872b2a25fb3b51f
 MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531
diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
index d010222e09da..02219feaf681 100644
--- a/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
+++ b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch
@@ -1,11 +1,8 @@
-diff '--color=auto' -ruN qtbase-everywhere-src-6.7.2/src/corelib/tools/qcontiguouscache.h my/src/corelib/tools/qcontiguouscache.h
---- qtbase-everywhere-src-6.7.2/src/corelib/tools/qcontiguouscache.h	2024-05-07 01:06:44.000000000 +0200
-+++ my/src/corelib/tools/qcontiguouscache.h	2024-08-25 18:20:13.958793266 +0200
-@@ -8,6 +8,7 @@
- #include <QtCore/qassert.h>
- #include <QtCore/qtclasshelpermacros.h>
+https://bugs.gentoo.org/938475
+Older version of https://codereview.qt-project.org/c/qt/qtbase/+/585668 for 6.7
+--- a/src/corelib/tools/qcontiguouscache.h
++++ b/src/corelib/tools/qcontiguouscache.h
+@@ -10,2 +10,3 @@
  #include <QtCore/qtcoreexports.h>
 +#include <QtCore/qglobal.h>
  #include <QtCore/qtypeinfo.h>
- 
- #include <climits>
diff --git a/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch
new file mode 100644
index 000000000000..e5f14e0a1c73
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/938475
+https://codereview.qt-project.org/c/qt/qtbase/+/585668
+From: Sam James <sam@gentoo.org>
+Date: Sun, 25 Aug 2024 17:34:22 +0100
+Subject: [PATCH] QContiguousCache: fix include for qMin
+
+Include `<QtCore/qminmax.h>` for `qMin`. This came up downstream
+in Gentoo at https://bugs.gentoo.org/938475.
+--- a/src/corelib/tools/qcontiguouscache.h
++++ b/src/corelib/tools/qcontiguouscache.h
+@@ -10,2 +10,3 @@
+ #include <QtCore/qtcoreexports.h>
++#include <QtCore/qminmax.h>
+ #include <QtCore/qttypetraits.h>
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index cc0ae2b0de2c..85c2de60245c 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -145,6 +145,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
+	"${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch
 )
 
 src_prepare() {
@@ -165,11 +166,10 @@ src_prepare() {
 }
 
 src_configure() {
-	# The only component that uses gdk backends is the qgtk3 platformtheme plugin
 	if use gtk; then
-		# defang automagic dependencies
-		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+		# defang automagic dependencies (bug #624960)
 		use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
 	fi
 
 	local mycmakeargs=(
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index e2867369035a..0f983d79ae6f 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -145,6 +145,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
 	"${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch
+	"${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch
 )
 
 src_prepare() {
@@ -165,11 +166,10 @@ src_prepare() {
 }
 
 src_configure() {
-	# The only component that uses gdk backends is the qgtk3 platformtheme plugin
 	if use gtk; then
-		# defang automagic dependencies
-		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+		# defang automagic dependencies (bug #624960)
 		use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
 	fi
 
 	local mycmakeargs=(
@@ -303,6 +303,8 @@ src_test() {
 		# may randomly hang+timeout, perhaps related to -j as well
 		tst_qprocess #936484
 		tst_qtimer
+		# haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough)
+		tst_qlatin1stringmatcher
 		# these can be flaky depending on the environment/toolchain
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index e2867369035a..3c595f73638f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -165,11 +165,10 @@ src_prepare() {
 }
 
 src_configure() {
-	# The only component that uses gdk backends is the qgtk3 platformtheme plugin
 	if use gtk; then
-		# defang automagic dependencies
-		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+		# defang automagic dependencies (bug #624960)
 		use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+		use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
 	fi
 
 	local mycmakeargs=(
@@ -303,6 +302,8 @@ src_test() {
 		# may randomly hang+timeout, perhaps related to -j as well
 		tst_qprocess #936484
 		tst_qtimer
+		# haystacksWithMoreThan4GiBWork can easily OOM (16GB ram not enough)
+		tst_qlatin1stringmatcher
 		# these can be flaky depending on the environment/toolchain
 		tst_qlogging # backtrace log test can easily vary
 		tst_q{,raw}font # affected by available fonts / settings (bug #914737)
diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest
index 2f41c3ce2787..b40fbedfe8c0 100644
--- a/dev-qt/qtconnectivity/Manifest
+++ b/dev-qt/qtconnectivity/Manifest
@@ -1,6 +1,6 @@
 DIST qtconnectivity-everywhere-src-6.7.2.tar.xz 1061952 BLAKE2B 2b46b255f5ca5ab7b5363f6e3584dd4318a4e4d120c8595b309fba1354d9e1c763d9fa8e84b22f5c342204b2849b27d08a7f5dbd9d00533e150c2b8fb6561db3 SHA512 381098e406ac18d87d34eb9087d1655c16e604059d69b77c04df9d444cefc77630a212f52b0fc2a1573c524044aa1837379d70460e152cd353731e52c4bd0e67
 EBUILD qtconnectivity-6.7.2.ebuild 1734 BLAKE2B 21b1cfd523c635eab9abc358262511a368e362173e3ba7db637b70bd66bfaa53840e93dae3e79c4782b77fc8edfde324750b1d1d5ea7d95642662e4ebeed3e83 SHA512 26dc5f98133d3c734442a9a2d30422042cdd1d41db8b0948a91ac9c5947ecdec2173524c22d20cb359a7e503debee16e1d3686eaee134b2c487bc58599f83753
-EBUILD qtconnectivity-6.7.9999.ebuild 1734 BLAKE2B d164b5e96a0d191090f030d10f74024b8d79924b45cf20df9736b0e036a86dd8f30b87521105e6be8d18cc402c209eb0430611da502472d7ad3191b8a53b956c SHA512 70fc092b946fb5ade32de076169722184e7707ea1c7315fd328936870363fe277f70724a944110c7d2e6059fb1a0d4a21b2a54e03732209f516312f419de7838
-EBUILD qtconnectivity-6.8.9999.ebuild 1895 BLAKE2B 782530ba9f6eef2143b44bf2538d3ab059dc733c8d8a3a60f683589f49fe07cf103861ca153357662399c87051a856a207b76b49b24ba2dc50e4473474bf5c91 SHA512 cdd850f365293541f00b35be88ccb5fcd10bfc14e6aa5d6bfad6e976fd7ec6f4d25b3c9a4c0a5b9fd94af949006ed7854a6c20b4e5a47684fa852e733b315d25
-EBUILD qtconnectivity-6.9999.ebuild 1895 BLAKE2B 782530ba9f6eef2143b44bf2538d3ab059dc733c8d8a3a60f683589f49fe07cf103861ca153357662399c87051a856a207b76b49b24ba2dc50e4473474bf5c91 SHA512 cdd850f365293541f00b35be88ccb5fcd10bfc14e6aa5d6bfad6e976fd7ec6f4d25b3c9a4c0a5b9fd94af949006ed7854a6c20b4e5a47684fa852e733b315d25
+EBUILD qtconnectivity-6.7.9999.ebuild 1739 BLAKE2B 1b838a40dd3edf95f2d18767409880412bd70eb3bff7e6bb2ad89b59935b33aafdd339e47965976acade4b392924cb5eb928e381be4cf3bb34fc6747236a5506 SHA512 7d6cbb7d9577a95111ad15b758ddcb0a0d3ed9c54279b1b0825d0d925f8c4133b6a0cf25adf0b2a0a03856af2a1cd6ae97f811754cc38ef5890c7afdf81b51cf
+EBUILD qtconnectivity-6.8.9999.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd
+EBUILD qtconnectivity-6.9999.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd
 MISC metadata.xml 721 BLAKE2B 4c2d1448a532b27910627b3fa1b8912b9048434058ee6f7b14276913ad5d77e55a6f2200002953863aa76ef5d66c04126995e0746cfaf208fa6dbd6e9b622ce1 SHA512 17808c1ab2c7a8e36f6f20801ac288abfd3b390d67ae55212d0d6b890aa7bb49ad8c7d3899cade2d8515faee76a5e02b3cfc582e3f5dde744371592e6d8dfb67
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild
index da4242aa89dc..c9923654ba1c 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="+bluetooth nfc smartcard"
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild
index 9f8e25a38f2c..ed26392897ad 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.8.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="+bluetooth neard nfc smartcard"
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
index 9f8e25a38f2c..ed26392897ad 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="+bluetooth neard nfc smartcard"
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index e148d9cff7ac..9a238c6bdcb9 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -4,7 +4,7 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c
 DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
 EBUILD qtmultimedia-6.7.2-r2.ebuild 3247 BLAKE2B cf452a84f0b696c23d1e01261292284b019c1f8331684b27f24e5cc0e6d12a759ab8af62823aecbcf76359ec1f81863ff469cf0239c92c959ccfd8cb388c0a55 SHA512 e69f82784a2ad6416b98b630ce01c7f76df6c6d56c3ac968bd6ccccadc8270c1d614af2b524663b53fb6cf7a84bba1f3e613217a5607bbe5e63d34a6b30570a2
-EBUILD qtmultimedia-6.7.9999.ebuild 3197 BLAKE2B 8cca6522b8fea6cafd06d3dc27a890337d1bd853b4ab634f5845430dd8f9fe3ca775f0c3d2f8fd9b5d9aa8c886b2d5844e2bf09bb985666c4be3e2319f8ae156 SHA512 4b0eefcf9244f8a98e0b2d3e687e2219bfb9d28bdb3298bccccd1eec16a07b9a6a03b4e1fdfaabe7bcb90b16c5d60a83eaf74dd7194fb4b87bb914ab961fa455
-EBUILD qtmultimedia-6.8.9999.ebuild 3838 BLAKE2B b9329acdcdf75429543feaed309357c4eaf4a9041b55da43ffdb6d386e0c40976a5882e03cbae77c440d90c53108a2fda30db22d18c2e51a2563a16d2ca8e2b3 SHA512 444818fec37bfd2dd8a0eaae2058f848a530fda1227d62fdbe39b78a163006e1cc0e46d0c1c70d24cd0b0a067393631162c814f371f48c843ae1b0d099e458b1
-EBUILD qtmultimedia-6.9999.ebuild 3838 BLAKE2B b9329acdcdf75429543feaed309357c4eaf4a9041b55da43ffdb6d386e0c40976a5882e03cbae77c440d90c53108a2fda30db22d18c2e51a2563a16d2ca8e2b3 SHA512 444818fec37bfd2dd8a0eaae2058f848a530fda1227d62fdbe39b78a163006e1cc0e46d0c1c70d24cd0b0a067393631162c814f371f48c843ae1b0d099e458b1
+EBUILD qtmultimedia-6.7.9999.ebuild 3579 BLAKE2B 5ae33052c36f731ec01f34fdc059360351b108c85f86054a6620a5f014f8c12db302fabab8ac16779b4993c19633a57dc91d89e9febfff272c074f512f0d2762 SHA512 d958f74a47e59417dab96104e4154d73af7c00d4c49601b06173ef306019f09d38fef31bc28fb364a9f888477fb6cb8d767b0924638183cbdd00c38ee8b9eb3b
+EBUILD qtmultimedia-6.8.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f
+EBUILD qtmultimedia-6.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
index f92c651b8b19..4aefaf7a465a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
@@ -11,15 +11,20 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
+IUSE="
+	+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
+	qml v4l vaapi vulkan wayland
+"
 # tst_qmediaplayerbackend hard requires qml, review in case becomes optional
 REQUIRED_USE="
 	|| ( ffmpeg gstreamer )
 	eglfs? ( ffmpeg opengl qml )
-	vaapi? ( ffmpeg opengl )
 	test? ( qml )
+	vaapi? ( ffmpeg opengl )
 "
 
+# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
+# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
 	alsa? (
@@ -37,8 +42,12 @@ RDEPEND="
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=,opengl?]
+		media-libs/gst-plugins-base:1.0[X=]
 		media-libs/gstreamer:1.0
+		opengl? (
+			~dev-qt/qtbase-${PV}:6[X?,wayland?]
+			media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
+		)
 	)
 	opengl? ( media-libs/libglvnd )
 	pulseaudio? ( media-libs/libpulse )
@@ -81,7 +90,13 @@ src_configure() {
 		$(cmake_use_find_package qml Qt6Qml)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
-		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
+		$(usev gstreamer "
+			$(qt_feature opengl gstreamer_gl)
+			$(usev opengl "
+				$(qt_feature X gstreamer_gl_x11)
+				$(qt_feature wayland gstreamer_gl_wayland)
+			")
+		")
 		$(qt_feature pulseaudio)
 		$(qt_feature v4l linux_v4l)
 		$(qt_feature vaapi)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 41486d108f30..abc7252aee13 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -76,7 +76,9 @@ CMAKE_SKIP_TESTS=(
 	# tries to use real alsa or pulseaudio and fails in sandbox
 	tst_qaudiosink
 	tst_qaudiosource
+	tst_qmediacapture_gstreamer
 	tst_qmediacapturesession
+	tst_qmediaframeinputsbackend
 	tst_qmediaplayerbackend
 	tst_qsoundeffect
 	# may try to use v4l2 or hardware acceleration depending on availability
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 41486d108f30..abc7252aee13 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -76,7 +76,9 @@ CMAKE_SKIP_TESTS=(
 	# tries to use real alsa or pulseaudio and fails in sandbox
 	tst_qaudiosink
 	tst_qaudiosource
+	tst_qmediacapture_gstreamer
 	tst_qmediacapturesession
+	tst_qmediaframeinputsbackend
 	tst_qmediaplayerbackend
 	tst_qsoundeffect
 	# may try to use v4l2 or hardware acceleration depending on availability
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 74c89c8f4353..4304ee379050 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -3,7 +3,7 @@ DIST qtspeech-everywhere-opensource-src-5.15.14.tar.xz 95916 BLAKE2B 15673759f71
 DIST qtspeech-everywhere-src-6.7.2.tar.xz 262360 BLAKE2B 0faceb7e8425ccb03574fa6db5a9f8dab967197341fce497fc2600a6200d417dba8b83a6a7616fed7cbce3d2c34b48b77e37814518996f917aeadc7ca628ebff SHA512 f6e598834ab455c9feb5836b0add05802261210be088f7860b746a214a5be7d332a43d7c09bd03eef48d362165f2739b858e966249c061c9ef537346453bd588
 EBUILD qtspeech-5.15.14.ebuild 730 BLAKE2B c3941cd7399ec7d5cdffd2ad65611bc094c64d0aafdf08f40dc36e2da2feacd037bb01e32bcc8cc1d470a70b19dc3c71a7356c8b4a3921de65f1db6d800000e4 SHA512 e019cb16105b96d9e5d28ea5aa6e0cdb30572e6fcb5313a9efcf5da5b0c35cb696a2173ecf3f969e738db4b84311659c7b8666fe187e2f538db7366923d79374
 EBUILD qtspeech-6.7.2.ebuild 1190 BLAKE2B 082e9498be5b601e0454185ddd3e37d78ddaf9f2fe8854a7611f625d457aa85a8fc2b74f6888d8c62b985d7f1d22ce3de737fe74b416429465de52e52cbcc112 SHA512 8dcf13e5997e420a882a2851c8f0b119e20fe577d8e0e46d0fca42b78359715d8979c0059bd5528706326480dae4e7cca20d56aa9628e7ef53716d30fe0f4f42
-EBUILD qtspeech-6.7.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04
-EBUILD qtspeech-6.8.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04
-EBUILD qtspeech-6.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04
+EBUILD qtspeech-6.7.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3
+EBUILD qtspeech-6.8.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3
+EBUILD qtspeech-6.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3
 MISC metadata.xml 861 BLAKE2B fe3a9f427c9a3868ece77a85d0e2f62d12ad109c893a6adba13a9d2cb0098acff98f4ede9185c77a24ea0ddb5d028b77b71f2efa6cfae275ff12138dcd4cac78 SHA512 1e6940d835b139860878cb5b16e4f0f6eadd1e48130273a0c5a511376341d03bed1fa59a83f12e2f7c87a269a5410f92cabeaf3e4f3574eb906f69bc61d8b401
diff --git a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild
index b668e25bbabd..1b13d4434223 100644
--- a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild
index b668e25bbabd..1b13d4434223 100644
--- a/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.8.9999.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qtspeech/qtspeech-6.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.9999.ebuild
index b668e25bbabd..1b13d4434223 100644
--- a/dev-qt/qtspeech/qtspeech-6.9999.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.9999.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index 59d876214e71..ced492526418 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,6 +1,6 @@
 DIST qttools-everywhere-src-6.7.2.tar.xz 9019636 BLAKE2B c4324275adddefc2399ce4ff1305d285c9e4bc7fb6cebf6bd310573773ada5cf91f14561b855df685bdcce0a39897c3b9e0b62544083af2794d7eaaf35660146 SHA512 311467d0e6970711b4d984fe792d2b75609f38c04121073d5c3c34c682fcee89787f6982c886e62206a76b1f647de60e56510439b0288f8bd1ae21a2683a37cd
 EBUILD qttools-6.7.2.ebuild 4646 BLAKE2B 4a77d671a5311fcd7e6170bc29764560993be958cc8ea58d6c31d8132372a5f65197a69acd3eee45d211cbbf95ee653849faa7d98a302db07f60e3b79b3e4912 SHA512 69930be9d05a6fbb10c616b8ec8b664d40428abbf516777ac5fcf85adc4a2ed39a82bcbfbb988aef8568ac0a3adcb4939fb89e531e90bbda97c751c6ff0e3e49
-EBUILD qttools-6.7.9999.ebuild 4652 BLAKE2B eebd7864fe6b6c135e0a8a3ca82facb8596cd468c6cb7b9064ea2eb88d0340c9756c5c53cb29c8aff02553dc60665391d337bf470d0483e7d7e7dc6b789512d0 SHA512 0f106b67908d04dc45ef0954251dc699c2e4de63a223b03680fe295d2687830dfd2814bf7c0a5996fa847c4e48fa7e3d41fbe076f278e17cdab571fb91dc2f8a
-EBUILD qttools-6.8.9999.ebuild 4975 BLAKE2B 35918fb023a017c7c2b958e5ec7990cf80cf45fed3d633b65e26314d62e597e7f19dc72d96b781f498e646f11a0c200c4510b2761c75df892b8a084d8707c823 SHA512 d2f528eabad3c58e41ec133a56715efa394d659cfac183477c8e41ae7c2afeca48cf81dbadf6f52ebff3da9f5f9a42aba761f57cbb436b02446d1d26fcb3cbca
-EBUILD qttools-6.9999.ebuild 4975 BLAKE2B 35918fb023a017c7c2b958e5ec7990cf80cf45fed3d633b65e26314d62e597e7f19dc72d96b781f498e646f11a0c200c4510b2761c75df892b8a084d8707c823 SHA512 d2f528eabad3c58e41ec133a56715efa394d659cfac183477c8e41ae7c2afeca48cf81dbadf6f52ebff3da9f5f9a42aba761f57cbb436b02446d1d26fcb3cbca
+EBUILD qttools-6.7.9999.ebuild 4668 BLAKE2B aa642a2efd9c1aff8d3cba88a5be07983b2d914bf3258c689eb1426399efa250faa84d88acab47eb2d1e1bd017b5eba80c38991d20ffab900bba31a4e3146db6 SHA512 1ea708153a48fdce72de03cbc50dd53ab20c56081dd19fc7b55476320d36406a50114170fcfeb5857c953b14e37ccdd252663cd827b5da199e6df9f320e563e0
+EBUILD qttools-6.8.9999.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679
+EBUILD qttools-6.9999.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679
 MISC metadata.xml 1495 BLAKE2B 05681d2d714d1d6e2939d105c48c3e16a1a99b4196b04fe0f1ed62cd628f0b3d743d75229aa123c887dfd2abea1e67b43d7224a1603d889f2f75d964f51206b8 SHA512 6c692eed887713ef7a3d33b2644ecfcf0ec2f346e5e15857996b8a6916a137d22cb2255cc2a44de06a4fb1e0818395842c52925b232ac49d7280210d2441f89a
diff --git a/dev-qt/qttools/qttools-6.7.9999.ebuild b/dev-qt/qttools/qttools-6.7.9999.ebuild
index fd8e80ea6380..da97fd670c79 100644
--- a/dev-qt/qttools/qttools-6.7.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.7.9999.ebuild
@@ -36,8 +36,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+	~dev-qt/qtbase-${PV}:6[widgets?]
+	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
 	clang? (
 		$(llvm_gen_dep '
 			sys-devel/clang:${LLVM_SLOT}=
@@ -45,12 +45,12 @@ RDEPEND="
 		')
 	)
 	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
+		~dev-qt/qtbase-${PV}:6[network,xml,zstd=]
 		zstd? ( app-arch/zstd:= )
 	)
 	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
 	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="
diff --git a/dev-qt/qttools/qttools-6.8.9999.ebuild b/dev-qt/qttools/qttools-6.8.9999.ebuild
index 5ad1c0f2b81d..22ec0d708b1f 100644
--- a/dev-qt/qttools/qttools-6.8.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.8.9999.ebuild
@@ -37,8 +37,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+	~dev-qt/qtbase-${PV}:6[widgets?]
+	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
 	clang? (
 		$(llvm_gen_dep '
 			sys-devel/clang:${LLVM_SLOT}=
@@ -46,13 +46,13 @@ RDEPEND="
 		')
 	)
 	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
+		~dev-qt/qtbase-${PV}:6[network,xml,zstd=]
 		zstd? ( app-arch/zstd:= )
 	)
 	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
 	qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
 	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="
@@ -93,8 +93,6 @@ src_configure() {
 		# QtHelp into another package so that qtdeclarative can depend on it
 		# without a circular dependency with qttools
 		$(cmake_use_find_package qmlls Qt6QmlLSPrivate)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 5ad1c0f2b81d..22ec0d708b1f 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -37,8 +37,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
+	~dev-qt/qtbase-${PV}:6[widgets?]
+	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
 	clang? (
 		$(llvm_gen_dep '
 			sys-devel/clang:${LLVM_SLOT}=
@@ -46,13 +46,13 @@ RDEPEND="
 		')
 	)
 	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
+		~dev-qt/qtbase-${PV}:6[network,xml,zstd=]
 		zstd? ( app-arch/zstd:= )
 	)
 	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
 	qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
+	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
 	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
 "
 DEPEND="
@@ -93,8 +93,6 @@ src_configure() {
 		# QtHelp into another package so that qtdeclarative can depend on it
 		# without a circular dependency with qttools
 		$(cmake_use_find_package qmlls Qt6QmlLSPrivate)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
 	)
 
 	qt6-build_src_configure
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 88b871992115..c4df77bef8b5 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -10,7 +10,7 @@ DIST qtwebengine-6.8-patchset-3.tar.xz 9260 BLAKE2B 6d4e0bcc24ecc16ce92f6d448326
 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7758 BLAKE2B f1c2e30680f12164b8a1a55ecaecc6b7a786cd173ae3500825c7ef04ebd53bd579d2c74a7648ff65c3c302a0f2955313814e0fd1223d564fde76ff7e0039d6d5 SHA512 37591ca47d0df49df995be8af07da94f32ee3d5e03bf9acf987b9966092e48e481d8fac5c3af920265a4736e95f8200be24cf75683e577ef135249555ad6efa1
 EBUILD qtwebengine-6.7.2.ebuild 10336 BLAKE2B 1345fddaace77254f82ea205e093032f8667b6b0ff4614c15393d34cc5100c035e13103a7edf4a705c5d0e442e0a0d14a6b2c302b7bef93ca45ea0c2d12e90fc SHA512 635c6cab34d3b3bfd17a3773697146b72a5530a856027a11d52b8eba2bfbddf662bfae6197720acd4783c75a4e59d005ccf3dda12fbdcc8975814854a2398827
-EBUILD qtwebengine-6.7.9999.ebuild 10338 BLAKE2B f79388ad31417f6e45945dfa2a70f94e79de202d6e67dc389cb149da43ba503eb017ae00928f0bfcd8ff4701e1d019d22e8b8359130439de69f8eee1a2dae5c4 SHA512 56136d10466267629cbaff4c8884e8068ca2196a48a512b416dd3c180c0555c8effbfbf198c53ebc7411695792f699dbed23533a6ea8a9e44a06c4343f534b3b
-EBUILD qtwebengine-6.8.9999.ebuild 10337 BLAKE2B 3ac9bb4b28f4882368bd264b121496064ae5cd43f7920100ff9d95219e29c94dfa34253890182f953a9f8c34f066b64e74087bc3753146bb5a78582cfe9be143 SHA512 ad7d17e8b97e7b60953b5290113719118fd133f777de0af8292238ccb9668383746aba2a00456d69401af3236d74de03725b3982f70e2d2450b3dd89cba8be72
-EBUILD qtwebengine-6.9999.ebuild 10337 BLAKE2B 3ac9bb4b28f4882368bd264b121496064ae5cd43f7920100ff9d95219e29c94dfa34253890182f953a9f8c34f066b64e74087bc3753146bb5a78582cfe9be143 SHA512 ad7d17e8b97e7b60953b5290113719118fd133f777de0af8292238ccb9668383746aba2a00456d69401af3236d74de03725b3982f70e2d2450b3dd89cba8be72
+EBUILD qtwebengine-6.7.9999.ebuild 9876 BLAKE2B f904bc7d9c44b86873766d505c6952f655917c59a255cb864712aa89d86724e0549699f6091a296be4ff53c7b212ff7037660c269319c65cbd0310a9546a5c9c SHA512 dff38c5c58a93de6fdc3a0a0c71d42e19699ab0d0826a2aa1e160f76f9e5fb28ef8e088e684487a43e596f4aa71d369d4076805e8201ac6f54076212403d5db2
+EBUILD qtwebengine-6.8.9999.ebuild 9961 BLAKE2B c259b87e0bee2cee73d86d630017747a37489fe3c6f717f62de30da2558589e3ab4d65099a5dce85b610b0f4eb131885720febd91c3662c862118607bfdc2e9e SHA512 90d57411fba88de7b0512a296ebd3e4288d042e837f5bc7e26e933291b9c37978e6cb05b84ce0e5cee3a9a3cd5c1aeb71e85586e35c9b7730f27fc1a62a22e1a
+EBUILD qtwebengine-6.9999.ebuild 9961 BLAKE2B c259b87e0bee2cee73d86d630017747a37489fe3c6f717f62de30da2558589e3ab4d65099a5dce85b610b0f4eb131885720febd91c3662c862118607bfdc2e9e SHA512 90d57411fba88de7b0512a296ebd3e4288d042e837f5bc7e26e933291b9c37978e6cb05b84ce0e5cee3a9a3cd5c1aeb71e85586e35c9b7730f27fc1a62a22e1a
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 4315b3198309..49de5422603a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -203,8 +203,8 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# use bundled re2 to avoid complications, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+		# use bundled re2 to avoid complications, Qt has also disabled
+		# this by default in 6.7.3+ (bug #913923)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
 		# bundled is currently required when using vaapi (forced regardless)
@@ -243,16 +243,7 @@ src_configure() {
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
 	fi
 
-	# Workaround for build failure with clang-18 and -march=native without
-	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
-	use amd64 && tc-is-clang && is-flagq -march=native &&
-		[[ $(clang-major-version) -ge 18 ]] &&
-		has_version '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 937f5ca9c883..fec93a911d24 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="
 	x11-libs/libxshmfence
 	opengl? ( media-libs/libglvnd[X] )
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -128,7 +127,7 @@ qtwebengine_check-reqs() {
 		ewarn "If run into issues, please try disabling before reporting a bug."
 	fi
 
-	local CHECKREQS_DISK_BUILD=8G
+	local CHECKREQS_DISK_BUILD=9G
 	local CHECKREQS_DISK_USR=360M
 
 	if ! has distcc ${FEATURES}; then #830661
@@ -192,7 +191,8 @@ src_configure() {
 		$(qt_feature vulkan webengine_vulkan)
 		-DQT_FEATURE_webengine_embedded_build=OFF
 		-DQT_FEATURE_webengine_extensions=ON
-		-DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+		# TODO: it may be possible to make x11 optional since 6.8+
+		-DQT_FEATURE_webengine_ozone_x11=ON
 		-DQT_FEATURE_webengine_pepper_plugins=ON
 		-DQT_FEATURE_webengine_printing_and_pdf=ON
 		-DQT_FEATURE_webengine_spellchecker=ON
@@ -203,8 +203,8 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# use bundled re2 to avoid complications, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+		# use bundled re2 to avoid complications, Qt has also disabled
+		# this by default in 6.7.3+ (bug #913923)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
 		# bundled is currently required when using vaapi (forced regardless)
@@ -217,6 +217,7 @@ src_configure() {
 			minizip opus poppler snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
 	)
 
@@ -243,16 +244,7 @@ src_configure() {
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
 	fi
 
-	# Workaround for build failure with clang-18 and -march=native without
-	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
-	use amd64 && tc-is-clang && is-flagq -march=native &&
-		[[ $(clang-major-version) -ge 18 ]] &&
-		has_version '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
@@ -277,6 +269,7 @@ src_test() {
 
 	local CMAKE_SKIP_TESTS=(
 		# fails with network sandbox
+		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 937f5ca9c883..fec93a911d24 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="
 	x11-libs/libxshmfence
 	opengl? ( media-libs/libglvnd[X] )
 	screencast? ( media-libs/libepoxy[egl(+)] )
-	pdfium? ( net-print/cups )
 	test? (
 		widgets? ( app-text/poppler[cxx(+)] )
 	)
@@ -128,7 +127,7 @@ qtwebengine_check-reqs() {
 		ewarn "If run into issues, please try disabling before reporting a bug."
 	fi
 
-	local CHECKREQS_DISK_BUILD=8G
+	local CHECKREQS_DISK_BUILD=9G
 	local CHECKREQS_DISK_USR=360M
 
 	if ! has distcc ${FEATURES}; then #830661
@@ -192,7 +191,8 @@ src_configure() {
 		$(qt_feature vulkan webengine_vulkan)
 		-DQT_FEATURE_webengine_embedded_build=OFF
 		-DQT_FEATURE_webengine_extensions=ON
-		-DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+		# TODO: it may be possible to make x11 optional since 6.8+
+		-DQT_FEATURE_webengine_ozone_x11=ON
 		-DQT_FEATURE_webengine_pepper_plugins=ON
 		-DQT_FEATURE_webengine_printing_and_pdf=ON
 		-DQT_FEATURE_webengine_spellchecker=ON
@@ -203,8 +203,8 @@ src_configure() {
 		# cooperate with new major ffmpeg versions (bug #831487)
 		-DQT_FEATURE_webengine_system_ffmpeg=OFF
 
-		# use bundled re2 to avoid complications, may revisit
-		# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+		# use bundled re2 to avoid complications, Qt has also disabled
+		# this by default in 6.7.3+ (bug #913923)
 		-DQT_FEATURE_webengine_system_re2=OFF
 
 		# bundled is currently required when using vaapi (forced regardless)
@@ -217,6 +217,7 @@ src_configure() {
 			minizip opus poppler snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
 	)
 
@@ -243,16 +244,7 @@ src_configure() {
 		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
 	fi
 
-	# Workaround for build failure with clang-18 and -march=native without
-	# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
-	# TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
-	use amd64 && tc-is-clang && is-flagq -march=native &&
-		[[ $(clang-major-version) -ge 18 ]] &&
-		has_version '<sys-devel/llvm-18.1.5-r1' &&
-		tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
-		append-flags -mevex512
-
-	export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+	export NINJAFLAGS=$(get_NINJAOPTS)
 	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
 
 	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
@@ -277,6 +269,7 @@ src_test() {
 
 	local CMAKE_SKIP_TESTS=(
 		# fails with network sandbox
+		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings