| 1 |
commit: 60cd50cfb004e0685419488316a44b22d908bd34 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 25 15:38:07 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 25 15:38:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=60cd50cf |
| 7 |
|
| 8 |
kde-plasma/plasma-desktop: Add IUSE=+policykit for conditional users KCM |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/751100 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
kde-plasma/plasma-desktop/metadata.xml | 1 + |
| 15 |
kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild | 6 ++++-- |
| 16 |
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 6 ++++-- |
| 17 |
3 files changed, 9 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml |
| 20 |
index 7704dc621a..e50b5d2d83 100644 |
| 21 |
--- a/kde-plasma/plasma-desktop/metadata.xml |
| 22 |
+++ b/kde-plasma/plasma-desktop/metadata.xml |
| 23 |
@@ -9,6 +9,7 @@ |
| 24 |
<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag> |
| 25 |
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> |
| 26 |
<flag name="kaccounts">Build the OpenDesktop integration plugin</flag> |
| 27 |
+ <flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag> |
| 28 |
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> |
| 29 |
</use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
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 |
| 33 |
index 84502ff0e3..407fff7182 100644 |
| 34 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild |
| 35 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild |
| 36 |
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" |
| 37 |
LICENSE="GPL-2" # TODO: CHECK |
| 38 |
SLOT="5" |
| 39 |
KEYWORDS="" |
| 40 |
-IUSE="emoji ibus +kaccounts scim +semantic-desktop" |
| 41 |
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop" |
| 42 |
|
| 43 |
BDEPEND="virtual/pkgconfig" |
| 44 |
COMMON_DEPEND=" |
| 45 |
@@ -111,10 +111,10 @@ RDEPEND="${COMMON_DEPEND} |
| 46 |
>=kde-plasma/breeze-${PVCUT}:5 |
| 47 |
>=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 48 |
>=kde-plasma/oxygen-${PVCUT}:5 |
| 49 |
- sys-apps/accountsservice |
| 50 |
sys-apps/util-linux |
| 51 |
x11-apps/setxkbmap |
| 52 |
kaccounts? ( net-libs/signon-oauth2 ) |
| 53 |
+ policykit? ( sys-apps/accountsservice ) |
| 54 |
" |
| 55 |
|
| 56 |
PATCHES=( |
| 57 |
@@ -124,6 +124,8 @@ PATCHES=( |
| 58 |
src_prepare() { |
| 59 |
ecm_src_prepare |
| 60 |
|
| 61 |
+ cmake_run_in kcms cmake_comment_add_subdirectory users |
| 62 |
+ |
| 63 |
if ! use ibus; then |
| 64 |
sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ |
| 65 |
-i applets/kimpanel/backend/ibus/CMakeLists.txt || die |
| 66 |
|
| 67 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 68 |
index 8cc3632ebf..ddea069075 100644 |
| 69 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 70 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild |
| 71 |
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" |
| 72 |
LICENSE="GPL-2" # TODO: CHECK |
| 73 |
SLOT="5" |
| 74 |
KEYWORDS="" |
| 75 |
-IUSE="emoji ibus +kaccounts scim +semantic-desktop" |
| 76 |
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop" |
| 77 |
|
| 78 |
BDEPEND="virtual/pkgconfig" |
| 79 |
COMMON_DEPEND=" |
| 80 |
@@ -111,10 +111,10 @@ RDEPEND="${COMMON_DEPEND} |
| 81 |
>=kde-plasma/breeze-${PVCUT}:5 |
| 82 |
>=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 83 |
>=kde-plasma/oxygen-${PVCUT}:5 |
| 84 |
- sys-apps/accountsservice |
| 85 |
sys-apps/util-linux |
| 86 |
x11-apps/setxkbmap |
| 87 |
kaccounts? ( net-libs/signon-oauth2 ) |
| 88 |
+ policykit? ( sys-apps/accountsservice ) |
| 89 |
" |
| 90 |
|
| 91 |
PATCHES=( |
| 92 |
@@ -124,6 +124,8 @@ PATCHES=( |
| 93 |
src_prepare() { |
| 94 |
ecm_src_prepare |
| 95 |
|
| 96 |
+ use policykit || cmake_run_in kcms cmake_comment_add_subdirectory users |
| 97 |
+ |
| 98 |
if ! use ibus; then |
| 99 |
sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ |
| 100 |
-i applets/kimpanel/backend/ibus/CMakeLists.txt || die |
Archives