gentoo Easter resync : 12.04.2020

25 files changed, 343 insertions, 140 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 3c4114e9c5eb..ca3e89c00478 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index ef752e47c464..b9f7f7ab5c1f 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,4 +1,5 @@
+AUX basket-2.49b-libgit2-0.99-compat.patch 1598 BLAKE2B c8938b905715cff5e69147463d7f8c17da69b8bee2fc04e98d06da33f27fd57c6589814321c17a39c803f3f1a923d82aab084c3bbe7c45419e5b05d75e7c4f1c SHA512 756aad2a59668aa605fbb438aa859b4f4c59affe859635bd4962e47f003461df57ab500c5b7ad460f8c450f95b2da917c04ea9bf7cb1e8b3a49db47f5fd304b8
 AUX basket-2.49b-xdg_mime_install_dir.patch 1429 BLAKE2B cc1177ec5d9675d2a85c81bcbee77b02ee1fcf11f9d609e7298d4b1c067c07c818fe18d2d1aaa1fc0c159fa5fc7a2d84322eddbd82eff2dddedd81b446a01879 SHA512 224c3dae19c80ae8f0826f2bee6429391998c3baadf708aac3353ca0962646de595d9498e003b1d9d87a9e321858dc43de39a9f0866e4894791a05b28fde05f6
 DIST basket-2.49b.tar.gz 4686990 BLAKE2B 6915d673abae6902bd2a0073a88cdf5bc497a7e7eec47dc87dbafcce68915e55bb02505c81a24cc00ed081e60b4c135afd337c6c4d08843182175f42c39e9119 SHA512 70d4241928712a7366cbc592e414864896cfb27bea251e5e4d3606b34534a932d7c208f98a8f48b49c11234c52f78d9003ca00af979e61112dbe139627e6f134
-EBUILD basket-2.49b.ebuild 2062 BLAKE2B b755ccdd8b5d4b269f2a599aa04d69c284a643f4861093b84d1779e8410d80c0a14ff21bbe01f87c3b4f637b2e9fbef4d19005bb8211a7ba6f673dc17cfa481e SHA512 fa22847582a6c648f7d084f14702d34bb4987d6c7547816cba1e6db93fa484af9c4a0426bf467e65455100b0a35e26294c95fdf4fdcda65fc3bb5b367a3d9f72
+EBUILD basket-2.49b.ebuild 2123 BLAKE2B 53cd3b4993893c1d5d4d2d35d27ec9a1f80f479431af7bc5b8a0739e5b1bc739671632e4613c079fb6502a2c620b4bb7abbfd8c70bb920996f03cf9d5458e8e8 SHA512 8d837ba2048a9176a3b2be7a6bb10d25ae161e1a8758d94eed617370d3051bf135127279e63666368ce3d79249d9ad2eb71212d5fc2821c299a56d3962a8c18a
 MISC metadata.xml 336 BLAKE2B 0a9704885fd7a47cb2b0b01f51baf34c3cfac7eefcfb06c4328d83aa51b4909e5ad20a29ffc7df79df38d01d1a86e37ece806a0f905714eb0e86a29f12e2aade SHA512 8c2e68454f9153eefec98b4c918de8390de6e3384b0d3339b64bcbe54592e582c933a372852444f031fe0574e4d1ad3e4b6fcd80fe9f610cd6624e13eaec3eb0
diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild
index 6a9fcbf3e6a7..bbcfe4d1009e 100644
--- a/kde-misc/basket/basket-2.49b.ebuild
+++ b/kde-misc/basket/basket-2.49b.ebuild
@@ -57,7 +57,10 @@ DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-xdg_mime_install_dir.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-xdg_mime_install_dir.patch"
+	"${FILESDIR}/${P}-libgit2-0.99-compat.patch" # bug #710832
+)
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
new file mode 100644
index 000000000000..d1051af86acf
--- /dev/null
+++ b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
@@ -0,0 +1,48 @@
+From 090ac46912025f94aca710355e51a8154df36a56 Mon Sep 17 00:00:00 2001
+From: Niccol Venerandi <niccolo@venerandi.com>
+Date: Wed, 11 Mar 2020 18:46:07 +0100
+Subject: [PATCH 1/2] Added support for libgit>=.99
+
+Summary: LIBGIT2_SOVERSION no longer returns an integer in libgit>=.99; this adds support for that version and 1.0 to come.
+
+Differential Revision: https://phabricator.kde.org/D27990
+
+
+From 9a02338bfa60336b7349ff8ac1f85793515ff0e3 Mon Sep 17 00:00:00 2001
+From: Niccol Venerandi <niccolo@venerandi.com>
+Date: Thu, 12 Mar 2020 10:53:05 +0100
+Subject: [PATCH 2/2] LIBGIT_VER_MINOR is supposed to be LIBGIT2_VER_MINOR
+
+Reviewers: ognarb
+
+Reviewed By: ognarb
+
+Differential Revision: https://phabricator.kde.org/D28001
+---
+ src/application.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/application.cpp b/src/application.cpp
+index c52fb57..b673848 100644
+--- a/src/application.cpp
++++ b/src/application.cpp
+@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv)
+ 
+ 
+     #ifdef WITH_LIBGIT2
+-        #if LIBGIT2_SOVERSION >= 22
++        #if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 22)
+             git_libgit2_init();
+         #else
+             git_threads_init();
+@@ -67,7 +67,7 @@ Application::Application(int &argc, char **argv)
+ Application::~Application()
+ {
+     #ifdef WITH_LIBGIT2
+-        #if LIBGIT2_SOVERSION >= 22
++        #if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 22)
+             git_libgit2_shutdown();
+         #else
+             git_threads_shutdown();
+-- 
+2.26.0
diff --git a/kde-misc/kanyremote/Manifest b/kde-misc/kanyremote/Manifest
deleted file mode 100644
index 0edd01e1b7a3..000000000000
--- a/kde-misc/kanyremote/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kanyremote-6.4.tar.gz 316922 BLAKE2B ddcb10c47c41754be1f8e898ff8f8c229b6e1bec4c438b0f4e6a0b5922d50637650c1dcf6a7aade5b6d5655c3627439d7dd302ed7fb34c673914f776b22d3423 SHA512 a6a45bf1f086055e290238b899b5e9cd1ba47aa5b500a9036ea09750ada1fa4ded3105f6843188f0e8f1687ff4e6cf8f712e300dd303b0e5af3c2d67c103060d
-EBUILD kanyremote-6.4.ebuild 1357 BLAKE2B ab3f2e89a64a23e0af135d009ec52ab4e36dadd35f89a117d87cc741c2d07e77e123fef998fb60fe9ff27cb6f05e2351685a5e097d4719fc7f90315e768fbe9d SHA512 5bd52e994443fddddf57bdcaa9ff65085d68f68b289ba154c6f767675d33ce460a2c76be3a65585189ce90ad27dc90f4bbdfa919914002ea2d5b7707e8c4bbb0
-MISC metadata.xml 328 BLAKE2B 3970763caf1133865ce0362b6e41d457702560e557356439feaee63a29797bb3845c3814694e7e3c94758e358e99f50790464b7dafabdd2c3112c3135f7048a1 SHA512 fa3c1cf2928d4195ec4fd202220b370619c8e25d4056e9bcf730a1ae90febf59c51e80d3b26dccb702717ee24be1553e241cf9731fd8bdbfa8662a32333b5ef4
diff --git a/kde-misc/kanyremote/kanyremote-6.4.ebuild b/kde-misc/kanyremote/kanyremote-6.4.ebuild
deleted file mode 100644
index 3e05daa538cc..000000000000
--- a/kde-misc/kanyremote/kanyremote-6.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-r1
-
-DESCRIPTION="KDE frontend to Anyremote"
-HOMEPAGE="http://anyremote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/anyremote/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="bluetooth"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-mobilephone/anyremote-6.5[bluetooth?]
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_prepare() {
-	# using gettextize no-interactive example from dev-util/bless package
-	cp $(type -p gettextize) "${T}"/ || die
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
-	"${T}"/gettextize -f --no-changelog > /dev/null || die
-
-	# remove deprecated entry
-	sed -e "/Encoding=UTF-8/d" \
-		-i kanyremote.desktop || die "fixing .desktop file failed"
-
-	# fix documentation directory wrt bug #316087
-	sed -i "s/doc\/${PN}/doc\/${PF}/g" Makefile.am || die
-	eautoreconf
-
-	# disable bluetooth check to avoid errors
-	if ! use bluetooth ; then
-		sed -e "s/usepybluez    = True/usepybluez    = False/" -i kanyremote || die
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	python_replicate_script "${D}"/usr/bin/kanyremote
-}
diff --git a/kde-misc/kanyremote/metadata.xml b/kde-misc/kanyremote/metadata.xml
deleted file mode 100644
index 004eed28af56..000000000000
--- a/kde-misc/kanyremote/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">anyremote</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 2918e6c4ab23..f820446afe90 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,5 @@
 DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49 SHA512 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720
+DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
 EBUILD kdiff3-1.8.1.ebuild 1054 BLAKE2B 1bff7351f34da73d8c82d07b4b972cac8e21f8de078c0c83e75edf0662b6a864d57ef905b96626effc4763867341682c51ca8f222ac2a0064769f7ea7709aa6a SHA512 51d24576467b95aac99a971a92822120b3c79ddb4edbd5686ead5a020585aa38f0e155766fcd4142820809a233aad3b67a8522e5fcb3aa4d455185ba6dad6010
+EBUILD kdiff3-1.8.2.ebuild 1056 BLAKE2B 2e29d6bba44e4da1a0cb42888bba11ef508870dee12232a23c7c93946df0c736dabddaa6eacaadcfa9d6000df3d0de75d7e8014d35cb69d8d98c7dd80a5f04fa SHA512 334afa2eb16cbbd48fee448a73a5246cfb4e6581bc2c0f3d16f0a7aec4adc34d1e9e3439745efbdf1fbe71a19e4c006003197a1080f03ef34ac5cb56b485c061
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.8.2.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2.ebuild
new file mode 100644
index 000000000000..64b665a240e6
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.8.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
+https://userbase.kde.org/KDiff3"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	sys-apps/diffutils
+	!kde-misc/kdiff3:4
+"
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 35b51adac763..f73bad16827e 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,4 +1,5 @@
 AUX kio-gdrive-1.2.6-refresh-credentials.patch 4224 BLAKE2B f70a40eef14d31f296effb554308303fe9b82c21b8e3c3a56020d5548dfbd9a967ef27d24ac4b44398c681db64dabff87a088ad3e47fe9e5f962af2080471f31 SHA512 8fc99adb52f1e9b9c49c94357103a51d3de367ea1d5a98afe361910307fe1a424b9f0c5fb0ec1e5f0cc2183ac87f2d6cb1730ed12fecc76b68e8860317dfbedf
+AUX kio-gdrive-1.2.7-kaccounts-integration-20.04.patch 3116 BLAKE2B 53ef65fff7e28afb813582131f69e8317eddff5689c6e2c046d62015163ab27d406697df8b75c1f1c120b56bcacd49f9502ff5c724ad6e02f0353e0f207bcd79 SHA512 f4eedfe7c2e83f7efe426797f27ea17cad5c9996cedddd341c190c3073e4a45a06d402603b15f4ea992a3a60d624b50d2cd48bd04202d39151cf4d7f3addb6b1
 DIST kio-gdrive-1.2.7.tar.xz 46748 BLAKE2B 308c7d8d55c4eef175e2ef6030f1fbcdb59fdc6cd33f6c0bd5c35efe7bd21cf7f6cf7293b355f30b7b05effae79b91e357cc5a93ed866db850953f392bd65e0f SHA512 f1eedad2cd244e38f6cdf397e9488cb7f31fe7c4b17825f3b0882ff46f7f62f087e7b2bc59db434b4a55641920b8b03f3dec6adf7031ccc2277c7a0b166f9c80
-EBUILD kio-gdrive-1.2.7.ebuild 1221 BLAKE2B ab13eab2f2d26f78a5aaace01dd5a998bf2dd793ea1625f125adc76a1763cf3a68781188b0b710857292afb817445fe0969b8ac741543f2aea2b7fa4ec08b16a SHA512 2170bde2760adb8e134d802c5d66c2040353d4cd57e4269e0686f68503e354311d7e71e43aca111a87edd5e321e179f6a399449c8585bd0aff1771396369a83d
+EBUILD kio-gdrive-1.2.7.ebuild 1383 BLAKE2B 758f52b4a494feb1f9dad578fce05caf322599af76a19e3c7482bd2bf12ae02e1677f77375c6fccc48c7ecb5f3bad98de982f8c0b00c5c51afaf5f5a2322816f SHA512 84dbfa0d327837bf40b57ee6024e22805b307ab77359c37de4fd8a302f1090aae996dd62ab781e7f31d84f3b1dfda26a587b818748850a1a705aa88fc9b6afef
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch
new file mode 100644
index 000000000000..bc6e7536e82b
--- /dev/null
+++ b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.7-kaccounts-integration-20.04.patch
@@ -0,0 +1,97 @@
+From 088fe1964fcf7150eb85dc66cbe3670489729f15 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 16 Mar 2020 10:39:08 +0100
+Subject: Adapt to new KAccounts plugin system
+
+Summary: KAccounts was ported from QPluginLoader to KPluginLoader in D27633. Adapt the KAccounts plugin to stay compatible
+
+Test Plan: Added a google account. Got a notification that my drive can now be used
+
+Reviewers: #kio_gdrive, elvisangelaccio
+
+Reviewed By: #kio_gdrive, elvisangelaccio
+
+Differential Revision: https://phabricator.kde.org/D27656
+---
+ kaccounts/CMakeLists.txt       |  1 +
+ kaccounts/kaccountsplugin.cpp  | 10 ++++++++--
+ kaccounts/kaccountsplugin.h    |  5 +----
+ kaccounts/kaccountsplugin.json | 12 ++++++++++++
+ 4 files changed, 22 insertions(+), 6 deletions(-)
+ create mode 100644 kaccounts/kaccountsplugin.json
+
+diff --git a/kaccounts/CMakeLists.txt b/kaccounts/CMakeLists.txt
+index 2a7e796..bb26513 100644
+--- a/kaccounts/CMakeLists.txt
++++ b/kaccounts/CMakeLists.txt
+@@ -4,6 +4,7 @@ find_package(Intltool REQUIRED)
+ kaccounts_add_service(${CMAKE_CURRENT_SOURCE_DIR}/google-drive.service.in)
+ 
+ kcoreaddons_add_plugin(kaccounts_gdrive
++    JSON kaccountsplugin.json
+     SOURCES kaccountsplugin.cpp
+     INSTALL_NAMESPACE kaccounts/daemonplugins)
+ 
+diff --git a/kaccounts/kaccountsplugin.cpp b/kaccounts/kaccountsplugin.cpp
+index 5499f13..3e6fb7c 100644
+--- a/kaccounts/kaccountsplugin.cpp
++++ b/kaccounts/kaccountsplugin.cpp
+@@ -25,8 +25,12 @@
+ #include <KNotification>
+ #include <KRun>
+ 
+-GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent)
+-    : KAccountsDPlugin(parent)
++#include <KPluginFactory>
++
++K_PLUGIN_CLASS_WITH_JSON(GoogleDrivePlugin, "kaccountsplugin.json")
++
++GoogleDrivePlugin::GoogleDrivePlugin(QObject *parent, const QVariantList &args)
++    : KAccountsDPlugin(parent, args)
+ {
+ }
+ 
+@@ -72,3 +76,5 @@ void GoogleDrivePlugin::onServiceDisabled(const Accounts::AccountId accountId, c
+     Q_UNUSED(accountId)
+     Q_UNUSED(service)
+ }
++
++#include "kaccountsplugin.moc"
+diff --git a/kaccounts/kaccountsplugin.h b/kaccounts/kaccountsplugin.h
+index 82ae739..8613041 100644
+--- a/kaccounts/kaccountsplugin.h
++++ b/kaccounts/kaccountsplugin.h
+@@ -24,11 +24,8 @@
+ class GoogleDrivePlugin : public KAccountsDPlugin
+ {
+     Q_OBJECT
+-    Q_PLUGIN_METADATA(IID "org.kde.kaccounts.DPlugin")
+-    Q_INTERFACES(KAccountsDPlugin)
+-
+ public:
+-    GoogleDrivePlugin(QObject *parent = nullptr);
++    explicit GoogleDrivePlugin(QObject *parent, const QVariantList &args);
+ 
+ public slots:
+     void onAccountCreated(const Accounts::AccountId accountId, const Accounts::ServiceList &serviceList) override;
+diff --git a/kaccounts/kaccountsplugin.json b/kaccounts/kaccountsplugin.json
+new file mode 100644
+index 0000000..89e8142
+--- /dev/null
++++ b/kaccounts/kaccountsplugin.json
+@@ -0,0 +1,12 @@
++{
++    "KPlugin": {
++        "Description": "Integrate KIO gdrive",
++        "EnabledByDefault": true,
++        "Icon": "system-file-manager",
++        "Id": "kaccounts_kio_gdrive",
++        "License": "GPL",
++        "Name": "KIO gdrive",
++        "Version": "0.1"
++    }
++}
++
+-- 
+cgit v1.1
+
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
index 038869b249e7..a36f78862b12 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
@@ -44,6 +44,12 @@ DOCS=( README.md )
 
 PATCHES=( "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch )
 
+src_prepare() {
+	has_version ">=kde-apps/kaccounts-providers-20.03.80" &&
+		PATCHES+=( "${FILESDIR}"/${P}-kaccounts-integration-20.04.patch )
+	ecm_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kaccounts KAccounts)
diff --git a/kde-misc/kwebkitpart/Manifest b/kde-misc/kwebkitpart/Manifest
deleted file mode 100644
index 4e0a06e51369..000000000000
--- a/kde-misc/kwebkitpart/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kwebkitpart-1.4.0_pre20190110.tar.gz 119514 BLAKE2B c85eeedc7ec1e4d24af054c2b56cd8d0b41dd6ab28a37144617233f9d67fadc78a105101af7766d6da4d79360cbb0175654b8744ca20f579e1934f2ea1a9d3ae SHA512 27f5275fc0d8e84d97c2165f82852d8fb4876312c7f27607f5f75f191e56ec6dad59b44e4fc3f14efde98a6d38856953b1112d61d939b9650e9ac24fb4c39a29
-EBUILD kwebkitpart-1.4.0_pre20190110.ebuild 1013 BLAKE2B fee705ae9d6303d8e8b7110ce538e75059880c584f5d87d571ce382d7d8dbc6d7d4cb68f3c177a52118b671a0b0f4a7e7983d5a8eb51c026928ff419b5e5cbab SHA512 52d1d931adaa51ddddbf1a7321ea57d839c08b07b5e5fd8acaad42a8d28c16d581f453f63f533b6b7dbcf4baa0448b1d18d98c577b78bad5560fb81d577a051f
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20190110.ebuild b/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20190110.ebuild
deleted file mode 100644
index 86f0693b7e90..000000000000
--- a/kde-misc/kwebkitpart/kwebkitpart-1.4.0_pre20190110.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="ed6b8c87fabeb563109a093c1f79eeb03867b053"
-inherit kde5
-
-DESCRIPTION="WebKit KPart for Konqueror"
-HOMEPAGE="https://cgit.kde.org/kwebkitpart.git"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdewebkit)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-"
-RDEPEND="${DEPEND}
-	!kde-misc/kwebkitpart:4
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/kde-misc/kwebkitpart/metadata.xml b/kde-misc/kwebkitpart/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-misc/kwebkitpart/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 5d10eecbc33e..f5e5701c88d0 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,5 +1,7 @@
-DIST latte-dock-0.9.7.tar.xz 716716 BLAKE2B 9ed220be28632d547ed310264f3778dea1dfd1b04c6bd006dd8eea41edee7272384632db33ec3ab16375dcbec92c4f07674df64d72985dbc9a80e71c9ce4cfef SHA512 921e1b49bf802fe1dc57e3c7fa24e115ea12f10eaf4d731cc22c4d4ece6370964b0009f130c1836891a5d866f895814592774af35eb0c76900586e5a98de7bd8
+DIST latte-dock-0.9.10.tar.xz 719768 BLAKE2B 02fc650d8c565a25ba4b5727d3eb83c8e44bcb91cc88200acee31616c20606e263ab594da9ee3a37e0b0f6c6e766d5c5d36534542e21e26cd8bb5ff719d7dd09 SHA512 dd8115fc21ab2e31cedca53a70d3bab555a8e3bf746810584f9d60020647e009f334dd0569043bc77ed7be75c17d1cfc2abb9c7fda6225438a7aeecb1684f421
+DIST latte-dock-0.9.11.tar.xz 719904 BLAKE2B 6d88fa42eab9e44144b33ba2affd98a74632f5aedb733bc279b5edd5db75f561af5428bcd1d9d60a4af8c1134686ea47adc9be798ee1e06ef9db515296e48494 SHA512 d02747e4709de8f3091c4686f6d80129fa2fe9d6e994cec436083c59b0ceab0b01af3c1c92d946e497e725bd20efc8ec1e8d284666348a13cf6ba79e515c30d5
 DIST latte-dock-0.9.9.tar.xz 719408 BLAKE2B 6e33b132f5ef4526a9f1ccfbfad6561d8292676b9d8dff228eeb8ceb75b0d7fc1fb2e2e0562c416dbd1d21b9fe0a550af8c91c15ff25d54c51c2b850d718395d SHA512 87ab7234b497517a5cf31254a0c29ce015080c2b2e10ada84ef953a18009282965eab443692a6cdc6bd7a4e09199f6fc2962637f7d492df8cc8e196aa78dcff0
-EBUILD latte-dock-0.9.7-r1.ebuild 1655 BLAKE2B 7f2c858c4b3d991ee39eb04f28b098fa752657cd0b98cd8ebd6cb928843230d1416dd0edf2d3197418f0c278c061d73b798a3b1d41e674cc49b22a163a656b79 SHA512 4bf4b1a55e6cbc87ecaff28dd87f251797a7152ab5ff180643b5f6c17340425d278fc2f34aae3e9e3808b60d61fafbb95a6b96b3a0051090078ec868196c4c24
-EBUILD latte-dock-0.9.9.ebuild 1664 BLAKE2B b9b98efb09f6c3bc906ad1cf699a1fa038d5afbfa84ba519d2c6549aab5544e42eb2812c4403afdc3c1ecb4a2406f6d84fe9ebe476912b5827971b6eaeb93aa9 SHA512 ae494f5cece5b262550866f31fbfcb7a97175d528a4a90585bf8b57fa1a093795c7d4dfa6017db83962936bff7611362b27e1da7147b0409871493745b2616b9
+EBUILD latte-dock-0.9.10.ebuild 1664 BLAKE2B b9b98efb09f6c3bc906ad1cf699a1fa038d5afbfa84ba519d2c6549aab5544e42eb2812c4403afdc3c1ecb4a2406f6d84fe9ebe476912b5827971b6eaeb93aa9 SHA512 ae494f5cece5b262550866f31fbfcb7a97175d528a4a90585bf8b57fa1a093795c7d4dfa6017db83962936bff7611362b27e1da7147b0409871493745b2616b9
+EBUILD latte-dock-0.9.11.ebuild 1664 BLAKE2B b9b98efb09f6c3bc906ad1cf699a1fa038d5afbfa84ba519d2c6549aab5544e42eb2812c4403afdc3c1ecb4a2406f6d84fe9ebe476912b5827971b6eaeb93aa9 SHA512 ae494f5cece5b262550866f31fbfcb7a97175d528a4a90585bf8b57fa1a093795c7d4dfa6017db83962936bff7611362b27e1da7147b0409871493745b2616b9
+EBUILD latte-dock-0.9.9.ebuild 1662 BLAKE2B 68fd470513f74ada5ab011251da49fdd637d0475527821d126cd1fcd0bb1c4aca08269ad05b56dafb12b5baa892459a37df0edce3907bacc29062f110ddd7637 SHA512 1e3c77baa9aeab61712e18dee9fd9b147171871da69a297abca52ad92908928fe14c8589b042744062ad24c2e171e558105a68975a1e937b5e38df9761a5fa48
 MISC metadata.xml 453 BLAKE2B a49e759f4ce30c2730a4bf082b8f953e0e93f95f2de3b567798d4bea8229558ed72cd774c5d9b1356bd066dc92400d17f05d830746d87386c8c2921fcc484c80 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35
diff --git a/kde-misc/latte-dock/latte-dock-0.9.7-r1.ebuild b/kde-misc/latte-dock/latte-dock-0.9.10.ebuild
index 0852232ac69c..5b5fb645ae2f 100644
--- a/kde-misc/latte-dock/latte-dock-0.9.7-r1.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.9.10.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Elegant dock, based on KDE Frameworks"
diff --git a/kde-misc/latte-dock/latte-dock-0.9.11.ebuild b/kde-misc/latte-dock/latte-dock-0.9.11.ebuild
new file mode 100644
index 000000000000..5b5fb645ae2f
--- /dev/null
+++ b/kde-misc/latte-dock/latte-dock-0.9.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Elegant dock, based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.latte-dock"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.14.0
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5=
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	|| (
+		>=dev-qt/qtgui-${QTMIN}:5[X(-)]
+		>=dev-qt/qtgui-${QTMIN}:5[xcb(-)]
+	)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5[X]
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/kde-misc/latte-dock/latte-dock-0.9.9.ebuild b/kde-misc/latte-dock/latte-dock-0.9.9.ebuild
index 5b5fb645ae2f..f670080350f8 100644
--- a/kde-misc/latte-dock/latte-dock-0.9.9.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.9.9.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Elegant dock, based on KDE Frameworks"
diff --git a/kde-misc/plasma-applet-network-monitor/Manifest b/kde-misc/plasma-applet-network-monitor/Manifest
index 247ff1565e6e..522e72832906 100644
--- a/kde-misc/plasma-applet-network-monitor/Manifest
+++ b/kde-misc/plasma-applet-network-monitor/Manifest
@@ -1,5 +1,5 @@
 AUX plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch 1926 BLAKE2B 57b63c36080095aa439c47437d3d3289c68ed8692e72863fac14800acc54fb3998ab38844ebd5e2102d410259b804497305f849c36d18b3b7e8082d2c4ec7551 SHA512 2b89d63bd3cf4d53f4a1d8d8730304d7516c4ff874fd4fab26dc41c4cba24a3202ef7a52b0cf8ab15280ff521b34b7a230191bc2c91e1d32faa12d81fc9fcee8
 AUX plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch 804 BLAKE2B 6c70e88e532eeb6f93e9534aabde1b9b0b755ff0aea555eaed876a7e02d652ab4b90c817ea9dfcd096db0407f6b8589885daf6072fbd09d7a57aa9c82526bf17 SHA512 a23e6a6198762e09f8b5f403e9e65ad2796833a77a38adfb5cc66fd39361dd183120b73d053da88c8e848090f90c05df8d4c175620fff4eb7d3b9c03ae5b38ac
 DIST plasma-applet-network-monitor-1.7.3.tar.gz 40970 BLAKE2B f87a2def4a763c507ce65c42143d5e631c950a7cfdd59bfebeb4f225919feedcd3e9855ee1a48c83dfc7d572efe43fc81e5f2a8e4ffddc3d7e440de36552ff8b SHA512 61bd78e05c3557cfab4977a58db8c80f857d3c84627b794e10e003ceff7e3fd1e15d77761af90cb38ee02a45ed9404629a3c571776a43b7af07c07d8d120ed37
-EBUILD plasma-applet-network-monitor-1.7.3-r1.ebuild 591 BLAKE2B f721da0f4d1cadf8832705f2f6347a4d25c5228d7303b295219935ab98d1caaaab6bb395732365fcd51401d685b9ff3497a70ef53b2cae2315621562c08ca2e8 SHA512 5b3e13ec2c1ac6462b34fc6d8f1b33f533f9240cc0763b1833a6c29edf6132b9bfc76aa6c0372f79e67c853bd695bee60ba10b07363de4ce57b951c3be38c43a
+EBUILD plasma-applet-network-monitor-1.7.3-r1.ebuild 716 BLAKE2B 583f3ed46b320a0f25ece928ce5689707a7cf2f57ad01650f8cc5fb13a403d66bbee17317e5f994e8d800f6e82e08c4bd442c6aa62852e23fac6c4244e361c1d SHA512 c98e842b5eb3d4f173905981c60b4d27cc5c9d49231fab581665879b7805cf3cf2b2e6c4fa2b71d98116622469db8f3ffa8b0917eea71b25a33dea453147e000
 MISC metadata.xml 352 BLAKE2B fb3f480206952a33e48b73c56c4047447c39e19c6cc8fb19bb50f16181315795c336d7f406194236cf02496c998b0f547325b4f8d8623e9d4a2d510f2f10b298 SHA512 4dd9fec8f19ba1504507761660e8e81a28fe8445d9259f6ddaf34e66d31da1060aae6637a39c86558d38c83553feebe3cea34a76cf7e5c22773f85762eed60a9
diff --git a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild
index 5abe0011e6c9..be6fc2cc159b 100644
--- a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild
+++ b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild
@@ -3,19 +3,26 @@
 
 EAPI=7
 
-inherit kde5
+inherit ecm
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
 
 DESCRIPTION="Plasma 5 applet for monitoring active network connections"
 HOMEPAGE="https://store.kde.org/p/998914/
 https://github.com/kotelnik/plasma-applet-network-monitor"
-SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64"
+SLOT="5"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep plasma)
+	>=kde-frameworks/plasma-5.60.0:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-misc/plasma-applet-weather-widget/Manifest b/kde-misc/plasma-applet-weather-widget/Manifest
index 7858075393f9..d3347b4202c0 100644
--- a/kde-misc/plasma-applet-weather-widget/Manifest
+++ b/kde-misc/plasma-applet-weather-widget/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-applet-weather-widget-1.6.10.tar.gz 107848 BLAKE2B a434a7c6c26effa5daee37ae1d03e26793543112404b9e607346ac2f34405bcc068a201b9c371606d60cd129fda45e2dbb6d7cadf038365e1b2a5cdfc1813b1a SHA512 5db4c2e426b9b8296b70ec4edf5fc2dbc5e8056f66327569008a77b05201896ed23039aae063807726376e203d637053884bfeeac78c59c519b7fc5685797331
-EBUILD plasma-applet-weather-widget-1.6.10-r1.ebuild 559 BLAKE2B 8660545ea6711cb4f5c9662a055d8666f1b2fff098337d53d881a30247dc84cf78dcd5cd49ef286cc7f1c92e349dfd58a2b43f1519c88d804c91111c9c1b2618 SHA512 fee3cc7007818d8cde0ff0f08e77bcc2a45ac8a95f2da132bcb8374f94d2dc9046b9f6f0aed05a49533686a1c87cbe6be3bd912f14d035694df185d22761afae
+EBUILD plasma-applet-weather-widget-1.6.10-r1.ebuild 662 BLAKE2B 8518c232f5a8f613d5117d0f742c2db7690166f7ddc2cdcfde485f461eff6474557ac18ffd93aaa1b87dbaaaf837894cdd2acd32ab883f3cf594650019933dfb SHA512 dd1e72391120f2852e03ea28c9240e9ad51b8f1cec6cee70a912e45b0f51ab54c490dab4f45917278ac009a18d360414bc2df3b4c8a839949b9aa391ad578a09
 MISC metadata.xml 351 BLAKE2B 9b0ff19c204b213ba4e11788da293395627aebc0105c5788b62649a283588904e55cae51489d4c84584e185ab6cdca3ef78901e5d521dd318be19c32ae49bdfa SHA512 e600558dade72c9c394662b00bf20109b854992e2cd30fb4668bae5fddefa6f137f1975a36ab2ca8b8ff597a012b4cd656aca598472b2b0f59820ae914290995
