[gentoo-commits] proj/kde:master commit in: kde-plasma/kwayland-integration/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     e14630ee2601fd551a885eff3035ffea52715a6b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 14:48:36 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 16:38:32 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e14630ee

kde-plasma/kwayland-integration: Drop idletime plugin from 5.26

After KFMIN was raised to 5.99 we can disable it here too.
Only keep windowsystem plugin remains.

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

 .../kwayland-integration/kwayland-integration-5.26.0.ebuild | 13 +++++++------
 .../kwayland-integration-5.26.49.9999.ebuild                | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.26.0.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.26.0.ebuild
index d5a02d593b..9dd4d8701c 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.26.0.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.26.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=8
 
-ECM_TEST="true"
 KFMIN=5.99.0
-PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.5
 inherit ecm plasma.kde.org
 
@@ -17,13 +15,10 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RESTRICT="test" # bug 668872
-
 # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
 # slot ops:
 # dev-qt/qtgui: QtXkbCommonSupportPrivate
 # dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
-# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h
 # kde-frameworks/kwindowsystem: Various private headers
 DEPEND="
 	>=dev-libs/wayland-1.15
@@ -34,7 +29,6 @@ DEPEND="
 	)
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtwayland-${QTMIN}:5=
-	>=kde-frameworks/kidletime-${KFMIN}:5=
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5=
 	x11-libs/libxkbcommon
@@ -44,3 +38,10 @@ BDEPEND="
 	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	virtual/pkgconfig
 "
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module IdleTime
+	cmake_comment_add_subdirectory autotests # only contains idletime test
+	cmake_run_in src cmake_comment_add_subdirectory idletime
+}

diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.26.49.9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.26.49.9999.ebuild
index 2d98367807..787ace3f10 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.26.49.9999.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.26.49.9999.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=8
 
-ECM_TEST="true"
 KFMIN=5.99.0
-PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.5
 inherit ecm plasma.kde.org
 
@@ -17,13 +15,10 @@ SLOT="5"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT="test" # bug 668872
-
 # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
 # slot ops:
 # dev-qt/qtgui: QtXkbCommonSupportPrivate
 # dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
-# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h
 # kde-frameworks/kwindowsystem: Various private headers
 DEPEND="
 	>=dev-libs/wayland-1.15
@@ -34,7 +29,6 @@ DEPEND="
 	)
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtwayland-${QTMIN}:5=
-	>=kde-frameworks/kidletime-${KFMIN}:5=
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5=
 	x11-libs/libxkbcommon
@@ -44,3 +38,10 @@ BDEPEND="
 	>=dev-qt/qtwaylandscanner-${QTMIN}:5
 	virtual/pkgconfig
 "
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_kf_module IdleTime
+	cmake_comment_add_subdirectory autotests # only contains idletime test
+	cmake_run_in src cmake_comment_add_subdirectory idletime
+}