gentoo resync : 25.11.2020

12 files changed, 41 insertions, 788 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index c9af113e7ffa..a8c35a9ca566 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,15 +1,7 @@
-AUX plasma-desktop-5.18.4.1-synaptics-header.patch 821 BLAKE2B 96cbad72391a1d361b009b25362980c8b0ec3e583368ffc4d599b73289e6e6228afc65d08236d704af8878c6b21a9bd1a15f3fad952855d88bc660f73feb9bf4 SHA512 02cf404a9bce33e689f40597d35afb1ca3625e7caaf775a50ed70217bd8034f842001a16e1084bf81bba9dff0361a4e57a6e08853beb7d90216bf1519d305516
-AUX plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch 1058 BLAKE2B 668605a0994577bef4eb2308846d8f2e403b6546f22f9d5c05f83717abd5e27e137b199376927367227d0cad593b3d7bef859ec3791a3013bca46c930a27d459 SHA512 386c35e1f77f68ce81013d7fa7ecbe8f240ffd16507dd501eb4f9950902d21cfcc7d239b4210ac5b700a9ed59fa45799daf3ac2a5d53251a02b940df53841b28
-AUX plasma-desktop-5.18.5-animate-column-moves.patch 1133 BLAKE2B 20ae4b0e2188483a8a391ef58865b25c0d6d45019c3a3cfd9f93264b8713a9165a1316f4634909964c7348e1fe6c22ace385a7a74d33aa455fe61209d9276959 SHA512 dcedab90dd0e6cebef4a87a8a8aab3163ed268dd3d5c3223b2bba09edafc184ea8dfd04de202458c1f9789f78580b949976a51fd75e37bfb2e4097968be26703
-AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf5158c33ad58e275a926ea441a90008f8e2a7fc1c175e2b38e72f06d754b131a47f1cf5ef3d2268630816b1a60090c9bab44198ff37b0 SHA512 f81e84c56ddd5591ba59beb1d12654403bef5fd1bb6c51f8d6c404e36ca47cc7fa82a575892627be8aed465253830d3e76c2c89ed6db8ea858b9d705df08184b
-AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
-AUX plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch 6390 BLAKE2B fb0f4c70c94dc583745f92d14f4cb479d71da7c115f58d187ae6931c2dd3435abcfe9c2b773fc851f44fe605f47e2242d801da18a23f7943c025a901da8f28ee SHA512 d5f3820ee21422d46112bd9635bd65ce11068f9cf3bb14cd23c0050f35256b09344d934534794685997e8daeaae709c81e53b5b6ad54e7ecd709c6e5624be040
-AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
 AUX plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch 980 BLAKE2B b7b9cb993d7209182f92fa1924e28b66aadeca88eab3ceb98db1edea10c9d2fe65128cf0f019791478a270d645d6bbd9115a9a9372c6d4e63c8806b5bc06029f SHA512 e184cfaec2910a7389309e43c1f550c48de6b2c6c23a522a1c8bd5f6087fc57b2f3533e6b862d5801aa97f1eee8cc22ea0c4e415b44bef873f612ee039aefdb0
-DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
 DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