diff --git a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild
index ec1574a73072..0c2ac70e2ced 100644
--- a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild
+++ b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild
@@ -3,21 +3,27 @@
 
 EAPI=7
 
-QT_MINIMAL=5.12.1
-inherit kde5
+inherit ecm
+
+if [[ ${PV} = *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
 
 DESCRIPTION="Plasma 5 applet for weather forecasts"
 HOMEPAGE="https://store.kde.org/p/998917/
 https://github.com/kotelnik/plasma-applet-weather-widget"
-SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64"
+SLOT="5"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtxmlpatterns 'qml(+)' 5.12.1-r1)
+	>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
+	>=kde-frameworks/plasma-5.60.0:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest
index 93834b9be729..6ae7304d7de1 100644
--- a/kde-misc/rsibreak/Manifest
+++ b/kde-misc/rsibreak/Manifest
@@ -1,3 +1,5 @@
 DIST rsibreak-0.12.11.tar.xz 547764 BLAKE2B c0f78acdd457518fa40269865d24b1eeadafe8936328341f96ebf5703576a9fbfd14de7de563057cca0b9ed62161baa1c9e28170f4bb2480112c7e7cc3d623f6 SHA512 78498b747eeef842e40170236ace9d1ddd8b1f4bcc378134f2935cd2cf1c6933d44fa232f2f9b0724ee6b2638a34e4f71ebee2eac7664946093ed4df8eeb12ec
+DIST rsibreak-0.12.13.tar.xz 550544 BLAKE2B fc3380e7ae9036c072f93cc46ef0f074f0a1b2777019a25615ae9cf183979985781b7254e8041d1f5a31a0ed404ed34a399d1fb0b675540860d49145fcbbddcd SHA512 dc1411221828afab1c8f3ee89238be44d9fd3784cb5cce4f5a50ce063e14d1683257bffa1b24509d7009e74d0be16f1c788754690b503490fb8be1bedc9657fd
 EBUILD rsibreak-0.12.11.ebuild 1381 BLAKE2B c90291f41efdf968cf896b519853dc2b116873c4255b25e3150238d95a1cbe4ea3355f513fb6c7ad6317e71221ac0768290514d797342d2801e363d3ed2fb1f1 SHA512 5ea4d173fbdbd08311821b409374fb9c9380b33e3e79b95b493d55532ddc151a114ff4c1d9910713603ef6b1ecf380ba935cf4d9ab3017470ea1b97b142ce398
+EBUILD rsibreak-0.12.13.ebuild 1383 BLAKE2B 1e2bf6b30a008069b96c7cc19bb89f70ac87e7c1ec7369c7bc037875566b980a423024a2161aa013bba70ecf861868bc014cc8645dcac15538f67a41de16dcc4 SHA512 8dc471704f4fd0b2f6c056f1067682d970cabe998ca4c213d5723669091d571a77ec61ac0d61532481ab6cf04049f6c404425f61467f138b5e43800db2bc1ef6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/rsibreak/rsibreak-0.12.13.ebuild b/kde-misc/rsibreak/rsibreak-0.12.13.ebuild
new file mode 100644
index 000000000000..ff173b0d7e12
--- /dev/null
+++ b/kde-misc/rsibreak/rsibreak-0.12.13.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Small utility which bothers you at certain intervals"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.rsibreak
+https://userbase.kde.org/RSIBreak"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE=""
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+# bug 587170 for frameworkintegration
+RDEPEND="${DEPEND}
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+"