gentoo resync : 25.11.2020

4 files changed, 13 insertions, 12 deletions

diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index ca18c507d419..f44324d322cd 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-meta-5.18.5.ebuild 3591 BLAKE2B 8a189ae651e7eb5d2125c92697f61ed6bd150b482b4d288d31d8be2446743c6d7e5b0dd141bb38d261f03ebf623c0cbde3b8da6906f8cdf9291220c2ff07057d SHA512 7868fc98b37b36b51c855d9a97873b1221527fcc75232892c3414ea2304812be60f1d880970cc8cc10e96d151127f06a6dfd223f070be4b1a7715461c3077782
-EBUILD plasma-meta-5.19.5.ebuild 3631 BLAKE2B fbc29c98605d6a9ce6833f1a9add0d944d439bbb9850f0cd11a8c1347b21bde98f177342c912cd6fecef8fda0b34c98c05f8455f1f930a6a523e20e2f7eaa376 SHA512 1a46721aa039b51c97d80f7ee47fff3cef6d74f56ad2ab79164864b862a063424e1c5f7186e5c4b66aca11e85e8d0b97df9c5e48b85d568eade65893c63bd3c2
-MISC metadata.xml 1963 BLAKE2B 0273adb85723495addae8367af9da0ceb907cf86aa0bf4fbf6289aa291b1b19ecd66f191ee12d62427a5316f0f75d831ee2c0ac0d2b246812a52c476aa95fbb2 SHA512 18f5c9bd29f79478e7c976ff4ab4194de3256e4d7da75cf83fd7c8b4af02d39a4ccc1d85cf672529e17f3cb84fb7ab1226d452d5b669d055e88764d2f8b6e6c9
+EBUILD plasma-meta-5.19.5.ebuild 3628 BLAKE2B 7e7eac543cb2e77d257927652c969e78e289897377e56b6524d247153145a16fe5c7bf8e339c9e40c26017e44fe102b7f2ab381c6cbb93062b94daec682de5fd SHA512 1e044042c5a6dfad973c4fc2d52038545f1b00dcc2d3a27b4dfd2b79f3e518e4c2ceb3ab231dafecc77a8329fa2e503a122dbf94b85890360701995b9494a8c5
+EBUILD plasma-meta-5.20.3.ebuild 3649 BLAKE2B bdead8e70896bc26f4e929216264c3bf8ea2dbba259da499eb6f78f7193ead0088850a66a65beb4a691527b2e69f5cd57c80b38aea7bd853d7e01def4184024d SHA512 d10566d000fa287e80ef15ffb1d495cb978805e60419a84f636fb7775f013f9034e7733bde7a610d70245e3544b818fe6fd81be4f4b48ad1776af70082555241
+MISC metadata.xml 1978 BLAKE2B 4ea42f2c1a260bd6aeab7edcfc0d66bf10a7bd7624e7e8d679747cdd84d0cbfece968ce19ae0f31cc5746280f50e335ed46cc5d57fd85b4da66db941bdfe9447 SHA512 7ff4b7d77a372710105a10b71594e88e6f3e86908feb6d15ac47939e93e2235f3a482b3c1a2a77bbbe63c5de97438fa17a93784e8b45fee0281316d8f9e74f5b
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 544a90543cbf..85111e032741 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Plasma</flag>
 		<flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</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 system settings module for GTK+</flag>
 		<flag name="kwallet">Enable support for KWallet auto-unlocking via <pkg>kde-plasma/kwallet-pam</pkg></flag>
@@ -21,6 +20,7 @@
 		<flag name="qrcode">Enable support for easy WiFi network sharing using QR codes with <pkg>kde-plasma/plasma-nm</pkg></flag>
 		<flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and system settings module</flag>
 		<flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag>
+		<flag name="smart">Pull in <pkg>kde-plasma/plasma-disks</pkg> for disk health monitoring</flag>
 		<flag name="thunderbolt">Pull in <pkg>kde-plasma/plasma-thunderbolt</pkg> control center module</flag>
 		<flag name="wallpapers">Install wallpapers for the Plasma Workspace</flag>
 	</use>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
index 719e0524dbb6..18a7aeba6379 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="bluetooth +browser-integration crypt +desktop-portal discover
 +display-manager +elogind grub gtk +handbook +kwallet +legacy-systray
 +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.20.3.ebuild
index 6cec1857bb3b..8a124750b41d 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.20.3.ebuild
@@ -8,12 +8,12 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="bluetooth +browser-integration crypt +desktop-portal discover
-+display-manager elogind grub gtk +handbook +kwallet +legacy-systray
-+networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager
++elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager
+plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 RDEPEND="
 	>=kde-plasma/breeze-${PV}:${SLOT}
@@ -31,6 +31,7 @@ RDEPEND="
 	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
 	>=kde-plasma/ksysguard-${PV}:${SLOT}
 	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwayland-server-${PV}:${SLOT}
 	>=kde-plasma/kwin-${PV}:${SLOT}
 	>=kde-plasma/kwrited-${PV}:${SLOT}
 	>=kde-plasma/libkscreen-${PV}:${SLOT}
@@ -43,7 +44,6 @@ RDEPEND="
 	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
 	>=kde-plasma/powerdevil-${PV}:${SLOT}
 	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	>=kde-plasma/user-manager-${PV}:${SLOT}
 	sys-apps/dbus[elogind?,systemd?]
 	sys-auth/polkit[elogind?,systemd?]
 	sys-fs/udisks:2[elogind?,systemd?]
@@ -63,6 +63,7 @@ RDEPEND="
 	gtk? (
 		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
 		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		x11-misc/appmenu-gtk-module
 	)
 	handbook? ( kde-apps/khelpcenter:5 )
 	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
@@ -78,13 +79,13 @@ RDEPEND="
 	)
 	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
 	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
 	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
 	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
 "
 
 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"