| 1 |
commit: e8fe2363cc9900bd815927fa25198bd23b1ad3a7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 2 11:35:10 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 2 11:35:10 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8fe2363 |
| 7 |
|
| 8 |
kde-plasma/plasma-meta: Enforce one of two logind implementations |
| 9 |
|
| 10 |
sys-auth/consolekit was masked finally. |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild | 5 ++--- |
| 16 |
kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 5 ++--- |
| 17 |
2 files changed, 4 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild |
| 20 |
index 9408510e28..736da26664 100644 |
| 21 |
--- a/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild |
| 22 |
+++ b/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild |
| 23 |
@@ -10,10 +10,10 @@ LICENSE="metapackage" |
| 24 |
SLOT="5" |
| 25 |
KEYWORDS="" |
| 26 |
IUSE="bluetooth +browser-integration crypt +desktop-portal discover |
| 27 |
-+display-manager elogind grub gtk +handbook +kwallet +legacy-systray |
| 28 |
++display-manager +elogind grub gtk +handbook +kwallet +legacy-systray |
| 29 |
+networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" |
| 30 |
|
| 31 |
-REQUIRED_USE="?? ( elogind systemd )" |
| 32 |
+REQUIRED_USE="^^ ( elogind systemd )" |
| 33 |
|
| 34 |
RDEPEND=" |
| 35 |
>=kde-plasma/breeze-${PV}:${SLOT} |
| 36 |
@@ -87,7 +87,6 @@ RDEPEND=" |
| 37 |
|
| 38 |
pkg_postinst() { |
| 39 |
has_version sys-auth/consolekit || return |
| 40 |
- use elogind || use systemd || return |
| 41 |
ewarn "An existing installation of sys-auth/consolekit was detected even though" |
| 42 |
ewarn "${PN} was configured with USE $(usex elogind elogind systemd)." |
| 43 |
ewarn "There can only be one session manager at runtime, otherwise random issues" |
| 44 |
|
| 45 |
diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 46 |
index f315e6d2e9..8379e2149e 100644 |
| 47 |
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 48 |
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild |
| 49 |
@@ -10,10 +10,10 @@ LICENSE="metapackage" |
| 50 |
SLOT="5" |
| 51 |
KEYWORDS="" |
| 52 |
IUSE="bluetooth +browser-integration crypt +desktop-portal discover |
| 53 |
-+display-manager elogind grub gtk +handbook +kwallet kwinft +legacy-systray |
| 54 |
++display-manager +elogind grub gtk +handbook +kwallet kwinft +legacy-systray |
| 55 |
+networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" |
| 56 |
|
| 57 |
-REQUIRED_USE="?? ( elogind systemd )" |
| 58 |
+REQUIRED_USE="^^ ( elogind systemd )" |
| 59 |
|
| 60 |
RDEPEND=" |
| 61 |
>=kde-plasma/breeze-${PV}:${SLOT} |
| 62 |
@@ -87,7 +87,6 @@ RDEPEND=" |
| 63 |
|
| 64 |
pkg_postinst() { |
| 65 |
has_version sys-auth/consolekit || return |
| 66 |
- use elogind || use systemd || return |
| 67 |
ewarn "An existing installation of sys-auth/consolekit was detected even though" |
| 68 |
ewarn "${PN} was configured with USE $(usex elogind elogind systemd)." |
| 69 |
ewarn "There can only be one session manager at runtime, otherwise random issues" |
Archives