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-desktop/
Date: Mon, 17 Jan 2022 17:24:55
Message-Id: 1642440178.b938cc686e6576643fc02bd9337969347bdc7aa3.asturm@gentoo
1 commit: b938cc686e6576643fc02bd9337969347bdc7aa3
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 17 17:22:58 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 17 17:22:58 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b938cc68
7
8 kde-plasma/plasma-desktop: Users KCM moved to plasma-workspace
9
10 Update DEPENDs.
11
12 Upstream commits:
13 e110a02bf8e92e567415e9252be86658d5935a1e
14 cd115c0ea82af7b53ddcfd0a14d0f316f1d3f703
15
16 Package-Manager: Portage-3.0.30, Repoman-3.0.3
17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
18
19 kde-plasma/plasma-desktop/metadata.xml | 1 -
20 kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 9 +--------
21 2 files changed, 1 insertion(+), 9 deletions(-)
22
23 diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
24 index 98dd365342..3ea9270f30 100644
25 --- a/kde-plasma/plasma-desktop/metadata.xml
26 +++ b/kde-plasma/plasma-desktop/metadata.xml
27 @@ -12,7 +12,6 @@
28 <flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
29 <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
30 <flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
31 - <flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
32 <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
33 </use>
34 </pkgmetadata>
35
36 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
37 index 59ccb9650d..f8500f5e3f 100644
38 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
39 +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
40 @@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
41 LICENSE="GPL-2" # TODO: CHECK
42 SLOT="5"
43 KEYWORDS=""
44 -IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
45 +IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
46
47 COMMON_DEPEND="
48 >=dev-qt/qtconcurrent-${QTMIN}:5
49 @@ -96,7 +96,6 @@ COMMON_DEPEND="
50 kde-apps/kaccounts-integration:5
51 net-libs/accounts-qt
52 )
53 - policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
54 scim? ( app-i18n/scim )
55 semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
56 telemetry? ( dev-libs/kuserfeedback:5 )
57 @@ -117,7 +116,6 @@ RDEPEND="${COMMON_DEPEND}
58 x11-apps/setxkbmap
59 x11-misc/xdg-user-dirs
60 kaccounts? ( net-libs/signon-oauth2 )
61 - policykit? ( sys-apps/accountsservice )
62 "
63 BDEPEND="virtual/pkgconfig"
64
65 @@ -128,11 +126,6 @@ PATCHES=(
66 src_prepare() {
67 ecm_src_prepare
68
69 - if ! use policykit; then
70 - ecm_punt_kf_module Wallet
71 - cmake_run_in kcms cmake_comment_add_subdirectory users
72 - fi
73 -
74 if ! use ibus; then
75 sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
76 -i applets/kimpanel/backend/ibus/CMakeLists.txt || die