commit:     60cd50cfb004e0685419488316a44b22d908bd34
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 15:38:07 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 15:38:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=60cd50cf

kde-plasma/plasma-desktop: Add IUSE=+policykit for conditional users KCM

Closes: https://bugs.gentoo.org/751100
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/plasma-desktop/metadata.xml                       | 1 +
 kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild | 6 ++++--
 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild         | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-desktop/metadata.xml 
b/kde-plasma/plasma-desktop/metadata.xml
index 7704dc621a..e50b5d2d83 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -9,6 +9,7 @@
                <flag name="emoji">Build emojipicker applet using 
<pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
                <flag name="ibus">Use ibus input method via 
<pkg>app-i18n/ibus</pkg></flag>
                <flag name="kaccounts">Build the OpenDesktop integration 
plugin</flag>
+               <flag name="policykit">Build the Users KCM using 
<pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
                <flag name="scim">Enable applets that use 
<pkg>app-i18n/scim</pkg></flag>
        </use>
 </pkgmetadata>

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild
index 84502ff0e3..407fff7182 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz";
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="emoji ibus +kaccounts scim +semantic-desktop"
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
@@ -111,10 +111,10 @@ RDEPEND="${COMMON_DEPEND}
        >=kde-plasma/breeze-${PVCUT}:5
        >=kde-plasma/kde-cli-tools-${PVCUT}:5
        >=kde-plasma/oxygen-${PVCUT}:5
-       sys-apps/accountsservice
        sys-apps/util-linux
        x11-apps/setxkbmap
        kaccounts? ( net-libs/signon-oauth2 )
+       policykit? ( sys-apps/accountsservice )
 "
 
 PATCHES=(
@@ -124,6 +124,8 @@ PATCHES=(
 src_prepare() {
        ecm_src_prepare
 
+       cmake_run_in kcms cmake_comment_add_subdirectory users
+
        if ! use ibus; then
                sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND 
XCB_KEYSYMS_FOUND/false/" \
                        -i applets/kimpanel/backend/ibus/CMakeLists.txt || die

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild 
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 8cc3632ebf..ddea069075 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz";
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="emoji ibus +kaccounts scim +semantic-desktop"
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
@@ -111,10 +111,10 @@ RDEPEND="${COMMON_DEPEND}
        >=kde-plasma/breeze-${PVCUT}:5
        >=kde-plasma/kde-cli-tools-${PVCUT}:5
        >=kde-plasma/oxygen-${PVCUT}:5
-       sys-apps/accountsservice
        sys-apps/util-linux
        x11-apps/setxkbmap
        kaccounts? ( net-libs/signon-oauth2 )
+       policykit? ( sys-apps/accountsservice )
 "
 
 PATCHES=(
@@ -124,6 +124,8 @@ PATCHES=(
 src_prepare() {
        ecm_src_prepare
 
+       use policykit || cmake_run_in kcms cmake_comment_add_subdirectory users
+
        if ! use ibus; then
                sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND 
XCB_KEYSYMS_FOUND/false/" \
                        -i applets/kimpanel/backend/ibus/CMakeLists.txt || die

Reply via email to