[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-meta/

[Andreas Sturmlechner]

commit:     3b0b4a44951ad9f9d089d74209e680511187260d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 14:05:26 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 14:05:26 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b0b4a44

kde-plasma/plasma-meta: Sync with Gentoo ebuild repo

Package-Manager: Portage-2.3.52, 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    | 42 +++++++++++++++-------
 kde-plasma/plasma-meta/plasma-meta-9999.ebuild     | 42 +++++++++++++++-------
 3 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 34afc891f1..ee7a302e7d 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="browser-integration">Enable integration with Chrome/Firefox with browser extensions</flag>
+		<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>

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 151d6cd918..798e68b5f7 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,10 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop"
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS=""
-IUSE="bluetooth +browser-integration crypt +display-manager elogind grub gtk +handbook
+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="?? ( elogind systemd )"
+REQUIRED_USE="?? ( consolekit elogind systemd )"
 
 RDEPEND="
 	$(add_plasma_dep breeze)
@@ -50,11 +50,15 @@ RDEPEND="
 	sys-fs/udisks:2[elogind?,systemd?]
 	bluetooth? ( $(add_plasma_dep bluedevil) )
 	browser-integration? ( $(add_plasma_dep plasma-browser-integration) )
+	consolekit? (
+		>=sys-auth/consolekit-1.0.1
+		pm-utils? ( sys-power/pm-utils )
+	)
 	crypt? ( $(add_plasma_dep plasma-vault) )
 	display-manager? (
 		sddm? (
 			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm[elogind?,systemd?]
+			x11-misc/sddm[consolekit?,elogind?,systemd?]
 		)
 		!sddm? ( x11-misc/lightdm )
 	)
@@ -67,11 +71,11 @@ RDEPEND="
 	legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) )
 	networkmanager? (
 		$(add_plasma_dep plasma-nm)
-		net-misc/networkmanager[elogind?,systemd?]
+		net-misc/networkmanager[consolekit?,elogind?,systemd?]
 	)
 	pam? (
 		$(add_plasma_dep kwallet-pam)
-		sys-auth/pambase[elogind?,systemd?]
+		sys-auth/pambase[consolekit?,elogind?,systemd?]
 	)
 	plymouth? (
 		$(add_plasma_dep breeze-plymouth)
@@ -80,11 +84,25 @@ RDEPEND="
 	pulseaudio? ( $(add_plasma_dep plasma-pa) )
 	sdk? ( $(add_plasma_dep plasma-sdk) )
 	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-	!elogind? ( !systemd? (
-		>=sys-auth/consolekit-1.0.1
-		display-manager? ( sddm? ( x11-misc/sddm[consolekit] ) )
-		networkmanager? ( net-misc/networkmanager[consolekit] )
-		pam? ( sys-auth/pambase[consolekit] )
-		pm-utils? ( sys-power/pm-utils )
-	) )
 "
+
+pkg_postinst() {
+	local i selected use_pkg_map=(
+		consolekit:sys-auth/consolekit
+		elogind:sys-auth/elogind
+		systemd:sys-apps/systemd
+	)
+	for i in ${use_pkg_map[@]}; do
+		use ${i%:*} && selected="${i%:*}"
+	done
+	for i in ${use_pkg_map[@]}; do
+		if ! use ${i%:*} && has_version ${i#*:}; then
+			ewarn "An existing installation of ${i#*:} was detected even though"
+			ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}."
+			ewarn "There can only be one session manager at runtime, otherwise random issues"
+			ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf"
+			ewarn "or package.use and remove ${i#*:} before raising bugs."
+			ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+		fi
+	done
+}

diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
index 151d6cd918..798e68b5f7 100644
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
@@ -11,10 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop"
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS=""
-IUSE="bluetooth +browser-integration crypt +display-manager elogind grub gtk +handbook
+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="?? ( elogind systemd )"
+REQUIRED_USE="?? ( consolekit elogind systemd )"
 
 RDEPEND="
 	$(add_plasma_dep breeze)
@@ -50,11 +50,15 @@ RDEPEND="
 	sys-fs/udisks:2[elogind?,systemd?]
 	bluetooth? ( $(add_plasma_dep bluedevil) )
 	browser-integration? ( $(add_plasma_dep plasma-browser-integration) )
+	consolekit? (
+		>=sys-auth/consolekit-1.0.1
+		pm-utils? ( sys-power/pm-utils )
+	)
 	crypt? ( $(add_plasma_dep plasma-vault) )
 	display-manager? (
 		sddm? (
 			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm[elogind?,systemd?]
+			x11-misc/sddm[consolekit?,elogind?,systemd?]
 		)
 		!sddm? ( x11-misc/lightdm )
 	)
@@ -67,11 +71,11 @@ RDEPEND="
 	legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) )
 	networkmanager? (
 		$(add_plasma_dep plasma-nm)
-		net-misc/networkmanager[elogind?,systemd?]
+		net-misc/networkmanager[consolekit?,elogind?,systemd?]
 	)
 	pam? (
 		$(add_plasma_dep kwallet-pam)
-		sys-auth/pambase[elogind?,systemd?]
+		sys-auth/pambase[consolekit?,elogind?,systemd?]
 	)
 	plymouth? (
 		$(add_plasma_dep breeze-plymouth)
@@ -80,11 +84,25 @@ RDEPEND="
 	pulseaudio? ( $(add_plasma_dep plasma-pa) )
 	sdk? ( $(add_plasma_dep plasma-sdk) )
 	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-	!elogind? ( !systemd? (
-		>=sys-auth/consolekit-1.0.1
-		display-manager? ( sddm? ( x11-misc/sddm[consolekit] ) )
-		networkmanager? ( net-misc/networkmanager[consolekit] )
-		pam? ( sys-auth/pambase[consolekit] )
-		pm-utils? ( sys-power/pm-utils )
-	) )
 "
+
+pkg_postinst() {
+	local i selected use_pkg_map=(
+		consolekit:sys-auth/consolekit
+		elogind:sys-auth/elogind
+		systemd:sys-apps/systemd
+	)
+	for i in ${use_pkg_map[@]}; do
+		use ${i%:*} && selected="${i%:*}"
+	done
+	for i in ${use_pkg_map[@]}; do
+		if ! use ${i%:*} && has_version ${i#*:}; then
+			ewarn "An existing installation of ${i#*:} was detected even though"
+			ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}."
+			ewarn "There can only be one session manager at runtime, otherwise random issues"
+			ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf"
+			ewarn "or package.use and remove ${i#*:} before raising bugs."
+			ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+		fi
+	done
+}