gentoo auto-resync : 18:12:2023 - 01:48:11

20 files changed, 176 insertions, 28 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index f579ee5f9d07..7a71b09e7703 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 7f0a18175fdd..a342e55483a3 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -256,5 +256,5 @@ DIST 6.6.1-0-202311210527qtwidgets-documentation.tar.xz 17159916 BLAKE2B ad8de89
 DIST 6.6.1-0-202311210527qtxml-documentation.tar.xz 341180 BLAKE2B ee1c30702f787faebc1c60b1c9311e4629473824d422a32e8b7a58761bab6e5b23981585a3341b0af2a2db930c95f690713039a3f163aa634b6d1b5077392acc SHA512 e801613ff5c57cdb5ca452e9bede57e7b1a449a784aa086e30c462fbc7d6c12558549a09b9d53af7c2b261b0b6f48f740fbf03ef10c0dff3c198ae0554e84ce1
 EBUILD qt-docs-5.15.2_p202011130614.ebuild 3226 BLAKE2B bd1d335f1853140dade0793c95f5f5de973f2b31299b6ad196e578c2c6c13d4c21c05115f944ecba66e03b7f7331e534d7a8048fdaf45cf48d483ee58f8f6cf7 SHA512 fabfcb0894489d71ca7c1e2d914e53ee760a0d3a746298cc943a32b025c7fb19cf049c9a2b86b93afd52f8f8d296f2b41c17d9da1f1f0d66be3bd097144fe088
 EBUILD qt-docs-6.5.3_p202309260341.ebuild 5020 BLAKE2B 7a4bdcc65db31da7efc00ebe0257b8a8138b0c5506d789ae1b3173c66dd77cb55ead63dabf3f87cd7273f0c4f3f08349cb6632064d5b7f4b324ad2783e07e7c3 SHA512 e40562756fe54feda4306d925676824fb637bd6171551037837bc82f2c9f539eeb3279eb5f64d17fdf09512c7c22d5bc73d3b0ba04a37b867b3dd5657c600a55
-EBUILD qt-docs-6.6.1_p202311210527.ebuild 5095 BLAKE2B 32e9cba8e0945fa4c5dafbdcc92ab41da4c06bd2e029a87f331782b5f79321595b746994a3c2b20c5f5dc8989702ba39b40f5c5a19d6050ab75cc7821639c75f SHA512 f767b8829c6a035d6d3777f7fc58b7f4cb66b5db3e127300a9f62cf664ddb159ad8723af354f26788e665d184a999f1cf40af3c6ded8eaf3c9ef81c77de55d49
+EBUILD qt-docs-6.6.1_p202311210527.ebuild 5095 BLAKE2B e0b924ea8e7cbfa13a33c601d99fcd7ffc72bdeb87cc7a0805750ee7a68f72d117d3b42be5d1735c2901f47b0f74144ce289085181952407813c95b722d08f9a SHA512 60ebd396035500cf0c039cb27d39738087991db19bdfde16ba3f539ce87d38a91ffddb45123fe8745f1df80738f6165548de3dcffd7c694cedeca0f332637ab3
 MISC metadata.xml 5290 BLAKE2B 4bd7db247ead833a33ddca3f6d9c81773adfdcf776b02d49de7ca2e3b4a10ea8d9a0b07cd3f7068eecb954b93b0c77cf1d240df3ce33508231c2c3fb35afeb81 SHA512 7f6c6779880d1681e2dcac9273650f20690176bf47d7e3825d7d76b7f6db2cac92a2b1ecf3e2886fa724f5230e9bde703d3341a266ea05f19c2d2f3aee58c81e
