gentoo resync : 30.05.2020

7 files changed, 211 insertions, 152 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 7f204eaa02a1..b2a7680e9754 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,10 +1,9 @@
 AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
-AUX plasma-workspace-5.17.2-waylandsessionrename.patch 2568 BLAKE2B 45be5b7221f60e6e1f2d449887f348f0462458ea25cc0559b4a48ca9e3726cd241ea6d32d23f61cc0ee755e1e7d42bda1ac8dfd454bf55bb69b53f3d60c6df7e SHA512 f36882781987e85b76bc2d2ebabae355f26d9579fe194fa32c3425c0fb8d4cabb6f7f34e8596026e0cedba5f65fc0036f432d91f6a20bf689938717db1e4f235
-AUX plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch 1806 BLAKE2B f1c6d815035b55c7084d047b08837ee6769935a6c5def8225da3ded9ea988a228b033453399b5a51ce4203338751d1fc81380efc5d5b75df04521aa988a93bce SHA512 bc4939198fbbb0ccee339e7558805c49991cf66784d87d04a4cbc4d80ddccd05bffb00bb5d1bb9a6d6b57ed5961884e2c2bfd6c9a26fd5a32d33f6f776292663
-DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
+AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 360e27d03d8429d7d2b1c11f9b40ac0049108ab0461e9428cb5f2fe67241708190796d3a60a503e0ab1903dee61c27dfe7d2a187e36032518632a4966fe10215 SHA512 f7367acf43a4c3aed20ee42853fb0657f64182222a208511f97657b734a430eb8d24c6cf10b6a276ae3313d791938905abbc33387adc272725addc606a86f482
+AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-EBUILD plasma-workspace-5.17.5-r1.ebuild 6858 BLAKE2B 7115b9c493a4d5db004042b73eedfe0b91fbc88d100decf3cf94efb14c29ba6828896e7772bf0f1eeadd13419cd4f45b042f2fafc1021db4dbfaa60618c2834e SHA512 2df5bbbc37f0a370d857ae4f8295cca61409c63124f5f4a23f72fd834eb0d4706b7d9b5dc443e4ea7decf982198427af647bd7d28bcc788669c5707eaca09a10
-EBUILD plasma-workspace-5.18.5.ebuild 6894 BLAKE2B 5240f4375d20fa5f02d365b98b7a4359ccae30142f23cf748f68ff007c6cb620141d6b41df6cf19e985c9799269e0b412bda2b92f285199ebedf3b70540b2c6f SHA512 41b5490dcd371a47f6b07d5f452efe4310d67e652ca981c5c9c4fcdfd20d60d75c226060b7e956ed4e8679f815bd033eab87c341dcb4d9e0590dc1b0d4f397a5
+EBUILD plasma-workspace-5.18.5-r1.ebuild 7244 BLAKE2B 14e6f270b72f168e446df3fb8250ccfeb7b73432a2d723c24dde6848047d6290c1c6d51ec4e170877b34803f6e4aacc67c7ced1a37183b2e3386066bbde02ef5 SHA512 fa7287fe087844f55399406d01919438747020db920601d00696c6650feadada5468910d453e05e63ecbccfb19b50c736ce2e19d430660f85fada033bd854e51
+EBUILD plasma-workspace-5.18.5.ebuild 6987 BLAKE2B b17560d59293f948bbcca87a39f3770ec39a319d2d2f8b3df194a35191f068483d0c5e218594212fdaa4af5c954ae03f7fac454f9265bbc70badc681c06a4ca2 SHA512 4fab8614add4a4b0e457e0de49926e13b712a82dfdb4726c72ceaac104a7f1b509228194f5648411164e0dff4ec5283c44f0151b12d23a46a1e2a73203f53ba1
 MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
