From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA7BB13835C for ; Mon, 26 Oct 2020 13:56:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D32F9E08BD; Mon, 26 Oct 2020 13:56:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A88EDE08A8 for ; Mon, 26 Oct 2020 13:56:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 736F0340F11 for ; Mon, 26 Oct 2020 13:56:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94A6F3B8 for ; Mon, 26 Oct 2020 13:56:38 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1603640287.60cd50cfb004e0685419488316a44b22d908bd34.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-desktop/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-desktop/metadata.xml kde-plasma/plasma-desktop/plasma-desktop-5.20.49.9999.ebuild kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild X-VCS-Directories: kde-plasma/plasma-desktop/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 60cd50cfb004e0685419488316a44b22d908bd34 X-VCS-Branch: master Date: Mon, 26 Oct 2020 13:56:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ff95cd35-2a06-4c57-9b25-5ee479cee974 X-Archives-Hash: 60d2d48d99115743d76b19c553ab2339 commit: 60cd50cfb004e0685419488316a44b22d908bd34 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 25 15:38:07 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 @@ Build emojipicker applet using app-i18n/ibus and media-fonts/noto-emoji Use ibus input method via app-i18n/ibus Build the OpenDesktop integration plugin + Build the Users KCM using sys-apps/accountsservice and sys-auth/polkit Enable applets that use app-i18n/scim 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