From 2fc5b367845c0ab40c212799ba668e4ada8a1424 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 14 Apr 2020 02:03:24 +0200 Subject: kde-plasma/plasma-meta: Drop USE pm-utils With consolekit gone as desktop profile default we no longer support this. Bug: https://bugs.gentoo.org/670908 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner --- kde-plasma/plasma-meta/metadata.xml | 1 - kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild | 7 ++----- kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index 0e4113c5df..ad4cccb579 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -18,7 +18,6 @@ Add support for legacy applications using kde-plasma/xembed-sni-proxy Enable support for kwallet auto-unlocking Pull in Breeze theme for sys-boot/plymouth - Enable support for suspend/resume with sys-power/pm-utils when using sys-auth/consolekit Install Plasma applet for PulseAudio volume management Enable support for easy WiFi network sharing using QR codes with kde-plasma/plasma-nm Pull in the x11-misc/sddm display manager and system settings module diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild index 07edf0703b..f55a635c96 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.18.49.9999.ebuild @@ -11,7 +11,7 @@ SLOT="5" KEYWORDS="" IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam -plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" +plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" REQUIRED_USE="?? ( consolekit elogind systemd )" @@ -49,10 +49,7 @@ RDEPEND=" sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} ) browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} ) - consolekit? ( - >=sys-auth/consolekit-1.0.1 - pm-utils? ( sys-power/pm-utils ) - ) + consolekit? ( >=sys-auth/consolekit-1.0.1 ) crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} ) discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild index 07edf0703b..f55a635c96 100644 --- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild @@ -11,7 +11,7 @@ SLOT="5" KEYWORDS="" IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam -plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" +plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers" REQUIRED_USE="?? ( consolekit elogind systemd )" @@ -49,10 +49,7 @@ RDEPEND=" sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} ) browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} ) - consolekit? ( - >=sys-auth/consolekit-1.0.1 - pm-utils? ( sys-power/pm-utils ) - ) + consolekit? ( >=sys-auth/consolekit-1.0.1 ) crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} ) discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) -- cgit v1.2.3-65-gdbad