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 CA073138334 for ; Fri, 30 Nov 2018 02:06:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85E19E085D; Fri, 30 Nov 2018 02:06:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 4574CE085D for ; Fri, 30 Nov 2018 02:06:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 F323A335C03 for ; Fri, 30 Nov 2018 02:06:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81B324CE for ; Fri, 30 Nov 2018 02:06:17 +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: <1543542263.1a7840d5a467fde338ec2f79464eb94d174029e1.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-meta/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-meta/metadata.xml kde-plasma/plasma-meta/plasma-meta-5.14.49.9999.ebuild kde-plasma/plasma-meta/plasma-meta-9999.ebuild X-VCS-Directories: kde-plasma/plasma-meta/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1a7840d5a467fde338ec2f79464eb94d174029e1 X-VCS-Branch: master Date: Fri, 30 Nov 2018 02:06:17 +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: 0e6366b0-8680-4a0a-ba86-b21b96f37bf4 X-Archives-Hash: e457b7dec9fcf116ca95afcf10ccc2b0 commit: 1a7840d5a467fde338ec2f79464eb94d174029e1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 30 01:44:23 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 30 01:44:23 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a7840d5 kde-plasma/plasma-meta: Drop USE consolekit to avoid default choice !elogind !systemd does the same thing now. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-meta/metadata.xml | 1 - .../plasma-meta/plasma-meta-5.14.49.9999.ebuild | 21 ++++++++++++--------- kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 21 ++++++++++++--------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index ee7a302e7d..34afc891f1 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -7,7 +7,6 @@ Enable integration with Chrome/Firefox with browser extensions - Enable sys-auth/consolekit support instead of logind session tracking Pull in kde-plasma/plasma-vault for encrypted vaults integration Pull in a graphical display manager Use sys-auth/elogind for session tracking diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.49.9999.ebuild index 2ffc4583e7..151d6cd918 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.14.49.9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.14.49.9999.ebuild @@ -11,10 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop" LICENSE="metapackage" SLOT="5" KEYWORDS="" -IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook +IUSE="bluetooth +browser-integration crypt +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" -REQUIRED_USE="^^ ( consolekit elogind systemd )" +REQUIRED_USE="?? ( elogind systemd )" RDEPEND=" $(add_plasma_dep breeze) @@ -50,15 +50,11 @@ RDEPEND=" sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( $(add_plasma_dep bluedevil) ) browser-integration? ( $(add_plasma_dep plasma-browser-integration) ) - consolekit? ( - >=sys-auth/consolekit-1.0.1 - pm-utils? ( sys-power/pm-utils ) - ) crypt? ( $(add_plasma_dep plasma-vault) ) display-manager? ( sddm? ( $(add_plasma_dep sddm-kcm) - x11-misc/sddm[consolekit?,elogind?,systemd?] + x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) @@ -71,11 +67,11 @@ RDEPEND=" legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) ) networkmanager? ( $(add_plasma_dep plasma-nm) - net-misc/networkmanager[consolekit?,elogind?,systemd?] + net-misc/networkmanager[elogind?,systemd?] ) pam? ( $(add_plasma_dep kwallet-pam) - sys-auth/pambase[consolekit?,elogind?,systemd?] + sys-auth/pambase[elogind?,systemd?] ) plymouth? ( $(add_plasma_dep breeze-plymouth) @@ -84,4 +80,11 @@ RDEPEND=" pulseaudio? ( $(add_plasma_dep plasma-pa) ) sdk? ( $(add_plasma_dep plasma-sdk) ) wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) ) + !elogind? ( !systemd? ( + >=sys-auth/consolekit-1.0.1 + display-manager? ( sddm? ( x11-misc/sddm[consolekit] ) ) + networkmanager? ( net-misc/networkmanager[consolekit] ) + pam? ( sys-auth/pambase[consolekit] ) + pm-utils? ( sys-power/pm-utils ) + ) ) " diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild index 2ffc4583e7..151d6cd918 100644 --- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild @@ -11,10 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop" LICENSE="metapackage" SLOT="5" KEYWORDS="" -IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook +IUSE="bluetooth +browser-integration crypt +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" -REQUIRED_USE="^^ ( consolekit elogind systemd )" +REQUIRED_USE="?? ( elogind systemd )" RDEPEND=" $(add_plasma_dep breeze) @@ -50,15 +50,11 @@ RDEPEND=" sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( $(add_plasma_dep bluedevil) ) browser-integration? ( $(add_plasma_dep plasma-browser-integration) ) - consolekit? ( - >=sys-auth/consolekit-1.0.1 - pm-utils? ( sys-power/pm-utils ) - ) crypt? ( $(add_plasma_dep plasma-vault) ) display-manager? ( sddm? ( $(add_plasma_dep sddm-kcm) - x11-misc/sddm[consolekit?,elogind?,systemd?] + x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) @@ -71,11 +67,11 @@ RDEPEND=" legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) ) networkmanager? ( $(add_plasma_dep plasma-nm) - net-misc/networkmanager[consolekit?,elogind?,systemd?] + net-misc/networkmanager[elogind?,systemd?] ) pam? ( $(add_plasma_dep kwallet-pam) - sys-auth/pambase[consolekit?,elogind?,systemd?] + sys-auth/pambase[elogind?,systemd?] ) plymouth? ( $(add_plasma_dep breeze-plymouth) @@ -84,4 +80,11 @@ RDEPEND=" pulseaudio? ( $(add_plasma_dep plasma-pa) ) sdk? ( $(add_plasma_dep plasma-sdk) ) wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) ) + !elogind? ( !systemd? ( + >=sys-auth/consolekit-1.0.1 + display-manager? ( sddm? ( x11-misc/sddm[consolekit] ) ) + networkmanager? ( net-misc/networkmanager[consolekit] ) + pam? ( sys-auth/pambase[consolekit] ) + pm-utils? ( sys-power/pm-utils ) + ) ) "