kde-plasma/kwin: kwin-x11 split; update dependencies, add IUSE xwayland

- Consolidate media-libs/mesa USEdeps egl(+),gbm(+) => opengl
- dev-qt/qtbase[X]: using private/qtx11extras_p.h in src/helpers/killer

See also:
https://mail.kde.org/pipermail/distributions/2025-March/001567.html

Upstream commits:
0b6decb103b01187d7665cc9942687df1f1ff22f
0595132a504ed42b96c3d7b70aa415030a525287 (confirming our RDEPEND)
ae03de6bc314340ce40ae64daf4c1567df56b638
58ae1edd1994d5022db1cdfb0108fc11e8ce52bd

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 17 insertions, 13 deletions

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 70dc0775822..9e1b6e25dab 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -14,17 +14,18 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
-IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
+IUSE="accessibility gles2-only lock screencast +shortcuts systemd xwayland"
 
 RESTRICT="test"
 
 # qtbase slot op: GuiPrivate use in tabbox
+# qtbase[X]: private/qtx11extras_p.h in src/helpers/killer
 COMMON_DEPEND="
 	dev-libs/libei
 	>=dev-libs/libinput-1.27:=
 	>=dev-libs/wayland-1.24.0
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
+	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets,X]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsensors-${QTMIN}:6
 	>=dev-qt/qtshadertools-${QTMIN}:6
@@ -61,22 +62,24 @@ COMMON_DEPEND="
 	>=media-libs/libdisplay-info-0.2.0:=
 	media-libs/libepoxy
 	media-libs/libglvnd
-	>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
+	>=media-libs/mesa-24.1.0_rc1[opengl,wayland]
 	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
 	>=x11-libs/libdrm-2.4.116
 	>=x11-libs/libxcb-1.10:=
 	>=x11-libs/libxcvt-0.1.1
 	>=x11-libs/libxkbcommon-1.5.0
 	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
 	accessibility? ( media-libs/libqaccessibilityclient:6 )
-	gles2-only? ( >=media-libs/mesa-24.1.0_rc1 )
 	lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 )
 	screencast? ( >=media-video/pipewire-1.2.0:= )
 	shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 )
+	xwayland? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXres
+		x11-libs/xcb-util-keysyms
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kdeplasma-addons:5
@@ -93,17 +96,16 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-plasma/aurorae-${KDE_CATV}:6
 	>=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)]
 	sys-apps/hwdata
-	>=x11-base/xwayland-23.1.0[libei]
+	xwayland? ( >=x11-base/xwayland-23.1.0[libei] )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.16.0
-	>=dev-libs/wayland-protocols-1.38
+	>=dev-libs/wayland-protocols-1.41
 	>=dev-qt/qttools-${QTMIN}:6[widgets]
 	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
 	>=dev-qt/qtwayland-${QTMIN}:6
-	x11-base/xorg-proto
-	x11-libs/xcb-util-image
 	test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
+	xwayland? ( x11-base/xorg-proto )
 "
 BDEPEND="
 	>=dev-qt/qtwayland-${QTMIN}:6
@@ -131,12 +133,12 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		# TODO: KWIN_BUILD_X11=$(usex xwayland) KWIN_BUILD_X11_BACKEND=$(usex X)
 		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
 		$(cmake_use_find_package accessibility QAccessibilityClient6)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
 		-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
 		-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+		-DKWIN_BUILD_X11=$(usex xwayland)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index bb4709286c7..de721d5de94 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -6,11 +6,13 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kwin</bugs-to>
+		<remote-id type="kde-invent">plasma/kwin</remote-id>
 	</upstream>
 	<use>
 		<flag name="lock">Enable screen locking via <pkg>kde-plasma/kscreenlocker</pkg></flag>
 		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="shortcuts">Enable global shortcuts support via <pkg>kde-plasma/kglobalacceld</pkg></flag>
+		<flag name="xwayland">Enable ability to support native X11 applications via <pkg>x11-base/xwayland</pkg></flag>
 	</use>
 </pkgmetadata>