Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/
Date: Mon, 17 Jan 2022 17:24:55
Message-Id: 1642440232.d931c492f05156971bf3c8de41ae3b643a95b7e8.asturm@gentoo
1 commit: d931c492f05156971bf3c8de41ae3b643a95b7e8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 17 17:23:52 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 17 17:23:52 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d931c492
7
8 kde-plasma/plasma-workspace: Users KCM moved from plasma-desktop
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-plasma/plasma-workspace/metadata.xml | 1 +
14 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 9 +++++++--
15 2 files changed, 8 insertions(+), 2 deletions(-)
16
17 diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
18 index a740eb6b82..79fb12a10a 100644
19 --- a/kde-plasma/plasma-workspace/metadata.xml
20 +++ b/kde-plasma/plasma-workspace/metadata.xml
21 @@ -11,6 +11,7 @@
22 <use>
23 <flag name="appstream">Enable AppStream software metadata support</flag>
24 <flag name="geolocation">Enables dataengine providing location information</flag>
25 + <flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
26 <flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
27 <flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
28 </use>
29
30 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
31 index b10443f538..7745f1b69a 100644
32 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
33 +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
34 @@ -16,8 +16,8 @@ DESCRIPTION="KDE Plasma workspace"
35 LICENSE="GPL-2" # TODO: CHECK
36 SLOT="5"
37 KEYWORDS=""
38 -IUSE="appstream +calendar +fontconfig geolocation gps screencast
39 -+semantic-desktop telemetry"
40 +IUSE="appstream +calendar +fontconfig geolocation gps +policykit
41 +screencast +semantic-desktop telemetry"
42
43 REQUIRED_USE="gps? ( geolocation )"
44 RESTRICT="test"
45 @@ -143,6 +143,7 @@ RDEPEND="${COMMON_DEPEND}
46 x11-apps/xsetroot
47 !<kde-plasma/breeze-5.22.90:5
48 !<kde-plasma/plasma-desktop-5.21.90:5
49 + policykit? ( sys-apps/accountsservice )
50 "
51 BDEPEND="virtual/pkgconfig"
52 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
53 @@ -165,6 +166,10 @@ src_prepare() {
54 if ! use screencast; then
55 sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
56 fi
57 +
58 + if ! use policykit; then
59 + cmake_run_in kcms cmake_comment_add_subdirectory users
60 + fi
61 }
62
63 src_configure() {