dev-qt/*: sync qt6 live ebuilds with ::gentoo release ebuilds

Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>

45 files changed, 116 insertions, 83 deletions

diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index 2ca48171..b81d5a37 100644
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="gamepad">Add support for gamepad hardware via <pkg>dev-qt/qtgamepad</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
-		<flag name="vulkan">Enable support for Vulkan</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild
index 2bf0684e..54dca83e 100644
--- a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qt5compat/qt5compat-6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.9999.ebuild
index 7b839e61..54dca83e 100644
--- a/dev-qt/qt5compat/qt5compat-6.9999.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 DEPEND="
-	=dev-qt/qtbase-${PV}*[gui,network,xml]
+	=dev-qt/qtbase-${PV}*[gui,network]
 	=dev-qt/qtdeclarative-${PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
index 573077ba..d828e063 100644
--- a/dev-qt/qtbase/metadata.xml
+++ b/dev-qt/qtbase/metadata.xml
@@ -22,10 +22,8 @@
 		<flag name="systemd">Enable native journald logging support</flag>
 		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
 		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
-		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="widgets">Build Qt6Widgets module</flag>
 		<flag name="X">Build the XCB platform plugin and enable X11 integration</flag>
-		<flag name="xml">Build Qt6Xml module</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
index 0b1d7d0a..c29d890f 100644
--- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ REQUIRED_USE="
 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"
+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+="
@@ -93,6 +93,7 @@ DEPEND="
 		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
@@ -101,6 +102,7 @@ DEPEND="
 	zstd? ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
+PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}* )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 0b1d7d0a..c29d890f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ REQUIRED_USE="
 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"
+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+="
@@ -93,6 +93,7 @@ DEPEND="
 		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
@@ -101,6 +102,7 @@ DEPEND="
 	zstd? ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
+PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}* )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild
index d9ff085f..92c6cf41 100644
--- a/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtcharts/qtcharts-6.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.9999.ebuild
index d9ff085f..92c6cf41 100644
--- a/dev-qt/qtcharts/qtcharts-6.9999.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index aa22d78a..b1f5174a 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
 		<flag name="opengl">Enable OpenGL support</flag>
-		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="sql">Enable QtSQL support</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
 	</use>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild
index e8ac7edd..8c9a771c 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
index e8ac7edd..8c9a771c 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild
index 8cb1cc3b..ffa831e5 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild
index 8cb1cc3b..ffa831e5 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild
index 5bfb8228..c707518d 100644
--- a/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild
@@ -12,7 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 DEPEND="
-	=dev-qt/qtbase-${PV}*
+	=dev-qt/qtbase-${PV}*[network]
 	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtpositioning-${PV}*
+	=dev-qt/qtshadertools-${PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtlocation/qtlocation-6.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.9999.ebuild
index 5bfb8228..c707518d 100644
--- a/dev-qt/qtlocation/qtlocation-6.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.9999.ebuild
@@ -12,7 +12,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 fi
 
 DEPEND="
-	=dev-qt/qtbase-${PV}*
+	=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/qtmultimedia-6.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
index e4515ea9..1091cf2d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
@@ -11,7 +11,12 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="alsa ffmpeg pulseaudio v4l"
+IUSE="alsa +ffmpeg gstreamer pulseaudio v4l vaapi"
+
+REQUIRED_USE="
+	|| ( ffmpeg gstreamer )
+	vaapi? ( ffmpeg )
+"
 
 RDEPEND="
 	=dev-qt/qtbase-${PV}*[gui,network,widgets]
@@ -19,11 +24,6 @@ RDEPEND="
 	=dev-qt/qtquick3d-${PV}*
 	=dev-qt/qtshadertools-${PV}*
 	=dev-qt/qtsvg-${PV}*
-	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
 	alsa? ( media-libs/alsa-lib )
 	ffmpeg? (
 		media-libs/libva:=
@@ -32,20 +32,33 @@ RDEPEND="
 		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}
-	x11-base/xorg-proto
+	gstreamer? ( x11-base/xorg-proto )
 	v4l? ( sys-kernel/linux-headers )
 "
 
 src_configure() {
 	local mycmakeargs=(
-		-DQT_FEATURE_gstreamer=on
 		$(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/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index e4515ea9..1091cf2d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -11,7 +11,12 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64"
 fi
 
-IUSE="alsa ffmpeg pulseaudio v4l"
+IUSE="alsa +ffmpeg gstreamer pulseaudio v4l vaapi"
+
+REQUIRED_USE="
+	|| ( ffmpeg gstreamer )
+	vaapi? ( ffmpeg )
+"
 
 RDEPEND="
 	=dev-qt/qtbase-${PV}*[gui,network,widgets]
@@ -19,11 +24,6 @@ RDEPEND="
 	=dev-qt/qtquick3d-${PV}*
 	=dev-qt/qtshadertools-${PV}*
 	=dev-qt/qtsvg-${PV}*
-	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
 	alsa? ( media-libs/alsa-lib )
 	ffmpeg? (
 		media-libs/libva:=
@@ -32,20 +32,33 @@ RDEPEND="
 		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}
-	x11-base/xorg-proto
+	gstreamer? ( x11-base/xorg-proto )
 	v4l? ( sys-kernel/linux-headers )
 "
 
 src_configure() {
 	local mycmakeargs=(
-		-DQT_FEATURE_gstreamer=on
 		$(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/qtnetworkauth-6.5.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild
index 02ff76da..90c31313 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild
index 02ff76da..90c31313 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild
index 7be915ff..60873b45 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild
index 7be915ff..60873b45 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild
index 6eb36dee..92a82e63 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index 6eb36dee..92a82e63 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild
index 0673606b..3b0370aa 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild
index 0673606b..3b0370aa 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild
index 5286e793..2fedc64d 100644
--- a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild
@@ -14,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	=dev-qt/qtbase-${PV}*
+	=dev-qt/qtbase-${PV}*[gui,network,opengl,widgets]
 	=dev-qt/qtdeclarative-${PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscxml/qtscxml-6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.9999.ebuild
index 5286e793..2fedc64d 100644
--- a/dev-qt/qtscxml/qtscxml-6.9999.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.9999.ebuild
@@ -14,7 +14,7 @@ fi
 IUSE=""
 
 DEPEND="
-	=dev-qt/qtbase-${PV}*
+	=dev-qt/qtbase-${PV}*[gui,network,opengl,widgets]
 	=dev-qt/qtdeclarative-${PV}*
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild
index 218a7f2d..bf569254 100644
--- a/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtserialport/qtserialport-6.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.9999.ebuild
index 218a7f2d..bf569254 100644
--- a/dev-qt/qtserialport/qtserialport-6.9999.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild
index 755d9ae0..88a20ffb 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild
index 755d9ae0..88a20ffb 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild
index 037c2eb0..960a9813 100644
--- a/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtsvg/qtsvg-6.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.9999.ebuild
index 037c2eb0..960a9813 100644
--- a/dev-qt/qtsvg/qtsvg-6.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml
index b86ca58b..7664b3e6 100644
--- a/dev-qt/qttools/metadata.xml
+++ b/dev-qt/qttools/metadata.xml
@@ -11,11 +11,11 @@
 		<flag name="distancefieldgenerator">Build Qt Distance Field Generator</flag>
 		<flag name="linguist">Build Qt Linguist</flag>
 		<flag name="pixeltool">Build Qt Pixeltool</flag>
+		<flag name="qattributionsscanner">Build Qt Source Code Attribution Scanner</flag>
 		<flag name="qdbus">Build the Qt D-Bus Interface and D-Bus Viewer</flag>
 		<flag name="qdoc">Build Qt Documentation Generator</flag>
-		<flag name="qtattributionsscanner">Build Qt Source Code Attribution Scanner</flag>
-		<flag name="qtdiag">Build Qt Diag</flag>
-		<flag name="qtplugininfo">Build Qt Plugin Info</flag>
+		<flag name="qdiag">Build Qt Diag</flag>
+		<flag name="qplugininfo">Build Qt Plugin Info</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qttools/qttools-6.5.9999.ebuild b/dev-qt/qttools/qttools-6.5.9999.ebuild
index 339ce7ed..e75eadff 100644
--- a/dev-qt/qttools/qttools-6.5.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ fi
 
 IUSE="
 	assistant designer distancefieldgenerator +linguist pixeltool
-	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
+	qattributionsscanner qdbus qdoc qdiag qplugininfo
 "
 
 DEPEND="
@@ -27,7 +27,7 @@ DEPEND="
 	pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
 	qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
 	qdoc? ( sys-devel/clang:= )
-	qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
+	qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
 "
 RDEPEND="${DEPEND}"
 
@@ -39,11 +39,11 @@ src_configure() {
 		$(qt_feature distancefieldgenerator)
 		$(qt_feature linguist)
 		$(qt_feature pixeltool)
+		$(qt_feature qattributionsscanner qtattributionsscanner)
 		$(qt_feature qdbus)
 		$(qt_feature qdoc clang)
-		$(qt_feature qtattributionsscanner)
-		$(qt_feature qtdiag)
-		$(qt_feature qtplugininfo)
+		$(qt_feature qdiag qtdiag)
+		$(qt_feature qplugininfo qtplugininfo)
 		-DQT_FEATURE_thread=ON
 	)
 
@@ -61,6 +61,6 @@ src_install() {
 	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 qtdiag && qt6_symlink_binary_to_path qtdiag 6
-	use qtplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
+	use qdiag && qt6_symlink_binary_to_path qtdiag 6
+	use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
 }
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 339ce7ed..e75eadff 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ fi
 
 IUSE="
 	assistant designer distancefieldgenerator +linguist pixeltool
-	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
+	qattributionsscanner qdbus qdoc qdiag qplugininfo
 "
 
 DEPEND="
@@ -27,7 +27,7 @@ DEPEND="
 	pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
 	qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
 	qdoc? ( sys-devel/clang:= )
-	qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
+	qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
 "
 RDEPEND="${DEPEND}"
 
@@ -39,11 +39,11 @@ src_configure() {
 		$(qt_feature distancefieldgenerator)
 		$(qt_feature linguist)
 		$(qt_feature pixeltool)
+		$(qt_feature qattributionsscanner qtattributionsscanner)
 		$(qt_feature qdbus)
 		$(qt_feature qdoc clang)
-		$(qt_feature qtattributionsscanner)
-		$(qt_feature qtdiag)
-		$(qt_feature qtplugininfo)
+		$(qt_feature qdiag qtdiag)
+		$(qt_feature qplugininfo qtplugininfo)
 		-DQT_FEATURE_thread=ON
 	)
 
@@ -61,6 +61,6 @@ src_install() {
 	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 qtdiag && qt6_symlink_binary_to_path qtdiag 6
-	use qtplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
+	use qdiag && qt6_symlink_binary_to_path qtdiag 6
+	use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6
 }
diff --git a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild
index 09413e55..14d6b705 100644
--- a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ fi
 BDEPEND="dev-util/wayland-scanner"
 DEPEND="
 	dev-libs/wayland
-	=dev-qt/qtbase-${PV}*[gui,opengl]
+	=dev-qt/qtbase-${PV}*[egl,gui,opengl]
 	=dev-qt/qtdeclarative-${PV}*
 	media-libs/libglvnd
 	x11-libs/libxkbcommon
diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild
index 09413e55..14d6b705 100644
--- a/dev-qt/qtwayland/qtwayland-6.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ fi
 BDEPEND="dev-util/wayland-scanner"
 DEPEND="
 	dev-libs/wayland
-	=dev-qt/qtbase-${PV}*[gui,opengl]
+	=dev-qt/qtbase-${PV}*[egl,gui,opengl]
 	=dev-qt/qtdeclarative-${PV}*
 	media-libs/libglvnd
 	x11-libs/libxkbcommon
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
index 62dd2732..e82c78f5 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
index 62dd2732..e82c78f5 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 415d7465..f447332f 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
 		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="jumbo-build">Combine source files to speed up build process.</flag>
-		<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
 		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
 	</use>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index 2ad4c1c5..06273144 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 CHROMIUM_VER="108.0.5359.181"
-CHROMIUM_PATCHES_VER="110.0.5481.104"
+CHROMIUM_PATCHES_VER="113.0.5672.126"
 
 inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
 
@@ -51,6 +51,7 @@ RDEPEND="
 	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
@@ -228,6 +229,7 @@ src_configure() {
 		-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)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 2ad4c1c5..bad90757 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
 CHROMIUM_VER="108.0.5359.181"
-CHROMIUM_PATCHES_VER="110.0.5481.104"
+CHROMIUM_PATCHES_VER="114.0.5735.133"
 
 inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
 
@@ -51,6 +51,7 @@ RDEPEND="
 	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
@@ -228,6 +229,7 @@ src_configure() {
 		-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)
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild
index 6b0e253a..abdcffa9 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild
index 6b0e253a..abdcffa9 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8