gentoo resync : 24.12.2018

4 files changed, 90 insertions, 20 deletions

diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index a492efd3f000..0bf603ce7213 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-meta-5.13.5.ebuild 2228 BLAKE2B 38972e9aa86fcf8757b8a1402d26309aa2b3a05e418663ef0a53281e45005efcdde7922d72e2f757115bcd9bf06243460fa51f6d013682366f42ba56b2956c72 SHA512 ccb7f33bc4ea19344699cda0228a4fbbe07b69e285805f8befe5e20c060828b6eb73a64593c9f1cf74d8173af4427b3c965a67c0b08451a901ec42411af26fe2
-EBUILD plasma-meta-5.14.3.ebuild 2152 BLAKE2B b112b1216ba0adeeab978f5fe7cfa28a29d2300962f6f65ba62a9de77ede913bc46d245231cbec2afad67eede9bd96eb311037f084e2570a1c67cfb0640b4a10 SHA512 d1169b0e81a8074bb4e2ed06b47844af032f8693445eb168fc95077b1426170d9be338c54714e73209e8f9bbaedd739a6b461743449d4445e0d56df06fa6ec15
-MISC metadata.xml 1304 BLAKE2B 09af233977178dbd8bc6943d87db1b5523e3f94d9f7db522d56788e21de9d7d0a9f9fb9bc38331623619524021cf961b35d033cbb5b3155c365154db6df1642d SHA512 f891053e1f87c4daab4024cdd3631e778c2a1c0d5f39b40aefb9ddb263b7d8cd3ec9adaae416562717837a789fbb76baccfd05b1ef11b491a4782926f66a35e4
+EBUILD plasma-meta-5.14.3-r1.ebuild 3328 BLAKE2B 544555fb9e28331dc86489a2edc6154496f4301de7ef67996d60ce442d8fd486ed41361e4633b6b656994fb7a6be4ddd1b59240300bc83b87f7276caf4011ecd SHA512 bf7155b71dfb9629072ac8b325fa9c424d099e8b68739d0ffd9575c9ec1ee21df20a08921f92fb8a2b91ced2040674619b6bd061cab3029114529427d65a67e0
+EBUILD plasma-meta-5.14.4.ebuild 3330 BLAKE2B 40ca9f720467c414ef13f59adb2ce2e1fbb2f8de86fe7635828e47c25f5e2b73e42eb5606513e08d3f045f34e5ce2d8233271743946cc43e9a4458c354c88477 SHA512 52dc303ebd37b4e53786c5cbeb978a782855f7e6751b87625a14b4a2b1d61c44f243a4001b5260fab936bb464dfa44d22f5089e739cb9b167974e28ad51d0364
+MISC metadata.xml 1656 BLAKE2B ca6cffa3becb923ebb5e5feefb43215ec30f95f4745275ecf6da10185b2d7715ca74dae6ae757d835370a933754ff0d703fcdeef22766596618a48d8a5849528 SHA512 a4a469d477efc111210f5afa647741666eaebd303688c7e297b1c191ca312d9ac129887055ab95e0750338a5e4e9316aff0f1c62da8b40959fce9e5873683005
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 08b59513fc93..ee7a302e7d78 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -7,13 +7,16 @@
 	</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>
 		<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 GTK+ applications using legacy xembed systray icons</flag>
+		<flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag>
 		<flag name="pam">Enable support for kwallet auto-unlocking</flag>
 		<flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag>
+		<flag name="pm-utils">Enable support for suspend/resume with <pkg>sys-power/pm-utils</pkg> when using <pkg>sys-auth/consolekit</pkg></flag>
 		<flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag>
 		<flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and KCM</flag>
 		<flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.13.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild
index c8c2bda40bcf..d5cd6979a7e6 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.13.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.3-r1.ebuild
@@ -6,13 +6,15 @@ EAPI=6
 inherit kde5-functions
 
 DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/workspaces/plasmadesktop/"
+HOMEPAGE="https://www.kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS="amd64 ~arm x86"
-IUSE="bluetooth +browser-integration crypt +display-manager grub gtk +handbook
-legacy-systray networkmanager pam plymouth 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,13 +45,20 @@ 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? (
+		>=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
+			x11-misc/sddm[consolekit?,elogind?,systemd?]
 		)
 		!sddm? ( x11-misc/lightdm )
 	)
@@ -57,14 +66,17 @@ RDEPEND="
 	gtk? (
 		$(add_plasma_dep breeze-gtk)
 		$(add_plasma_dep kde-gtk-config)
-		legacy-systray? (
-			dev-libs/libappindicator:3
-			dev-libs/libappindicator:2
-		)
 	)
 	handbook? ( $(add_kdeapps_dep khelpcenter) )
-	networkmanager? ( $(add_plasma_dep plasma-nm) )
-	pam? ( $(add_plasma_dep kwallet-pam) )
+	legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) )
+	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)
@@ -74,4 +86,23 @@ RDEPEND="
 	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
 "
 
-REQUIRED_USE="legacy-systray? ( gtk )"
+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-5.14.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild
index bee82273dc84..4d68b770cf6e 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.3.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild
@@ -11,8 +11,10 @@ HOMEPAGE="https://www.kde.org/plasma-desktop"
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bluetooth +browser-integration crypt +display-manager grub gtk +handbook
-+legacy-systray networkmanager pam plymouth 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,13 +45,20 @@ 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? (
+		>=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
+			x11-misc/sddm[consolekit?,elogind?,systemd?]
 		)
 		!sddm? ( x11-misc/lightdm )
 	)
@@ -60,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)
@@ -70,3 +85,24 @@ RDEPEND="
 	sdk? ( $(add_plasma_dep plasma-sdk) )
 	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
 "
+
+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
+}