diff --git a/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild b/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild
index 53abd1be33a6..ee5aced3a4f0 100644
--- a/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild
@@ -65,7 +65,7 @@ qt6_docs_generate_metadata() {
 		%doc^qtdoc
 		-graphs/qtgraphs
 		-grpc/qtgrpc="qtgrpc qtprotobuf"
-		-httpserver/qthttpserver
+		+httpserver/qthttpserver
 		+imageformats/qtimageformats: # empty examples
 #		-languageserver/qtlanguageserver # docs and examples are empty
 		+location/qtlocation
diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest
new file mode 100644
index 000000000000..b86e5a0adb87
--- /dev/null
+++ b/dev-qt/qthttpserver/Manifest
@@ -0,0 +1,6 @@
+DIST qthttpserver-everywhere-src-6.6.1.tar.xz 171104 BLAKE2B 76a26b59147656cd2463f420417a8f40b24b7749ed35c266fecd4e13c51f1351497df2a73dc71122f001254dd8841e0e99ec51c51da6616d556d5a7939b6c84d SHA512 f851c8f5ea9cd4067474dee30ca797a2acb70ecaab2d993afe6abba3622fe3139acc6245b78f7d12b7e5dca5fc90aabd5144a3429c58a5f13cf23c6fbb023c24
+EBUILD qthttpserver-6.6.1.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
+EBUILD qthttpserver-6.6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
+EBUILD qthttpserver-6.7.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
+EBUILD qthttpserver-6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da
+MISC metadata.xml 648 BLAKE2B b39d7fe6bb7c7279cc181962b9827c456d6d04428cbd2648e7e23d7376e0a9a7218f316f4ec0699dbc1856587e4a24bfa8489b3586a2b4d7f8346b0a9a7ee3c8 SHA512 78a446053addfddedf86bf0408d4c82ea76203ef0f0c8c8e1d8b23111718a2b88b9a8c0b2f919feb344851af312d1051bbd94755e176927b7679f75c8f0c6e20
diff --git a/dev-qt/qthttpserver/metadata.xml b/dev-qt/qthttpserver/metadata.xml
new file mode 100644
index 000000000000..4b6f4c329cd8
--- /dev/null
+++ b/dev-qt/qthttpserver/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="websockets">Enable websockets support using <pkg>dev-qt/qtwebsockets</pkg></flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qthttpserver</remote-id>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qthttpserver/qthttpserver-6.6.1.ebuild b/dev-qt/qthttpserver/qthttpserver-6.6.1.ebuild
new file mode 100644
index 000000000000..49febbf2b658
--- /dev/null
+++ b/dev-qt/qthttpserver/qthttpserver-6.6.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="HTTP server functionality for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="+ssl websockets"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
+	websockets? ( ~dev-qt/qtwebsockets-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[concurrent] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package websockets Qt6WebSockets)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qthttpserver/qthttpserver-6.6.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.6.9999.ebuild
new file mode 100644
index 000000000000..49febbf2b658
--- /dev/null
+++ b/dev-qt/qthttpserver/qthttpserver-6.6.9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="HTTP server functionality for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="+ssl websockets"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
+	websockets? ( ~dev-qt/qtwebsockets-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[concurrent] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package websockets Qt6WebSockets)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild
new file mode 100644
index 000000000000..49febbf2b658
--- /dev/null
+++ b/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="HTTP server functionality for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="+ssl websockets"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
+	websockets? ( ~dev-qt/qtwebsockets-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[concurrent] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package websockets Qt6WebSockets)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild
new file mode 100644
index 000000000000..49febbf2b658
--- /dev/null
+++ b/dev-qt/qthttpserver/qthttpserver-6.9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="HTTP server functionality for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="+ssl websockets"
+
+RDEPEND="
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
+	websockets? ( ~dev-qt/qtwebsockets-${PV}:6 )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( ~dev-qt/qtbase-${PV}:6[concurrent] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package websockets Qt6WebSockets)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 610232419efb..5df0643372db 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -4,8 +4,8 @@ DIST qtmultimedia-everywhere-src-6.5.3.tar.xz 6560208 BLAKE2B eb838783c042a6416c
 DIST qtmultimedia-everywhere-src-6.6.1.tar.xz 6723296 BLAKE2B 5257da8457f6fa16b7cb9ef9029b84edd6963dd084434918f1161398784d36c188c186b398d9877f337ac215c8dad665d902fbd56736f9032f52685f49ef3407 SHA512 11fb3e421a80fee82d30a817f20277505868de0c1a870c55dd488114a0302f6a1bf41694ed64d904e4d29b1a3ad1ba01ce8399ae11f03ae2f6994359698e9c94
 EBUILD qtmultimedia-5.15.11.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
 EBUILD qtmultimedia-6.5.3.ebuild 2006 BLAKE2B 1190b7a1202c3d540583cda51cefa94e2eb8636a6665ebc77c9447aff3618a193160a8e5a5f095cb7461216ce00d8a44a8578217feb16cbdf5f7bee29fbbe043 SHA512 74cfed2d889adab6c342032fe73b8343c4445b7dce697f1c5ca80b352ff46bbbc5c3ff777c033a1d5b7801f8163386105e9f412f2001ca5796b39d209e02a355
-EBUILD qtmultimedia-6.6.1.ebuild 2103 BLAKE2B 8fc272f8fa2a69d607e90ab208a36ad00d1c90b1eef4fa518724d7c9a7d32e5f44a6c78ee2fae11214c9dc3f795277c6797eea1c186e30db260b1c8cbe776eae SHA512 e15c48d01fe2d50452eca99faa4b9332d6f632b89974fbe8a8029a09b8975445d8c4abb9e831753252aca1884c7c99a2eb6f51567170edc3351d3e934fdde27b
-EBUILD qtmultimedia-6.6.9999.ebuild 2068 BLAKE2B 5bc27ec0ce2ee8d2819e07e66ee1c8937ad623ab974be709c464fcb84f80825469522aa79521120c23c7f43eb14b6f084410dd1a4ff2a5e9b48533feae85e65b SHA512 dade9a4422d7beac0246ec4ffc4ff7a46bcf3ddbdd29118c4e2856a5161e5fecf53e0848edca89ce3a30873e14b9c7e8de9994aaa022730f5b913a5884c4ec5e
-EBUILD qtmultimedia-6.7.9999.ebuild 2068 BLAKE2B 5bc27ec0ce2ee8d2819e07e66ee1c8937ad623ab974be709c464fcb84f80825469522aa79521120c23c7f43eb14b6f084410dd1a4ff2a5e9b48533feae85e65b SHA512 dade9a4422d7beac0246ec4ffc4ff7a46bcf3ddbdd29118c4e2856a5161e5fecf53e0848edca89ce3a30873e14b9c7e8de9994aaa022730f5b913a5884c4ec5e
-EBUILD qtmultimedia-6.9999.ebuild 2068 BLAKE2B 5bc27ec0ce2ee8d2819e07e66ee1c8937ad623ab974be709c464fcb84f80825469522aa79521120c23c7f43eb14b6f084410dd1a4ff2a5e9b48533feae85e65b SHA512 dade9a4422d7beac0246ec4ffc4ff7a46bcf3ddbdd29118c4e2856a5161e5fecf53e0848edca89ce3a30873e14b9c7e8de9994aaa022730f5b913a5884c4ec5e
+EBUILD qtmultimedia-6.6.1-r1.ebuild 2076 BLAKE2B da7eec994c03a349e5fa6a4c95147f4f126185b977febed2af293546f379380af0e035c926976f779189ffa3be69544693738751111ba85f4a348c4f0a873a6d SHA512 2f817f60da031dd7eef362ff3747b6301b650697ff50c44017b3400a53a030275abc110163663b19604a20a4db6210f382c991116765c78d9209be04d9c1b929
+EBUILD qtmultimedia-6.6.9999.ebuild 2041 BLAKE2B 67d71b2e10876681143ba356a4074ae94263bd0096624840da27a63ecb43cc76223b6e1764ee098daa31f536e76f63499d4b3d648054e2dfcd5a379caeffc751 SHA512 9098bdcdca2549ebda5f433e76778a509424c98f6f770d65cb89f72e3048f4a266fc8fe86b6dfe4106bbe5da45cbf8a0de9f69083373456a7fc631c2f2e79485
+EBUILD qtmultimedia-6.7.9999.ebuild 2041 BLAKE2B 67d71b2e10876681143ba356a4074ae94263bd0096624840da27a63ecb43cc76223b6e1764ee098daa31f536e76f63499d4b3d648054e2dfcd5a379caeffc751 SHA512 9098bdcdca2549ebda5f433e76778a509424c98f6f770d65cb89f72e3048f4a266fc8fe86b6dfe4106bbe5da45cbf8a0de9f69083373456a7fc631c2f2e79485
+EBUILD qtmultimedia-6.9999.ebuild 2041 BLAKE2B 67d71b2e10876681143ba356a4074ae94263bd0096624840da27a63ecb43cc76223b6e1764ee098daa31f536e76f63499d4b3d648054e2dfcd5a379caeffc751 SHA512 9098bdcdca2549ebda5f433e76778a509424c98f6f770d65cb89f72e3048f4a266fc8fe86b6dfe4106bbe5da45cbf8a0de9f69083373456a7fc631c2f2e79485
 MISC metadata.xml 773 BLAKE2B e4b291f7b0f103011af120ad0cb9766cc03341c44f751127997958d704803cbc278094050693f4cc7ba17fb3c2f311252c2304e5a93cf17363ebbbc4e6c2cce0 SHA512 d5c729736723cf7296234acc39d55cd28924449b4bca425c37b8fa7582dbab9c649b501ac88ffcd3c5a5cc696390d18cf9912a4fb6e2520768ff704533d7f909
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild
index e01f6c8afb32..288061707bdb 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.6.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.1-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
 # tst_qmediaplayerbackend hard requires qml, review in case becomes optional
 REQUIRED_USE="
 	|| ( ffmpeg gstreamer )
-	vaapi? ( ffmpeg )
+	vaapi? ( ffmpeg opengl )
 	test? ( qml )
 "
 
@@ -30,15 +30,14 @@ RDEPEND="
 			x11-libs/libXext
 			x11-libs/libXrandr
 		)