deleted file mode 100644
index 71d1ce4abb87..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 15 Oct 2019 18:33:45 +0200
-Subject: [PATCH 1/2] Fix Name conflict between plasma.desktop and
- plasmawayland.desktop
-
-Summary:
-SDDM until 0.18.1 appends " (Wayland)" to the name of any session file it
-finds in wayland-sessions dir, and Plasma is relying on that behaviour to
-distinguish between its X11 and Wayland sessions. This leads to duplicate
-"Plasma" entries on any other DM not applying the same hack, e.g. lightdm,
-and users are lost without downstream patching.
-
-SDDM in 0.19 only appends " (Wayland)" in case the session name does
-not already end with this, to avoid duplicating it.
-
-CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
-See also: https://github.com/sddm/sddm/pull/997
-
-Reviewers: #plasma, davidedmundson, fvogt, ngraham
-
-Reviewed By: #plasma, davidedmundson, fvogt, ngraham
-
-Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D22210
----
- login-sessions/plasmawayland.desktop.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake
-index 64f997ea4..3e9b46bc9 100644
---- a/login-sessions/plasmawayland.desktop.cmake
-+++ b/login-sessions/plasmawayland.desktop.cmake
-@@ -2,51 +2,7 @@
- Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
- TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
- DesktopNames=KDE
--Name=Plasma
--Name[ar]=بلازما
--Name[bs]=Plazma
--Name[ca]=Plasma
--Name[ca@valencia]=Plasma
--Name[cs]=Plasma
--Name[da]=Plasma
--Name[de]=Plasma
--Name[el]=Plasma
--Name[en_GB]=Plasma
--Name[es]=Plasma
--Name[et]=Plasma
--Name[eu]=Plasma
--Name[fi]=Plasma
--Name[fr]=Plasma
--Name[gl]=Plasma
--Name[he]=פלזמה
--Name[hu]=Plasma
--Name[id]=Plasma
--Name[is]=Plasma
--Name[it]=Plasma
--Name[ja]=プラズマ
--Name[ko]=Plasma
--Name[lt]=Plasma
--Name[nb]=Plasma
--Name[nds]=Plasma
--Name[nl]=Plasma
--Name[nn]=Plasma
--Name[pa]=ਪਲਾਜ਼ਮਾ
--Name[pl]=Plazma
--Name[pt]=Plasma
--Name[pt_BR]=Plasma
--Name[ru]=Plasma
--Name[sk]=Plasma
--Name[sl]=Plasma
--Name[sr]=Плазма
--Name[sr@ijekavian]=Плазма
--Name[sr@ijekavianlatin]=Plasma
--Name[sr@latin]=Plasma
--Name[sv]=Plasma
--Name[tr]=Plama
--Name[uk]=Плазма
--Name[x-test]=xxPlasmaxx
--Name[zh_CN]=Plasma
--Name[zh_TW]=Plasma
-+Name=Plasma (Wayland)
- Comment=Plasma by KDE
- Comment[ar]=بلازما كدي
- Comment[bs]=Plazma od strane KDe
--- 
-2.23.0
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch
deleted file mode 100644
index 114e653df8e1..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ea66bff2af8466f2bb5acafcc43ac8f79b1f447f Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Tue, 21 Jan 2020 11:55:49 +0100
-Subject: Also disable automatic scaling on Qt >= 5.14
-
-Summary:
-Applications which set `Qt::AA_EnableHighDpiScaling` use the DPI of the monitor the window is on to calculate an additional scaling factor.
-Plasma sets `QT_SCREEN_SCALE_FACTORS` in the environment for manual specification of per-monitor scale, which combined with the automatic scaling may result in double scaling.
-To disable the automatic scaling, `QT_AUTO_SCREEN_SCALE_FACTOR=0` has to be set, even on Qt 5.14.
-
-As a side effect, this works around QTBUG-80967 as well.
-
-BUG: 415421
-
-Test Plan: On X11, with a >144dpi monitor and a scaling factor of 2 set manually, scaling was doubled previously. Now it works as expected.
-
-Reviewers: #plasma, apol, davidedmundson, fvogt
-
-Reviewed By: #plasma, davidedmundson, fvogt
-
-Subscribers: acooligan, fvogt, asturmlechner, dfaure, davidedmundson, anthonyfieroni, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D26185
----
- startkde/startplasma.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index 8d88587..4a89878 100644
---- a/startkde/startplasma.cpp
-+++ b/startkde/startplasma.cpp
-@@ -222,11 +222,9 @@ void runEnvironmentScripts()
- 
- void setupPlasmaEnvironment()
- {
--#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-     //Manually disable auto scaling because we are scaling above
-     //otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
-     qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0");
--#endif
- 
-     qputenv("KDE_FULL_SESSION", "true");
-     qputenv("KDE_SESSION_VERSION", "5");
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
new file mode 100644
index 000000000000..7cbe139a1669
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
@@ -0,0 +1,94 @@
+From 68601675d13bdf44248991a56e888093e58c56c3 Mon Sep 17 00:00:00 2001
+From: Filip Fila <filipfila.kde@gmail.com>
+Date: Wed, 13 May 2020 18:08:27 +0200
+Subject: [sddm-theme] Prevent the logo from leaking in after a fadeout
+
+Summary:
+Even when the vendor logo is turned off it can be briefly seen when the login screen changes from the fadeout state back into normal.
+
+Comments in other code say that "OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)" so this patch replaces it with NumberAnimation.
+
+There's also a minor fix included - placing the drop shadow sooner in the hierarchy because it should be drawn underneath an object, not in front of it.
+
+Test Plan:
+Reduce the fadeout time to something small and then:
+
+`sddm-greeter --test-mode --theme /usr/share/sddm/themes/breeze`
+
+Reviewers: ngraham, cblack, #plasma, mart
+
+Reviewed By: ngraham, #plasma, mart
+
+Subscribers: mart, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D29351
+---
+ sddm-theme/Main.qml | 44 +++++++++++++++++++++++---------------------
+ 1 file changed, 23 insertions(+), 21 deletions(-)
+
+diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml
+index 6746238..9910e7f 100644
+--- a/sddm-theme/Main.qml
++++ b/sddm-theme/Main.qml
+@@ -411,26 +411,6 @@ PlasmaCore.ColorScope {
+             }
+         }
+ 
+-        Image {
+-            id: logo
+-            visible: config.showlogo == "shown"
+-            source: config.logo
+-            anchors.horizontalCenter: parent.horizontalCenter
+-            anchors.bottom: footer.top
+-            anchors.bottomMargin: units.largeSpacing
+-            asynchronous: true
+-            sourceSize.height: height
+-            opacity: loginScreenRoot.uiVisible ? 0 : 1
+-            fillMode: Image.PreserveAspectFit
+-            height: Math.round(units.gridUnit * 3.5)
+-            Behavior on opacity {
+-                OpacityAnimator {
+-                    duration: units.longDuration
+-                    easing.type: Easing.InOutQuad
+-                }
+-            }
+-        }
+-
+         DropShadow {
+             id: logoShadow
+             anchors.fill: logo
+@@ -444,7 +424,29 @@ PlasmaCore.ColorScope {
+             color: "black" // matches Breeze window decoration and desktopcontainment
+             opacity: loginScreenRoot.uiVisible ? 0 : 1
+             Behavior on opacity {
+-                OpacityAnimator {
++                //OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
++                NumberAnimation {
++                    duration: units.longDuration
++                    easing.type: Easing.InOutQuad
++                }
++            }
++        }
++
++        Image {
++            id: logo
++            visible: config.showlogo == "shown"
++            source: config.logo
++            anchors.horizontalCenter: parent.horizontalCenter
++            anchors.bottom: footer.top
++            anchors.bottomMargin: units.largeSpacing
++            asynchronous: true
++            sourceSize.height: height
++            opacity: loginScreenRoot.uiVisible ? 0 : 1
++            fillMode: Image.PreserveAspectFit
++            height: Math.round(units.gridUnit * 3.5)
++            Behavior on opacity {
++                // OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
++                NumberAnimation {
+                     duration: units.longDuration
+                     easing.type: Easing.InOutQuad
+                 }
+-- 
+cgit v1.1
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
new file mode 100644
index 000000000000..83539c14c043
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
@@ -0,0 +1,93 @@
+From 2958702524348e9e4fcbdf490be731e92b353dad Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 24 Mar 2020 08:10:54 -0600
+Subject: Stop multiplying duration values
+
+Summary:
+After D28144, some animations are now too long because they were inappropriately
+multiplying a duration value. That's no longer necessary, so let's remove the
+multiplication.
+
+Depends on D28144
+
+Test Plan: Various things that were a bit too slow before feel just right now
+
+Reviewers: #vdg, #plasma, cblack
+
+Reviewed By: #vdg, #plasma, cblack
+
+Subscribers: cblack, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D28238
+---
+ applets/devicenotifier/package/contents/ui/FullRepresentation.qml | 2 +-
+ applets/systemtray/package/contents/ui/ExpanderArrow.qml          | 2 +-
+ lookandfeel/contents/components/ActionButton.qml                  | 4 ++--
+ lookandfeel/contents/components/UserDelegate.qml                  | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
+index d15e47c..80b9c73 100644
+--- a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
++++ b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
+@@ -225,7 +225,7 @@ MouseArea {
+                     popupIconTimer.restart()
+                 }
+             }
+-            Behavior on height { NumberAnimation { duration: units.shortDuration * 3 } }
++            Behavior on height { NumberAnimation { duration: units.shortDuration } }
+         }
+     }
+ }
+diff --git a/applets/systemtray/package/contents/ui/ExpanderArrow.qml b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
+index 9baf654..729f56b 100644
+--- a/applets/systemtray/package/contents/ui/ExpanderArrow.qml
++++ b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
+@@ -37,7 +37,7 @@ PlasmaCore.ToolTipArea {
+         anchors.fill: parent
+         onClicked: root.expanded = !root.expanded
+ 
+-        readonly property int arrowAnimationDuration: units.shortDuration * 3
++        readonly property int arrowAnimationDuration: units.shortDuration
+ 
+         PlasmaCore.Svg {
+             id: arrowSvg
+diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
+index 9fbd2a8..7a66c56 100644
+--- a/lookandfeel/contents/components/ActionButton.qml
++++ b/lookandfeel/contents/components/ActionButton.qml
+@@ -44,7 +44,7 @@ Item {
+     opacity: activeFocus || containsMouse ? 1 : 0.85
+         Behavior on opacity {
+             PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
+-                duration: units.longDuration * 2
++                duration: units.longDuration
+                 easing.type: Easing.InOutQuad
+             }
+     }
+@@ -59,7 +59,7 @@ Item {
+         opacity: activeFocus || containsMouse ? (softwareRendering ? 0.8 : 0.15) : (softwareRendering ? 0.6 : 0)
+         Behavior on opacity {
+                 PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
+-                    duration: units.longDuration * 3
++                    duration: units.longDuration
+                     easing.type: Easing.InOutQuad
+                 }
+         }
+diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml
+index 8882e39..cdb55f1 100644
+--- a/lookandfeel/contents/components/UserDelegate.qml
++++ b/lookandfeel/contents/components/UserDelegate.qml
+@@ -72,7 +72,7 @@ Item {
+         Behavior on width { 
+             PropertyAnimation {
+                 from: faceSize
+-                duration: units.longDuration * 2;
++                duration: units.longDuration;
+             }
+         }
+         width: isCurrent ? faceSize : faceSize - units.largeSpacing
+-- 
+cgit v1.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
index 41f1e2d666a5..4662a7858bf0 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.64.0
+KFMIN=5.66.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
@@ -15,8 +15,8 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
 
@@ -92,6 +92,7 @@ COMMON_DEPEND="
 	qalculate? ( sci-libs/libqalculate:= )
 	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -105,6 +106,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-apps/kio-extras-19.04.3:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
 	>=kde-frameworks/kdesu-${KFMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-plasma/ksysguard-${PVCUT}:5
@@ -123,9 +125,13 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-	"${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch"
-	"${FILESDIR}/${P}-disable-autoscaling-on-qt-5.14.patch"
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" # downstream patch
+
+	"${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
+
+	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backport):
+	# https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
+	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
 )
 
 RESTRICT+=" test"
@@ -182,6 +188,7 @@ src_configure() {
 		$(cmake_use_find_package qalculate Qalculate)
 		$(cmake_use_find_package qrcode KF5Prison)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
 	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
@@ -201,7 +208,7 @@ src_install() {
 	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
 }
 
-pkg_postinst() {
+pkg_postinst () {
 	ecm_pkg_postinst
 
 	# Clean up pre-5.17.4 scripts
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
index c71af205dabb..d4db44181265 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
@@ -124,7 +124,11 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" # downstream patch
+
+	"${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
+)
 
 RESTRICT+=" test"