| 1 |
commit: 1a7840d5a467fde338ec2f79464eb94d174029e1 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 30 01:44:23 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 30 01:44:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a7840d5 |
| 7 |
|
| 8 |
kde-plasma/plasma-meta: Drop USE consolekit to avoid default choice |
| 9 |
|
| 10 |
!elogind !systemd does the same thing now. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-plasma/plasma-meta/metadata.xml | 1 - |
| 16 |
.../plasma-meta/plasma-meta-5.14.49.9999.ebuild | 21 ++++++++++++--------- |
| 17 |
kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 21 ++++++++++++--------- |
| 18 |
3 files changed, 24 insertions(+), 19 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml |
| 21 |
index ee7a302e7d..34afc891f1 100644 |
| 22 |
--- a/kde-plasma/plasma-meta/metadata.xml |
| 23 |
+++ b/kde-plasma/plasma-meta/metadata.xml |
| 24 |
@@ -7,7 +7,6 @@ |
| 25 |
</maintainer> |
| 26 |
<use> |
| 27 |
<flag name="browser-integration">Enable integration with Chrome/Firefox with browser extensions</flag> |
| 28 |
- <flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg> support instead of logind session tracking</flag> |
| 29 |
<flag name="crypt">Pull in <pkg>kde-plasma/plasma-vault</pkg> for encrypted vaults integration</flag> |
| 30 |
<flag name="display-manager">Pull in a graphical display manager</flag> |
| 31 |
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> |
| 32 |
|
| 33 |
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 |
| 34 |
index 2ffc4583e7..151d6cd918 100644 |
| 35 |
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.49.9999.ebuild |
| 36 |
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.49.9999.ebuild |
| 37 |
@@ -11,10 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop" |
| 38 |
LICENSE="metapackage" |
| 39 |
SLOT="5" |
| 40 |
KEYWORDS="" |
| 41 |
-IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook |
| 42 |
+IUSE="bluetooth +browser-integration crypt +display-manager elogind grub gtk +handbook |
| 43 |
+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" |
| 44 |
|
| 45 |
-REQUIRED_USE="^^ ( consolekit elogind systemd )" |
| 46 |
+REQUIRED_USE="?? ( elogind systemd )" |
| 47 |
|
| 48 |
RDEPEND=" |
| 49 |
$(add_plasma_dep breeze) |
| 50 |
@@ -50,15 +50,11 @@ RDEPEND=" |
| 51 |
sys-fs/udisks:2[elogind?,systemd?] |
| 52 |
bluetooth? ( $(add_plasma_dep bluedevil) ) |
| 53 |
browser-integration? ( $(add_plasma_dep plasma-browser-integration) ) |
| 54 |
- consolekit? ( |
| 55 |
- >=sys-auth/consolekit-1.0.1 |
| 56 |
- pm-utils? ( sys-power/pm-utils ) |
| 57 |
- ) |
| 58 |
crypt? ( $(add_plasma_dep plasma-vault) ) |
| 59 |
display-manager? ( |
| 60 |
sddm? ( |
| 61 |
$(add_plasma_dep sddm-kcm) |
| 62 |
- x11-misc/sddm[consolekit?,elogind?,systemd?] |
| 63 |
+ x11-misc/sddm[elogind?,systemd?] |
| 64 |
) |
| 65 |
!sddm? ( x11-misc/lightdm ) |
| 66 |
) |
| 67 |
@@ -71,11 +67,11 @@ RDEPEND=" |
| 68 |
legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) ) |
| 69 |
networkmanager? ( |
| 70 |
$(add_plasma_dep plasma-nm) |
| 71 |
- net-misc/networkmanager[consolekit?,elogind?,systemd?] |
| 72 |
+ net-misc/networkmanager[elogind?,systemd?] |
| 73 |
) |
| 74 |
pam? ( |
| 75 |
$(add_plasma_dep kwallet-pam) |
| 76 |
- sys-auth/pambase[consolekit?,elogind?,systemd?] |
| 77 |
+ sys-auth/pambase[elogind?,systemd?] |
| 78 |
) |
| 79 |
plymouth? ( |
| 80 |
$(add_plasma_dep breeze-plymouth) |
| 81 |
@@ -84,4 +80,11 @@ RDEPEND=" |
| 82 |
pulseaudio? ( $(add_plasma_dep plasma-pa) ) |
| 83 |
sdk? ( $(add_plasma_dep plasma-sdk) ) |
| 84 |
wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) ) |
| 85 |
+ !elogind? ( !systemd? ( |
| 86 |
+ >=sys-auth/consolekit-1.0.1 |
| 87 |
+ display-manager? ( sddm? ( x11-misc/sddm[consolekit] ) ) |
| 88 |
+ networkmanager? ( net-misc/networkmanager[consolekit] ) |
| 89 |
+ pam? ( sys-auth/pambase[consolekit] ) |
| 90 |
+ pm-utils? ( sys-power/pm-utils ) |
| 91 |
+ ) ) |
| 92 |
" |
| 93 |
|
| 94 |
diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 95 |
index 2ffc4583e7..151d6cd918 100644 |
| 96 |
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 97 |
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 98 |
@@ -11,10 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop" |
| 99 |
LICENSE="metapackage" |
| 100 |
SLOT="5" |
| 101 |
KEYWORDS="" |
| 102 |
-IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook |
| 103 |
+IUSE="bluetooth +browser-integration crypt +display-manager elogind grub gtk +handbook |
| 104 |
+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" |
| 105 |
|
| 106 |
-REQUIRED_USE="^^ ( consolekit elogind systemd )" |
| 107 |
+REQUIRED_USE="?? ( elogind systemd )" |
| 108 |
|
| 109 |
RDEPEND=" |
| 110 |
$(add_plasma_dep breeze) |
| 111 |
@@ -50,15 +50,11 @@ RDEPEND=" |
| 112 |
sys-fs/udisks:2[elogind?,systemd?] |
| 113 |
bluetooth? ( $(add_plasma_dep bluedevil) ) |
| 114 |
browser-integration? ( $(add_plasma_dep plasma-browser-integration) ) |
| 115 |
- consolekit? ( |
| 116 |
- >=sys-auth/consolekit-1.0.1 |
| 117 |
- pm-utils? ( sys-power/pm-utils ) |
| 118 |
- ) |
| 119 |
crypt? ( $(add_plasma_dep plasma-vault) ) |
| 120 |
display-manager? ( |
| 121 |
sddm? ( |
| 122 |
$(add_plasma_dep sddm-kcm) |
| 123 |
- x11-misc/sddm[consolekit?,elogind?,systemd?] |
| 124 |
+ x11-misc/sddm[elogind?,systemd?] |
| 125 |
) |
| 126 |
!sddm? ( x11-misc/lightdm ) |
| 127 |
) |
| 128 |
@@ -71,11 +67,11 @@ RDEPEND=" |
| 129 |
legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) ) |
| 130 |
networkmanager? ( |
| 131 |
$(add_plasma_dep plasma-nm) |
| 132 |
- net-misc/networkmanager[consolekit?,elogind?,systemd?] |
| 133 |
+ net-misc/networkmanager[elogind?,systemd?] |
| 134 |
) |
| 135 |
pam? ( |
| 136 |
$(add_plasma_dep kwallet-pam) |
| 137 |
- sys-auth/pambase[consolekit?,elogind?,systemd?] |
| 138 |
+ sys-auth/pambase[elogind?,systemd?] |
| 139 |
) |
| 140 |
plymouth? ( |
| 141 |
$(add_plasma_dep breeze-plymouth) |
| 142 |
@@ -84,4 +80,11 @@ RDEPEND=" |
| 143 |
pulseaudio? ( $(add_plasma_dep plasma-pa) ) |
| 144 |
sdk? ( $(add_plasma_dep plasma-sdk) ) |
| 145 |
wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) ) |
| 146 |
+ !elogind? ( !systemd? ( |
| 147 |
+ >=sys-auth/consolekit-1.0.1 |
| 148 |
+ display-manager? ( sddm? ( x11-misc/sddm[consolekit] ) ) |
| 149 |
+ networkmanager? ( net-misc/networkmanager[consolekit] ) |
| 150 |
+ pam? ( sys-auth/pambase[consolekit] ) |
| 151 |
+ pm-utils? ( sys-power/pm-utils ) |
| 152 |
+ ) ) |
| 153 |
" |
Archives