commit:     d10f89f7da3a36bf51d812978e14b17d6afad4aa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 19:18:12 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 19:20:27 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d10f89f7

kde-plasma/kwin: Drop IUSE caps, make it unconditional

Necessary for kwin_wayland.

Closes: https://bugs.gentoo.org/931215
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/kwin/kwin-6.0.49.9999.ebuild | 5 ++---
 kde-plasma/kwin/kwin-9999.ebuild        | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/kwin/kwin-6.0.49.9999.ebuild 
b/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
index cceaee6454..79bfc965f0 100644
--- a/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for 
windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
-IUSE="accessibility caps gles2-only lock screencast +shortcuts"
+IUSE="accessibility gles2-only lock screencast +shortcuts"
 
 RESTRICT="test"
 
@@ -99,9 +99,9 @@ DEPEND="${COMMON_DEPEND}
        >=dev-qt/qttools-${QTMIN}:6[widgets]
        >=dev-qt/qtbase-${QTMIN}:6[concurrent]
        >=dev-qt/qtwayland-${QTMIN}:6
+       sys-libs/libcap
        x11-base/xorg-proto
        x11-libs/xcb-util-image
-       caps? ( sys-libs/libcap )
        test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) )
 "
 BDEPEND="
@@ -128,7 +128,6 @@ src_configure() {
        local mycmakeargs=(
                # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still 
hard-depends on it
                $(cmake_use_find_package accessibility QAccessibilityClient6)
-               $(cmake_use_find_package caps Libcap)
                -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
                -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
        )

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 0af5d54635..f74dceead3 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for 
windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
-IUSE="accessibility caps gles2-only lock screencast +shortcuts systemd"
+IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
 
 RESTRICT="test"
 
@@ -99,9 +99,9 @@ DEPEND="${COMMON_DEPEND}
        >=dev-qt/qttools-${QTMIN}:6[widgets]
        >=dev-qt/qtbase-${QTMIN}:6[concurrent]
        >=dev-qt/qtwayland-${QTMIN}:6
+       sys-libs/libcap
        x11-base/xorg-proto
        x11-libs/xcb-util-image
-       caps? ( sys-libs/libcap )
        test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) )
 "
 BDEPEND="
@@ -129,7 +129,6 @@ src_configure() {
        local mycmakeargs=(
                # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still 
hard-depends on it
                $(cmake_use_find_package accessibility QAccessibilityClient6)
-               $(cmake_use_find_package caps Libcap)
                -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
                -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
        )

Reply via email to