gentoo resync : 11.05.2021

3 files changed, 17 insertions, 8 deletions

diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 4d3dcca60580..beb3d43665fe 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.20.5.ebuild 3646 BLAKE2B e0e2f932a40c719a31a3c083c92c79d0953106ccc5f062d1214f4c93f8fd598182fa9a41910db67f1d1cff9a15164a4167fc11640060b15c4d5f8baad8909f52 SHA512 a483608e1b05606a3b93189beda17e7dad428cf183d48b8425dbb2d69124637fe34d4ff5ef499a386a7b9418f983d4181744d4fd6b860e201c1478edc4956462
-EBUILD plasma-meta-5.21.4.ebuild 3816 BLAKE2B 466abfd359a352b81b0d11e0c7a12913e58c48209708d02b32b26550eba81a046133626271eebf7a139648d928128088a9e8c289feafa0aefd6ba6d62de545a1 SHA512 8214ef54dd96f8e341bd8c18f014b2f974f8cc5d3899ed1a610f0f2532e763dcf184953c5d6b90f9ba270f69f2a7d0412f3ee963249bd2025fcc2d80ede261ea
-MISC metadata.xml 2201 BLAKE2B fba16211ef409ab937c66a0b0cff7e2fcc2f0c97261836affc481114187d8c1280cc3d06b387656f6e176eac39839b588ff536ce3d85524cf34691b09fc260fc SHA512 ec6ea4d1d873345f63df46b097b59c76bb674120b0813e7a4634a17bd0319c238f892cc7d59f745279f8a3e6a0f5df1cb5d4cf22017c15a298d699d9d22e2186
+EBUILD plasma-meta-5.21.5.ebuild 4043 BLAKE2B df884c5ab7d2f61e00228d7ecd1635e191953179cae6ed21eb930fdbe4e7a592435e9bd60da7b2886ec9120315335db48cbd1adac1788a9be676e83d91e0a3cb SHA512 8e870d2305d8d44360f58bc7ef1128df5552f8fe6aed808441366f8e387489acf82ee59e17a2c473755b1ba209bde135de388f25795e4853521e4aa8717ba5e7
+MISC metadata.xml 2311 BLAKE2B e7f8095b8d868028ffb9a6f0fb9795d2eea72b22e3b770ec08a2b75a463198c1e82242b39b413ffc794462fd2ea0324eec38f210867d22814ea005966ba1dcad SHA512 e680e2d8103eb6f65f186a77c57692f17483c2530029c8f4bd94816d87b73e1157f7310f60f8660b2e45fa048e783208df1b19cdd5711616f497d5ab16d3e7b5
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 0f90ac488608..2681c26c0ebe 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="browser-integration">Enable integration with Chrome/Firefox with browser extensions</flag>
 		<flag name="colord">Enable <pkg>kde-plasma/kwin</pkg> color management via <pkg>x11-misc/colord</pkg></flag>
+		<flag name="crash-handler">Pull in <pkg>kde-plasma/drkonqi</pkg> for assisted upstream crash reports</flag>
 		<flag name="crypt">Pull in <pkg>kde-plasma/plasma-vault</pkg> for encrypted vaults integration</flag>
 		<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>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
index a108002f6a8f..240dc1de7b29 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.21.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
@@ -9,16 +9,15 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="bluetooth +browser-integration colord crypt +desktop-portal discover
-+display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray
-+networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt
-+wallpapers"
+IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
++desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
++kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
++smart systemd thunderbolt +wallpapers"
 
 REQUIRED_USE="^^ ( elogind systemd )"
 
 RDEPEND="
 	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/drkonqi-${PV}:${SLOT}
 	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
 	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
 	>=kde-plasma/kdecoration-${PV}:${SLOT}
@@ -52,6 +51,7 @@ RDEPEND="
 	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
 	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
 	colord? ( x11-misc/colord )
+	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
 	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
 	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
 	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
@@ -62,6 +62,7 @@ RDEPEND="
 		)
 		!sddm? ( x11-misc/lightdm )
 	)
+	elogind? ( sys-auth/elogind[pam] )
 	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
 	gtk? (
 		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
@@ -83,10 +84,17 @@ RDEPEND="
 	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
 	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
 	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
-	systemd? ( firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} ) )
+	systemd? (
+		sys-apps/systemd[pam]
+		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
+	)
 	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
 	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
 "
+# Optional runtime deps: kde-plasma/plasma-desktop
+RDEPEND="${RDEPEND}
+	accessibility? ( app-accessibility/orca )
+"
 
 pkg_postinst() {
 	has_version sys-auth/consolekit || return