-		vaapi? ( media-libs/libglvnd )
 	)
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gst-plugins-base:1.0[X=,opengl?]
 		media-libs/gstreamer:1.0
-		opengl? ( media-libs/libglvnd )
 	)
+	opengl? ( media-libs/libglvnd )
 	pulseaudio? ( media-libs/libpulse )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}:6
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
index c3fee31965cc..3c69475face8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
 # tst_qmediaplayerbackend hard requires qml, review in case becomes optional
 REQUIRED_USE="
 	|| ( ffmpeg gstreamer )
-	vaapi? ( ffmpeg )
+	vaapi? ( ffmpeg opengl )
 	test? ( qml )
 "
 
@@ -30,15 +30,14 @@ RDEPEND="
 			x11-libs/libXext
 			x11-libs/libXrandr
 		)
-		vaapi? ( media-libs/libglvnd )
 	)
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gst-plugins-base:1.0[X=,opengl?]
 		media-libs/gstreamer:1.0
-		opengl? ( media-libs/libglvnd )
 	)
+	opengl? ( media-libs/libglvnd )
 	pulseaudio? ( media-libs/libpulse )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}:6
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
index c3fee31965cc..3c69475face8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
 # tst_qmediaplayerbackend hard requires qml, review in case becomes optional
 REQUIRED_USE="
 	|| ( ffmpeg gstreamer )
