commit: 706f5f8135bd3f32b0d4e1cbb593934b3338945a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 11 15:41:01 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 11 15:45:46 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=706f5f81
kde-plasma/plasma-meta: Propagate USE elogind,systemd to dependencies This should help enforce a clean switch for Plasma users. Package-Manager: Portage-2.3.51, 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, 33 insertions(+), 10 deletions(-) diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index d4f246c77c..ee7a302e7d 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -10,6 +10,7 @@ <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> <flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag> <flag name="gtk">Enable Breeze widget style and KCM for GTK2 and GTK3</flag> <flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></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 78724b835b..2ffc4583e7 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,8 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop" LICENSE="metapackage" SLOT="5" KEYWORDS="" -IUSE="bluetooth +browser-integration consolekit crypt +display-manager grub gtk +handbook -+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk +wallpapers" +IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook ++legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" + +REQUIRED_USE="^^ ( consolekit elogind systemd )" RDEPEND=" $(add_plasma_dep breeze) @@ -43,6 +45,9 @@ RDEPEND=" $(add_plasma_dep powerdevil) $(add_plasma_dep systemsettings) $(add_plasma_dep user-manager) + sys-apps/dbus[elogind?,systemd?] + sys-auth/polkit[elogind?,systemd?] + sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( $(add_plasma_dep bluedevil) ) browser-integration? ( $(add_plasma_dep plasma-browser-integration) ) consolekit? ( @@ -53,7 +58,7 @@ RDEPEND=" display-manager? ( sddm? ( $(add_plasma_dep sddm-kcm) - x11-misc/sddm + x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) @@ -64,8 +69,14 @@ RDEPEND=" ) handbook? ( $(add_kdeapps_dep khelpcenter) ) legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) ) - networkmanager? ( $(add_plasma_dep plasma-nm) ) - pam? ( $(add_plasma_dep kwallet-pam) ) + networkmanager? ( + $(add_plasma_dep plasma-nm) + net-misc/networkmanager[consolekit?,elogind?,systemd?] + ) + pam? ( + $(add_plasma_dep kwallet-pam) + sys-auth/pambase[consolekit?,elogind?,systemd?] + ) plymouth? ( $(add_plasma_dep breeze-plymouth) $(add_plasma_dep plymouth-kcm) diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild index 78724b835b..2ffc4583e7 100644 --- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild @@ -11,8 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop" LICENSE="metapackage" SLOT="5" KEYWORDS="" -IUSE="bluetooth +browser-integration consolekit crypt +display-manager grub gtk +handbook -+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk +wallpapers" +IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook ++legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers" + +REQUIRED_USE="^^ ( consolekit elogind systemd )" RDEPEND=" $(add_plasma_dep breeze) @@ -43,6 +45,9 @@ RDEPEND=" $(add_plasma_dep powerdevil) $(add_plasma_dep systemsettings) $(add_plasma_dep user-manager) + sys-apps/dbus[elogind?,systemd?] + sys-auth/polkit[elogind?,systemd?] + sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( $(add_plasma_dep bluedevil) ) browser-integration? ( $(add_plasma_dep plasma-browser-integration) ) consolekit? ( @@ -53,7 +58,7 @@ RDEPEND=" display-manager? ( sddm? ( $(add_plasma_dep sddm-kcm) - x11-misc/sddm + x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) @@ -64,8 +69,14 @@ RDEPEND=" ) handbook? ( $(add_kdeapps_dep khelpcenter) ) legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) ) - networkmanager? ( $(add_plasma_dep plasma-nm) ) - pam? ( $(add_plasma_dep kwallet-pam) ) + networkmanager? ( + $(add_plasma_dep plasma-nm) + net-misc/networkmanager[consolekit?,elogind?,systemd?] + ) + pam? ( + $(add_plasma_dep kwallet-pam) + sys-auth/pambase[consolekit?,elogind?,systemd?] + ) plymouth? ( $(add_plasma_dep breeze-plymouth) $(add_plasma_dep plymouth-kcm)