kde-apps/yakuake: Drop IUSE X

- Fixes missing kde-frameworks/kwindowsystem[X] usedep
- Unconditional use of KX11Extras

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

2 files changed, 11 insertions, 15 deletions

diff --git a/kde-apps/yakuake/yakuake-22.08.3.ebuild b/kde-apps/yakuake/yakuake-22.08.3-r1.ebuild
index 02e26eb03aaa..9a4b7e2e664e 100644
--- a/kde-apps/yakuake/yakuake-22.08.3.ebuild
+++ b/kde-apps/yakuake/yakuake-22.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,13 +14,15 @@ HOMEPAGE="https://apps.kde.org/yakuake/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
 KEYWORDS="amd64 arm64 ~loong ~ppc64 x86"
-IUSE="absolute-position X"
+IUSE="absolute-position"
 
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-apps/konsole-${PVCUT}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -38,13 +40,10 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	x11-libs/libX11
 	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
 "
 RDEPEND="${DEPEND}"
 
@@ -53,7 +52,6 @@ PATCHES=( "${FILESDIR}/${PN}-22.07.90-without_x11.patch" )
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package absolute-position KF5Wayland)
-		-DWITHOUT_X11=$(usex !X)
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/yakuake/yakuake-22.12.1.ebuild b/kde-apps/yakuake/yakuake-22.12.1-r1.ebuild
index 4c0bb227092e..c1840bfc957a 100644
--- a/kde-apps/yakuake/yakuake-22.12.1.ebuild
+++ b/kde-apps/yakuake/yakuake-22.12.1-r1.ebuild
@@ -14,13 +14,15 @@ HOMEPAGE="https://apps.kde.org/yakuake/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
-IUSE="absolute-position X"
+IUSE="absolute-position"
 
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-apps/konsole-${PVCUT}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -38,20 +40,16 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	x11-libs/libX11
 	absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package absolute-position KF5Wayland)
-		-DWITHOUT_X11=$(usex !X)
 	)
 
 	ecm_src_configure