-	vaapi? ( ffmpeg )
+	vaapi? ( ffmpeg opengl )
 	test? ( qml )
 "
 
@@ -30,15 +30,14 @@ RDEPEND="
 			x11-libs/libXext
 			x11-libs/libXrandr
 		)
-		vaapi? ( media-libs/libglvnd )
 	)
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gst-plugins-base:1.0[X=,opengl?]
 		media-libs/gstreamer:1.0
-		opengl? ( media-libs/libglvnd )
 	)
+	opengl? ( media-libs/libglvnd )
 	pulseaudio? ( media-libs/libpulse )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}:6
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index c3fee31965cc..3c69475face8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
 # tst_qmediaplayerbackend hard requires qml, review in case becomes optional
 REQUIRED_USE="
 	|| ( ffmpeg gstreamer )
-	vaapi? ( ffmpeg )
+	vaapi? ( ffmpeg opengl )
 	test? ( qml )
 "
 
@@ -30,15 +30,14 @@ RDEPEND="
 			x11-libs/libXext
 			x11-libs/libXrandr
 		)
-		vaapi? ( media-libs/libglvnd )
 	)
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gst-plugins-base:1.0[X=,opengl?]
 		media-libs/gstreamer:1.0
-		opengl? ( media-libs/libglvnd )
 	)
