gentoo resync : 15.06.2021

3 files changed, 23 insertions, 10 deletions

diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index beb3d43665fe..ad28e704a01e 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.5.ebuild 4043 BLAKE2B df884c5ab7d2f61e00228d7ecd1635e191953179cae6ed21eb930fdbe4e7a592435e9bd60da7b2886ec9120315335db48cbd1adac1788a9be676e83d91e0a3cb SHA512 8e870d2305d8d44360f58bc7ef1128df5552f8fe6aed808441366f8e387489acf82ee59e17a2c473755b1ba209bde135de388f25795e4853521e4aa8717ba5e7
+EBUILD plasma-meta-5.21.5.ebuild 4040 BLAKE2B 614877bb903d223fadc2c19963ccada9a350d65e705eba59f29b753e5bd7448f4fe66bd42e94432867403293cfd84062fce597721c4e7b16bb96c6ea6ef83dab SHA512 ec273d84d957bdbd8d641dac1594cb068bac1fa7600d41ed91bb726aa838ce41646e5ef770447258a2b7ff1c20116894f8394223152e859353fc2e2371259d15
+EBUILD plasma-meta-5.22.0.ebuild 4089 BLAKE2B b37bff3af6f404ec4ab2792387e2ce24cb19aebb04b402494fb8a8bc0038ec684db912c6b50d736ce86100baeddf38885dfc1a865af7a905a45f8c0085f405f9 SHA512 b100226f8ffae9f18fa1c733898fa5f7c9dbbf77f8b6705963a8cf9a39fb38eb487b315cbc76ed18624fdcfb10f34f1705b773020e505d326b6617ea06aaf269
 MISC metadata.xml 2311 BLAKE2B e7f8095b8d868028ffb9a6f0fb9795d2eea72b22e3b770ec08a2b75a463198c1e82242b39b413ffc794462fd2ea0324eec38f210867d22814ea005966ba1dcad SHA512 e680e2d8103eb6f65f186a77c57692f17483c2530029c8f4bd94816d87b73e1157f7310f60f8660b2e45fa048e783208df1b19cdd5711616f497d5ab16d3e7b5
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
index 240dc1de7b29..a3729a5e3d62 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.21.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="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
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.22.0.ebuild
index 1d16c73d033f..82a75b873114 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.22.0.ebuild
@@ -4,20 +4,20 @@
 EAPI=7
 
 DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop"
+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 +smart systemd thunderbolt +wallpapers"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+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}
@@ -29,17 +29,19 @@ RDEPEND="
 	>=kde-plasma/kscreen-${PV}:${SLOT}
 	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
 	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksysguard-${PV}:${SLOT}
+	>=kde-plasma/ksystemstats-${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/layer-shell-qt-${PV}:${SLOT}
 	>=kde-plasma/libkscreen-${PV}:${SLOT}
 	>=kde-plasma/libksysguard-${PV}:${SLOT}
 	>=kde-plasma/milou-${PV}:${SLOT}
 	>=kde-plasma/oxygen-${PV}:${SLOT}
 	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
 	>=kde-plasma/plasma-integration-${PV}:${SLOT}
+	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
 	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
 	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
 	>=kde-plasma/powerdevil-${PV}:${SLOT}
@@ -49,6 +51,8 @@ RDEPEND="
 	sys-fs/udisks:2[elogind?,systemd?]
 	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} )
@@ -59,6 +63,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}
@@ -80,9 +85,17 @@ RDEPEND="
 	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
 	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
 	smart? ( >=kde-plasma/plasma-disks-${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