commit: 1a7840d5a467fde338ec2f79464eb94d174029e1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 01:44:23 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@
</maintainer>
<use>
<flag name="browser-integration">Enable integration with
Chrome/Firefox with browser extensions</flag>
- <flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg>
support instead of logind session tracking</flag>
<flag name="crypt">Pull in <pkg>kde-plasma/plasma-vault</pkg>
for encrypted vaults integration</flag>
<flag name="display-manager">Pull in a graphical display
manager</flag>
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for
session tracking</flag>
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 )
+ ) )
"