+	opengl? ( media-libs/libglvnd )
 	pulseaudio? ( media-libs/libpulse )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}:6
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 02ed29ce5f5e..d73a15302643 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -5,7 +5,7 @@ DIST qtwebsockets-everywhere-src-6.6.1.tar.xz 463896 BLAKE2B 4317b408765ff84992c
 EBUILD qtwebsockets-5.15.11.ebuild 578 BLAKE2B c89a75bff2dc425ed95717e37c667136a5082535d19fd58b341e7da4b210224bf9142da7abbf24130abc4c4e36ee4e5f59eb32505c0be39cf22c8bbdaedd8261 SHA512 b5baa375f6484fd77203b7402fa3e1555a214e6cca44405b44eadf0e201e546026af97675dd01daf8513ddc6a575a4f30a4ed1ba23985cd200058e631d593369
 EBUILD qtwebsockets-6.5.3.ebuild 509 BLAKE2B 44720f4bc6aad3a96b4bcb315df610b428d27f88d8f32ab7856c8de28006208faccf626b431b55747b5f5b1f1b6877b7b71160b62ea4b4a29312f9379e6785ef SHA512 d0cdabc89557f5027ef63061c982523946aacd21f6537e4610fffae70d3749f19fcc3e5370d546ec15f547ae3f96ed84a0004852fd568ecb1470d09a5fe7ffec
 EBUILD qtwebsockets-6.6.1.ebuild 509 BLAKE2B 44720f4bc6aad3a96b4bcb315df610b428d27f88d8f32ab7856c8de28006208faccf626b431b55747b5f5b1f1b6877b7b71160b62ea4b4a29312f9379e6785ef SHA512 d0cdabc89557f5027ef63061c982523946aacd21f6537e4610fffae70d3749f19fcc3e5370d546ec15f547ae3f96ed84a0004852fd568ecb1470d09a5fe7ffec