+DIST plasma-desktop-5.20.3.tar.xz 15887428 BLAKE2B 198b84ee3c4458e2b0b89e2133175fcbe831ef996195e5a99a6a3820e3aa9419a83ddbce66efaf04613e31645d17155f9be798e2f00af3f14e4b9be0c4618e18 SHA512 e639db19e9bee488ed798c4027cfccf2402597f3bab7f114cb21d24f02710a6129b270d8bdec07d8c0d22d82f9123ea3b39edb304e31f8c7530277b08103acc0
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
-EBUILD plasma-desktop-5.18.5-r1.ebuild 4865 BLAKE2B 87cf5b0e69bda73c0241cb0059e92b2344a87e625479201b683f20edc96f295dc5e80dfc46b234b5a513721d368c53d26d7df56425a434ee41adad44dc46dec5 SHA512 3290f48cf99c6810874e8c152d171770e57ee8d1400a2acb8d67046dab374c33c2ef2d454464e642b0a1f372742f8d79c9f26af2c4f49be31aab7640386edf46
-EBUILD plasma-desktop-5.18.5-r2.ebuild 4935 BLAKE2B 1334ac02567ae7992a6a8b7f7b94cf54348df407dbe4ef5130dd76bf2df43bcf66949105dfd23ac49aecfd55d63fbdea1026edf43d48d9fc5966fc0ead46ed89 SHA512 a5686e7f768aa87e67b6abbcb20478954027e63d5cea5cd9d545e9ac5699ec1be029d8badad7250b00aab12621b005c196a0b8d64c43b15252e13caaa4c51534
-EBUILD plasma-desktop-5.19.5.ebuild 4717 BLAKE2B 6a1fe126b3d55789ed56d0c1c3c1074793d18a2971b91d5960ac0346f626be2e9d934e9571ba9d9cd52e3e95b5ce62c08bcb940c792f51bf4a12e0d5ff5ed33f SHA512 80430feece9661d318b53258e63e28c10d6c39690c37354d7f05f0918e4e6193ec887f43cb816dac15e881103327a538f512bacab63212d594bb5cf32e1eb721
-MISC metadata.xml 540 BLAKE2B 3953467f0fea68209d7b5cbb5f5d23bc1b1aadf0e88ec5dfc28d688f7d68e560fda165330da32940bbf43d82f6f7bc178451977870cf3e2e69f4159e4c2018d8 SHA512 5d48a9f5bd4e990a52eaa894e3572bfa66d966a0665b495a5539484cb29f6a2a4f81193c80556cf712a76e3661ac575bc582276be22acc3817e7758e727065a1
+EBUILD plasma-desktop-5.19.5.ebuild 4714 BLAKE2B 907055b17edd13e279b51463352301b5397b34b189d060f53df1f1394004a726a3127923736df58bc134833aff3cd157fbc95ccca73a4b5b12b0dbaf0728d10d SHA512 66229eab5329c3fdc40018d036dc8bd2d7882a087729c4ea81be2288a1dfe0235a70aad78bbf29ec81fb34ff4d0d5b19f7ba7c2527df62fbd4beb5ee2a0eeb95
+EBUILD plasma-desktop-5.20.3.ebuild 4793 BLAKE2B b772fd355e085abfce81860ef47e3fc9509fa0895f3c12686f9100f35f9045d5197c8c27080d4645f5789d6899926bd80043691663cdbec7db07b96481ff6ac5 SHA512 b7ee5193f07b719f7b3a531fb7290e6a73824b4dd80084e10c29f4416cc42bdf9cab57061b49d60041643d91f364552d6c2ef82e7ff34fd944eb8f802b52ba63
+MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
deleted file mode 100644
index 181e89e7db38..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 24 Apr 2020 18:55:30 +0200
-Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
- dir from include
-
----
- kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-index d2f41d70b..3eb3171ee 100644
---- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-+++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-@@ -53,7 +53,7 @@
- 
- #include <stddef.h>
- #include <limits.h>
--#include <xorg/synaptics-properties.h>
-+#include <synaptics-properties.h>
- 
- #define SYN_MAX_BUTTONS 12
- 
--- 
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
deleted file mode 100644
index 17db7fc5b516..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2c46f28170c785f04fa396803037a608c8077025 Mon Sep 17 00:00:00 2001
-From: Matej Mrenica <matejm98mthw@gmail.com>
-Date: Wed, 6 May 2020 07:50:01 -0600
-Subject: Fix blurry icons in KColorSchemeEditor
-
-Summary:
-When using fractional scaling, bottom icons are blurred. This patch fixes the issue.
-
-BUG: 418165
-
-Test Plan:
-No side effects.
-
-Before:
-{F8289358}
-After:
-{F8289369}
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29481
----
- kcms/colors/editor/kcolorschemeeditor.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kcms/colors/editor/kcolorschemeeditor.cpp b/kcms/colors/editor/kcolorschemeeditor.cpp
-index 774d66e..03caa51 100644
---- a/kcms/colors/editor/kcolorschemeeditor.cpp
-+++ b/kcms/colors/editor/kcolorschemeeditor.cpp
-@@ -28,6 +28,8 @@
- 
- int main(int argc, char* argv[])
- {
-+    // Fixes blurry icons with fractional scaling
-+    QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-     QApplication app(argc, argv);
- 
-     KAboutData aboutData(
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
deleted file mode 100644
index d7603e434a69..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3a6795548fd755121084b6a77f9de23bece8f534 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 17 Jan 2020 14:41:47 +0000
-Subject: [widgetexplorer] Animate column moves
-
-Test Plan:
-Search for something in the second column
-Now it doesn't jump
-
-Reviewers: #plasma, ngraham
-
-Reviewed By: ngraham
-
-Subscribers: ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D26699
----
- desktoppackage/contents/explorer/WidgetExplorer.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index 1d98e59..56a0c22 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -326,7 +326,7 @@ Item {
-             //moved due to filtering
-             displaced: Transition {
-                 NumberAnimation {
--                    properties: "y"
-+                    properties: "x,y"
-                     duration: units.shortDuration * 3
-                 }
-             }
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch
deleted file mode 100644
index 115d52423fbf..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 82e7a6b68d81ca2be0fdc3fc13cd5ca5f5e03e81 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 7 May 2020 16:18:13 +0200
-Subject: [PATCH] Add FindXorgServer.cmake and use it for touchpad KCM
-
-Summary:
-x11 backend of the touchpad KCM uses xserver-properties.h that is part of
-xorg-server package. As XORG_INCLUDE_DIRS seems to be empty, so far, it was
-relying on Synaptics_INCLUDE_DIRS implicitly and worked only if the header
-happened to be in the same directory as Synaptics' which is the case most of
-the time.
-
-FindXorgServer.cmake is just a copy of FindXorgLibinput, adapted accordingly.
-
-Test Plan:
-Pointed Synaptics_INCLUDE_DIRS somewhere else than /usr/include/xorg and build
-succeeded.
-
-Reviewers: #plasma, zzag
-
-Reviewed By: #plasma, zzag
-
-Subscribers: broulik, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29514
----
- CMakeLists.txt                     |  4 +++
- cmake/modules/FindXorgServer.cmake | 45 ++++++++++++++++++++++++++++++
- kcms/CMakeLists.txt                |  2 +-
- kcms/touchpad/src/backends/x11.cmake   |  2 +-
- 4 files changed, 51 insertions(+), 2 deletions(-)
- create mode 100644 cmake/modules/FindXorgServer.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbdd95433..64e8bbd60 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,6 +133,10 @@ find_package(Synaptics)
- set_package_properties(Synaptics PROPERTIES TYPE OPTIONAL)
- add_feature_info("Synaptics" SYNAPTICS_FOUND "Synaptics libraries needed for touchpad KCM")
- 
-+find_package(XorgServer)
-+set_package_properties(XorgServer PROPERTIES TYPE OPTIONAL)
-+add_feature_info("XorgServer" XORGSERVER_FOUND "XServer header needed for touchpad KCM (X11 backend)")
-+
- find_package(XorgLibinput)
- set_package_properties(XorgLibinput PROPERTIES TYPE OPTIONAL)
- add_feature_info("XorgLibinput" XORGLIBINPUT_FOUND "Libinput driver headers needed for mouse and touchpad KCM")
-diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
-new file mode 100644
-index 000000000..5248c6d25
---- /dev/null
-+++ b/cmake/modules/FindXorgServer.cmake
-@@ -0,0 +1,45 @@
-+# - Find xorg-server's headers.
-+# This module defines the following variables:
-+#
-+#  XORGSERVER_FOUND        - true if xserver was found
-+#  XORGSERVER_INCLUDE_DIRS - include path for xserver
-+#  There are no libraries, just a header file
-+#
-+# Copyright (c) 2020 Andreas Sturmlechner <asturm@gentoo.org>
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+# 1. Redistributions of source code must retain the above copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. Neither the name of the University nor the names of its contributors
-+#    may be used to endorse or promote products derived from this software
-+#    without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+# SUCH DAMAGE.
-+
-+find_package(PkgConfig)
-+pkg_check_modules(PC_XORGSERVER xorg-server)
-+
-+find_path(XORGSERVER_INCLUDE_DIRS
-+    NAMES xserver-properties.h
-+    HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
-+
-+mark_as_advanced(XORGSERVER_INCLUDE_DIRS)
-diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
-index 7ab966e8e..ce730f537 100644
---- a/kcms/CMakeLists.txt
-+++ b/kcms/CMakeLists.txt
-@@ -58,7 +58,7 @@ if(X11_Xcursor_FOUND)
-     add_subdirectory(cursortheme)
- endif()
- 
--if (SYNAPTICS_FOUND AND X11_Xinput_FOUND)
-+if (XORGSERVER_FOUND AND SYNAPTICS_FOUND AND X11_Xinput_FOUND)
-     add_subdirectory(touchpad)
- endif()
- 
-diff --git a/kcms/touchpad/src/backends/x11.cmake b/kcms/touchpad/src/backends/x11.cmake
-index 9248eff7c..8a584e939 100644
---- a/kcms/touchpad/src/backends/x11.cmake
-+++ b/kcms/touchpad/src/backends/x11.cmake
-@@ -11,7 +11,7 @@ endif()
- include_directories(${X11_Xinput_INCLUDE_PATH}
-                     ${X11_X11_INCLUDE_PATH}
-                     ${Synaptics_INCLUDE_DIRS}
--                    ${XORG_INCLUDE_DIRS}
-+                    ${XORGSERVER_INCLUDE_DIRS}
- )
- 
- SET(backend_SRCS
--- 
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
deleted file mode 100644
index cc39c1e46488..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 977665254990892411c74e8a04a8fdb10ef68547 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 17 Jan 2020 14:41:42 +0000
-Subject: [widgetexplorer] Fix animate in animation
-
-Summary:
-The animation in comes in from offscreen on the left.
-
-"to: 0" was correct when we had one column. With the 2 column view it
-means we animate two items on top of each other and jump when the
-animation completes. We want to animate to the final position the item
-will end up in.
-
-It bugs me more than it probably should.
-
-Test Plan:
-Search for "asdfasdfsadfsadf"
-Remove search
-Animation now looks ok, instead of horrific
-
-Reviewers: #plasma, ngraham
-
-Reviewed By: ngraham
-
-Subscribers: ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D26698
----
- desktoppackage/contents/explorer/WidgetExplorer.qml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index b7bbce8..1d98e59 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -305,9 +305,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     from: -list.width
--                    to: 0
-                     duration: units.shortDuration * 3
--
-                 }
-             }
- 
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch
deleted file mode 100644
index bae49609e52f..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From e5e5f5ed51aadfac99bfbdf3d2db5be16a12443b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Mon, 10 Aug 2020 13:50:36 +0200
-Subject: [PATCH] kcm_fonts: Make the font selection dialog select the correct
- "Regular"-like style
-
-Due to KConfig dropping QFont styleName property (for "Regular"-like font
-styles, see [1] for more details), the font selection dialog invoked by the
-KCM could end up selecting the wrong style; this change sets the appropriate
-"Regular" style on the QFont object before invoking the font selection dialog
-to fix/workaround the issue.
-
-Note that in Plasma master branch the issue is handled differently, since
-we switched from QFontDialog to KFontChooserDialog (the latter has that
-logic built-in).
-
-[1] https://phabricator.kde.org/D27735
-
-CCBUG: 420287
----
- kcms/fonts/fonts.cpp                          | 61 +++++++++++++++++--
- kcms/fonts/fonts.h                            |  1 +
- kcms/fonts/package/contents/ui/FontWidget.qml |  7 +--
- kcms/fonts/package/contents/ui/main.qml       |  4 +-
- 4 files changed, 61 insertions(+), 12 deletions(-)
-
-diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
-index f771f6e51..c2ccdf777 100644
---- a/kcms/fonts/fonts.cpp
-+++ b/kcms/fonts/fonts.cpp
-@@ -53,23 +53,50 @@
- /**** DLL Interface ****/
- K_PLUGIN_FACTORY_WITH_JSON(KFontsFactory, "kcm_fonts.json", registerPlugin<KFonts>();)
- 
-+// If the styleName property is empty, then we want to set it to
-+// the "Regular"-like style provided by the font, so that the font
-+// selection dialog selects the correct style from the available styles
-+// list; for more details see:
-+// https://phabricator.kde.org/D27735 and https://phabricator.kde.org/D27785
-+static QFont setRegularFontStyle(const QFont &font)
-+{
-+    if (!(font.styleName().isEmpty() && font.weight() == QFont::Normal)) {
-+        return font;
-+    }
-+
-+    QFont f(font);
-+    QFontDatabase fdb;
-+    const QStringList styles = fdb.styles(f.family());
-+    for (const QString &s : styles) {
-+        if (s == QLatin1String("Regular")
-+            || s == QLatin1String("Normal")
-+            || s == QLatin1String("Book")
-+            || s == QLatin1String("Roman")) {
-+            f.setStyleName(s);
-+            return f;
-+        }
-+    }
-+    return font;
-+}
-+
- //from KFontRequester
- // Determine if the font with given properties is available on the system,
- // otherwise find and return the best fitting combination.
- static QFont nearestExistingFont(const QFont &font)
- {
--    QFontDatabase dbase;
-+    QFont _font = setRegularFontStyle(font);
- 
-+    QFontDatabase dbase;
-     // Initialize font data according to given font object.
--    QString family = font.family();
--    QString style = dbase.styleString(font);
--    qreal size = font.pointSizeF();
-+    QString family = _font.family();
-+    QString style = dbase.styleString(_font);
-+    qreal size = _font.pointSizeF();
- 
-     // Check if the family exists.
-     const QStringList families = dbase.families();
-     if (!families.contains(family)) {
-         // Chose another family.
--        family = QFontInfo(font).family(); // the nearest match
-+        family = QFontInfo(_font).family(); // the nearest match
-         if (!families.contains(family)) {
-             family = families.count() ? families.at(0) : QStringLiteral("fixed");
-         }
-@@ -614,6 +641,30 @@ bool KFonts::isDefaults() const
-     return m_fontAASettings->isDefaults();
- }
- 
-+void KFonts::adjustFont(const QFont &font, const QString &category)
-+{
-+    QFont _font = setRegularFontStyle(font);
-+
-+    bool ok = false;
-+    QFont selFont = QFontDialog::getFont(&ok, _font, nullptr, i18n("Select Font"));
-+
-+    if (ok && !m_settings->isImmutable(category)) {
-+        if (category == QLatin1String("font")) {
-+            m_settings->setFont(selFont);
-+        } else if (category == QLatin1String("menuFont")) {
-+            m_settings->setMenuFont(selFont);
-+        } else if (category == QLatin1String("toolBarFont")) {
-+            m_settings->setToolBarFont(selFont);
-+        } else if (category == QLatin1String("activeFont")) {
-+            m_settings->setActiveFont(selFont);
-+        } else if (category == QLatin1String("smallestReadableFont")) {
-+            m_settings->setSmallestReadableFont(selFont);
-+        } else if (category == QLatin1String("fixed")) {
-+            m_settings->setFixed(selFont);
-+        }
-+    }
-+}
-+
- void KFonts::adjustAllFonts()
- {
-     QFont font = m_settings->font();
-diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h
-index 51ed2ab60..5959e1995 100644
---- a/kcms/fonts/fonts.h
-+++ b/kcms/fonts/fonts.h
-@@ -153,6 +153,7 @@ public Q_SLOTS:
-     void save() override;
-     void defaults() override;
-     Q_INVOKABLE void adjustAllFonts();
-+    Q_INVOKABLE void adjustFont(const QFont &font, const QString &category);
- 
- Q_SIGNALS:
-     void fontsHaveChanged();
-diff --git a/kcms/fonts/package/contents/ui/FontWidget.qml b/kcms/fonts/package/contents/ui/FontWidget.qml
-index b62dd3bf4..5a6be5128 100644
---- a/kcms/fonts/package/contents/ui/FontWidget.qml
-+++ b/kcms/fonts/package/contents/ui/FontWidget.qml
-@@ -57,11 +57,8 @@ FocusScope {
-             Kirigami.MnemonicData.enabled: false
-             focus: true
-             onClicked: {
--                fontDialog.adjustAllFonts = false;
--                fontDialog.currentCategory = root.category
--                fontDialog.font = root.font;
--                fontDialog.currentFont = root.font;
--                fontDialog.open()
-+                fontDialog.adjustAllFonts = false
-+                kcm.adjustFont(root.font, root.category)
-             }
-             QtControls.ToolTip {
-                 visible: parent.hovered
-diff --git a/kcms/fonts/package/contents/ui/main.qml b/kcms/fonts/package/contents/ui/main.qml
-index 4a99c043a..e51fb21ba 100644
---- a/kcms/fonts/package/contents/ui/main.qml
-+++ b/kcms/fonts/package/contents/ui/main.qml
-@@ -264,9 +264,9 @@ KCM.SimpleKCM {
-                 property bool adjustAllFonts: false
-                 onAccepted: {
-                     if (adjustAllFonts) {
--                        kcm.adjustAllFonts(font);
-+                        kcm.adjustAllFonts()
-                     } else {
--                        kcm.fontsSettings[currentCategory] = font;
-+                        kcm.adjustFont(font, currentCategory)
-                     }
-                 }
-             }
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
deleted file mode 100644
index 593665a53c58..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From f3bbc0ba0e34ea1b34b106228c02d85865ed904a Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 24 Mar 2020 08:15:12 -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
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D28239
----
- applets/taskmanager/package/contents/ui/Task.qml             | 2 +-
- applets/taskmanager/package/contents/ui/TaskList.qml         | 2 +-
- desktoppackage/contents/configuration/PanelConfiguration.qml | 4 ++--
- desktoppackage/contents/explorer/WidgetExplorer.qml          | 6 +++---
- toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml       | 6 +++---
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml
-index 2bf8b88..9683fab 100644
---- a/applets/taskmanager/package/contents/ui/Task.qml
-+++ b/applets/taskmanager/package/contents/ui/Task.qml
-@@ -293,7 +293,7 @@ MouseArea {
-         Timer {
-             id: timer
- 
--            interval: units.longDuration * 2
-+            interval: units.longDuration
-             repeat: false
- 
-             onTriggered: {
-diff --git a/applets/taskmanager/package/contents/ui/TaskList.qml b/applets/taskmanager/package/contents/ui/TaskList.qml
-index 594420b..6d6bc45 100644
---- a/applets/taskmanager/package/contents/ui/TaskList.qml
-+++ b/applets/taskmanager/package/contents/ui/TaskList.qml
-@@ -34,7 +34,7 @@ Flow {
-             NumberAnimation {
-                 properties: "x, y"
-                 easing.type: Easing.OutQuad
--                duration: units.longDuration * 2
-+                duration: units.longDuration
-             }
- 
-             PropertyAction { target: taskList; property: "animating"; value: false }
-diff --git a/desktoppackage/contents/configuration/PanelConfiguration.qml b/desktoppackage/contents/configuration/PanelConfiguration.qml
-index 0e11a96..33e3fbc 100644
---- a/desktoppackage/contents/configuration/PanelConfiguration.qml
-+++ b/desktoppackage/contents/configuration/PanelConfiguration.qml
-@@ -103,7 +103,7 @@ PlasmaCore.FrameSvgItem {
-                     return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - panel.distance
-                 }
-             }
--            duration: units.shortDuration * 3
-+            duration: units.shortDuration
-         }
- 
-         NumberAnimation {
-@@ -122,7 +122,7 @@ PlasmaCore.FrameSvgItem {
-                     return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - configDialog.height - panel.distance
-                 }
-             }
--            duration: units.shortDuration * 3
-+            duration: units.shortDuration
-         }
-     }
- //END Animations
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index 1648708..e26cc40 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -306,7 +306,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     from: -list.width
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-@@ -315,7 +315,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     to: list.width
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-@@ -328,7 +328,7 @@ Item {
-             displaced: Transition {
-                 NumberAnimation {
-                     properties: "x,y"
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-index 06524c3..eb6b190 100644
---- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-+++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-@@ -54,14 +54,14 @@ Item {
-     }
-     Behavior on rotation {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
-     }
-     Behavior on x {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
-@@ -69,7 +69,7 @@ Item {
-     }
-     Behavior on y {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 49d2b2bec6af..e50b5d2d8301 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -8,6 +8,8 @@
 	<use>
 		<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
+		<flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
+		<flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
deleted file mode 100644
index 5fa672f9e019..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+fontconfig ibus scim +semantic-desktop"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
-	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-
-	"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
-	"${FILESDIR}/${P}-fix-fonts-kcm-w-kf-5.68.patch" # in Plasma/5.18
-
-	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backports):
-	# 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}-fix-animate-in-animation.patch"
-	"${FILESDIR}/${P}-animate-column-moves.patch"
-	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fontconfig Fontconfig)
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package ibus IBus)
-		$(cmake_use_find_package scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
index da3b4ac5fc3f..c3f9e924568f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="emoji +fontconfig ibus scim +semantic-desktop"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.3.ebuild
index 9e8cddfd2285..898aae1b2615 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.3.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,9 +17,10 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+fontconfig ibus scim +semantic-desktop"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
+BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -48,7 +49,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/kded-${KFMIN}:5
 	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
@@ -63,7 +63,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
@@ -72,19 +71,18 @@ COMMON_DEPEND="
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	>=kde-plasma/kwin-${PVCUT}:5
 	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
+	>=media-libs/phonon-4.11.0
 	x11-libs/libX11
-	x11-libs/libXcursor
 	x11-libs/libXfixes
 	x11-libs/libXi
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbfile
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
 	)
 	ibus? (
 		app-i18n/ibus
@@ -93,15 +91,20 @@ COMMON_DEPEND="
 		x11-libs/libxcb
 		x11-libs/xcb-util-keysyms
 	)
+	kaccounts? (
+		kde-apps/kaccounts-integration:5
+		net-libs/accounts-qt
+	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
 "
 RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kdeplasma-addons-5.15.80
+	!kde-plasma/user-manager
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
@@ -111,34 +114,39 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-plasma/oxygen-${PVCUT}:5
 	sys-apps/util-linux
 	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
+	kaccounts? ( net-libs/signon-oauth2 )
+	policykit? ( sys-apps/accountsservice )
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
-	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+)
 
-	"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
+src_prepare() {
+	ecm_src_prepare
 
-	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backports):
-	# 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}-fix-animate-in-animation.patch"
-	"${FILESDIR}/${P}-animate-column-moves.patch"
-	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
+	use policykit || cmake_run_in kcms cmake_comment_add_subdirectory users
+
+	if ! use ibus; then
+		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package fontconfig Fontconfig)
 		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package ibus IBus)
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
 		$(cmake_use_find_package scim SCIM)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
+	if ! use emoji && ! use ibus; then
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
+	fi
 
 	ecm_src_configure
 }