commit: e8fe2363cc9900bd815927fa25198bd23b1ad3a7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Aug 2 11:35:10 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Aug 2 11:35:10 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8fe2363
kde-plasma/plasma-meta: Enforce one of two logind implementations sys-auth/consolekit was masked finally. Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild | 5 ++--- kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) 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 index 9408510e28..736da26664 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.19.49.9999.ebuild @@ -10,10 +10,10 @@ LICENSE="metapackage" SLOT="5" KEYWORDS="" IUSE="bluetooth +browser-integration crypt +desktop-portal discover -+display-manager elogind grub gtk +handbook +kwallet +legacy-systray ++display-manager +elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" -REQUIRED_USE="?? ( elogind systemd )" +REQUIRED_USE="^^ ( elogind systemd )" RDEPEND=" >=kde-plasma/breeze-${PV}:${SLOT} @@ -87,7 +87,6 @@ RDEPEND=" pkg_postinst() { has_version sys-auth/consolekit || return - use elogind || use systemd || return ewarn "An existing installation of sys-auth/consolekit was detected even though" ewarn "${PN} was configured with USE $(usex elogind elogind systemd)." ewarn "There can only be one session manager at runtime, otherwise random issues" diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild index f315e6d2e9..8379e2149e 100644 --- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild @@ -10,10 +10,10 @@ LICENSE="metapackage" SLOT="5" KEYWORDS="" IUSE="bluetooth +browser-integration crypt +desktop-portal discover -+display-manager elogind grub gtk +handbook +kwallet kwinft +legacy-systray ++display-manager +elogind grub gtk +handbook +kwallet kwinft +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" -REQUIRED_USE="?? ( elogind systemd )" +REQUIRED_USE="^^ ( elogind systemd )" RDEPEND=" >=kde-plasma/breeze-${PV}:${SLOT} @@ -87,7 +87,6 @@ RDEPEND=" pkg_postinst() { has_version sys-auth/consolekit || return - use elogind || use systemd || return ewarn "An existing installation of sys-auth/consolekit was detected even though" ewarn "${PN} was configured with USE $(usex elogind elogind systemd)." ewarn "There can only be one session manager at runtime, otherwise random issues"