-EBUILD qtwebsockets-6.6.9999.ebuild 510 BLAKE2B 261216a8b95c730a81fa6714c13c556919232bc0365b128e9e77966452cff63f6585afdfdb4e330235355040b3762346f946b44b7d673cc8e58691082ee8d284 SHA512 4963afed478b0bb00fd7488529fcb35c2ce6e3f5891c3089e8eb9708b76206c1b959ed5b6367e7489aaa229e24752b5d1b12a4b6fac3ccdbd9a579a0f33459a0
-EBUILD qtwebsockets-6.7.9999.ebuild 510 BLAKE2B 261216a8b95c730a81fa6714c13c556919232bc0365b128e9e77966452cff63f6585afdfdb4e330235355040b3762346f946b44b7d673cc8e58691082ee8d284 SHA512 4963afed478b0bb00fd7488529fcb35c2ce6e3f5891c3089e8eb9708b76206c1b959ed5b6367e7489aaa229e24752b5d1b12a4b6fac3ccdbd9a579a0f33459a0
-EBUILD qtwebsockets-6.9999.ebuild 510 BLAKE2B 261216a8b95c730a81fa6714c13c556919232bc0365b128e9e77966452cff63f6585afdfdb4e330235355040b3762346f946b44b7d673cc8e58691082ee8d284 SHA512 4963afed478b0bb00fd7488529fcb35c2ce6e3f5891c3089e8eb9708b76206c1b959ed5b6367e7489aaa229e24752b5d1b12a4b6fac3ccdbd9a579a0f33459a0
+EBUILD qtwebsockets-6.6.9999.ebuild 516 BLAKE2B 8066be198f23bcf990548327067e9f2236c26527909fed89ad258c1d212aedf453254637ff3f15be2e5d27db51ec8b5a6cd2147223ca7615c2ab3c6b889f0372 SHA512 7b97c98d0026ed46d5572b23eb7ec5745fa588f824a19e70ac83770096de9b05136082c61253354a714d490bbec531572bc43d7db55f43472f4d4f86fd241dd9
+EBUILD qtwebsockets-6.7.9999.ebuild 516 BLAKE2B 8066be198f23bcf990548327067e9f2236c26527909fed89ad258c1d212aedf453254637ff3f15be2e5d27db51ec8b5a6cd2147223ca7615c2ab3c6b889f0372 SHA512 7b97c98d0026ed46d5572b23eb7ec5745fa588f824a19e70ac83770096de9b05136082c61253354a714d490bbec531572bc43d7db55f43472f4d4f86fd241dd9
+EBUILD qtwebsockets-6.9999.ebuild 516 BLAKE2B 8066be198f23bcf990548327067e9f2236c26527909fed89ad258c1d212aedf453254637ff3f15be2e5d27db51ec8b5a6cd2147223ca7615c2ab3c6b889f0372 SHA512 7b97c98d0026ed46d5572b23eb7ec5745fa588f824a19e70ac83770096de9b05136082c61253354a714d490bbec531572bc43d7db55f43472f4d4f86fd241dd9
 MISC metadata.xml 597 BLAKE2B 9cd42a9c56fb752ea155093f8f9222b8abecc3219bc770c4746ac45bb5b741b829688d8363b2c3580125ac43a31420522ba83949534a0c16aef7386bb46648b3 SHA512 55df60c57864187551629b4f6d83803d29154d4c685b50151e89ce9aae733a6cb3a0930c482cdad40b1880904f9c2c0ec21483ac7b801932086ba0186dfeb1de
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild
index bbcaeda665e8..27ea084d2377 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.6.9999.ebuild
@@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="qml"
+IUSE="qml +ssl"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,ssl]
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild
index bbcaeda665e8..27ea084d2377 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild
@@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="qml"
+IUSE="qml +ssl"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,ssl]
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild
index bbcaeda665e8..27ea084d2377 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild
@@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="qml"
+IUSE="qml +ssl"
 
 RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,ssl]
+	~dev-qt/qtbase-${PV}:6[network,ssl=]
 	qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 26c151bec824..fa34e416ac46 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -5,4 +5,4 @@ EBUILD qtwebview-6.6.1.ebuild 413 BLAKE2B 1de85befd3cb6fc7aa53cb9dc4cd46c4baa053
 EBUILD qtwebview-6.6.9999.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3
 EBUILD qtwebview-6.7.9999.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3
 EBUILD qtwebview-6.9999.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3
-MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
+MISC metadata.xml 534 BLAKE2B e41cc4c8e50d8d207559d68b8a9dc1d7a8c3afd218a28279163c917b24ac6b814361838a54c2b2256b13c0a1d1fbce4809c4f0c526d2fe576763cbed4ba33b6f SHA512 9ba885a1ccff4733d0ba510e4042d5f03a24ee9ac3f8b4cb89ad4b37fe3596fc5ec7f4786798397c58cf34ca82c40ce45d772ffde8be5cc9423428cb4aa19f8e
diff --git a/dev-qt/qtwebview/metadata.xml b/dev-qt/qtwebview/metadata.xml
index ae8aa9597f20..5ad9551295b3 100644
--- a/dev-qt/qtwebview/metadata.xml
+++ b/dev-qt/qtwebview/metadata.xml
@@ -8,6 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtwebview</remote-id>
 	</upstream>
 	<slots>
 		<subslots>