gentoo resync : 25.08.2020

32 files changed, 324 insertions, 463 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index a93e634140a1..6e029128de49 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 646e33f46c13..a67e9fb04fcb 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,5 +1,5 @@
-DIST kdeconnect-kde-1.4.tar.xz 389540 BLAKE2B 00a2a20e4a24d74d56db4a812937604d4dd73bc887b262ab967643414f97fcda4e51c54e9f710dc21247c99eec74c3f74eabf3dc2d4c713add6843a2e22e0ff2 SHA512 a8a43327b4185579d626978afc11bb0f334f73f7d68fc72090aab3fd14fb1af381061dd5278fb73e63ff2cb5a688f8ec969c097503d751aff48159237aa56cbf
-DIST kdeconnect-kde-20.04.2.tar.xz 429760 BLAKE2B 9da78c9a4262442c2c2e4577f55c1777ecc48ee88681551c8bef99ccae930a09153cc5419c3fe80f0996f985608a269d0c182e3f06e4a661c5926c02862b0dad SHA512 fe1c538e5d94b540b738902960f381e82c74ac692fe3e64b324a253db6cfe4738140d967904bc937814c04d66ae065fe05f7a551961f6e3b98da01a86f7be7b6
-EBUILD kdeconnect-1.4.ebuild 2478 BLAKE2B 8459e97142562cf2d0f6d2c89b11f52bae8b9485b68f76b01eab84ecaa0942d9ab217ac03f9ffe61a14d4644f172af12e617ef8a7bd13337c063df81f63d5e19 SHA512 b9f363c3249faca4622ed9eedd1fb3abba30c48f521323af1491b4183c9b955cb676a9ad06b60eb539ae7d7236d04273a31073603563c1d9606cfd1c253548cf
-EBUILD kdeconnect-20.04.2.ebuild 2266 BLAKE2B 72740a5fc9c2b2ec47aec2b40559ce8363e49f14bbd49b0e560b922e73721c519b07a4aa33a83cc00a4d90bd4a1be299c0b8c860323cb7271c1b3a44639ce9e5 SHA512 971ab9b2d20e66867730d16f67e596faf7853add74c154a65268aefe2f179a165d9f3e396566d33423fdd8bdd2fc1d1c0002a3541d9d8c4af975af930425c74c
+DIST kdeconnect-kde-20.04.3.tar.xz 431092 BLAKE2B 8da7439f6d3ef17c1a80b6a47411200e5bb2e622c9072b386cb2aaf6730fde80a6c6d8564aaaad42ad97f471259e651ccc9e78d5067619e7f150b61aecec645b SHA512 148526e1c216725fa92b96682ea2a78f4bbb94d56066bc545fee875b321eda2b41f75f840366d1a69e74ea3e40832ac70dce912226427df019fed4387c68ec43
+DIST kdeconnect-kde-20.08.0.tar.xz 407640 BLAKE2B 22160bb6d391c08ca0d4f06e26744308a75b41dfdbc2b24ba0a8ead8e26b8eb3a1b7c66488177fd5411fc5ae7d4fcfcf49ce17cf55c5fdb14e6ba37a44b4a016 SHA512 2e8bfe9b30173e997f664a9c4feb10c57b28445442fb9aeca1158ac7c586cb0b624f9bebb4f783ea8bd11b409c154ed296bb1793a24335b96a606432fb63e3ab
+EBUILD kdeconnect-20.04.3.ebuild 2263 BLAKE2B 6eaba05230ff5b09361b54ddb6944d8c9e9f673804bc8fe9eb6317372718c29b6538130ac42208bcc13aebd7d496576f724074fc0f2bd2363384e76683f2d7b4 SHA512 8ea2e0d5fcaef53abb88643ea356bb1dbe7d7e17db868ae3051b5d4c5f44c1eb29d13b493dd2075dd3399de97b150683d73b5cbe3186da6f6b894572d668d15c
+EBUILD kdeconnect-20.08.0.ebuild 2301 BLAKE2B 545d51357349886c027d39ca0d3b095fc145518ac2e9dd9b4353b4a8d6051efe6e13e5385aebca60f9b701d8b581b1678ff11a1e97c0ab1baecba74abbbf7c83 SHA512 64f5d858efd9c57f261ab0bcf37a93edb80ae48461dbc14645589f05d38945e47f0e614daf3524c88d5d971042162c5ccfc990ee47e59721512c8a8eae0dc9b3
 MISC metadata.xml 577 BLAKE2B 4a7b31db0d4e48ab09de42119a36b7733603d2b3f85f7cbf36b61713f2f87488f4fe1223d2dc2ef7460b41525eb59fe5e43196df54f8f454241e56518ad73855 SHA512 faf6e262a0f0d020bbaf4372c8f5c308de1fae0cee4f37cdf9509b585ead0706ba06109f27e691cbd0ebceadb7c352b0d335dc29e87baee13ac3dda5eca11a5c
diff --git a/kde-misc/kdeconnect/kdeconnect-20.04.2.ebuild b/kde-misc/kdeconnect/kdeconnect-20.04.3.ebuild
index e573d375f736..f6ae548b6c75 100644
--- a/kde-misc/kdeconnect/kdeconnect-20.04.2.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-20.04.3.ebuild
@@ -9,7 +9,7 @@ KDE_ORG_NAME="${PN}-kde"
 KDE_RELEASE_SERVICE="true"
 KDE_SELINUX_MODULE="${PN}"
 KFMIN=5.70.0
-QTMIN=5.14.1
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
@@ -18,7 +18,7 @@ https://kde.org/applications/internet/org.kde.kdeconnect.kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="bluetooth pulseaudio wayland X"
 
 DEPEND="
diff --git a/kde-misc/kdeconnect/kdeconnect-1.4.ebuild b/kde-misc/kdeconnect/kdeconnect-20.08.0.ebuild
index 79f810d46be8..0a709541b421 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.4.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-20.08.0.ebuild
@@ -6,22 +6,19 @@ EAPI=7
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
 KDE_ORG_NAME="${PN}-kde"
+KDE_RELEASE_SERVICE="true"
 KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.64.0
-QTMIN=5.12.3
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
 DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.kdeconnect.kcm
-https://community.kde.org/KDEConnect"
+HOMEPAGE="https://kdeconnect.kde.org/
+https://kde.org/applications/internet/org.kde.kdeconnect.kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="bluetooth pulseaudio wayland X"
 
 DEPEND="
@@ -46,6 +43,7 @@ DEPEND="
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
 	bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
@@ -77,12 +75,9 @@ src_configure() {
 	ecm_src_configure
 }
 
-pkg_postinst() {
+pkg_postinst(){
 	ecm_pkg_postinst
 
-	elog "In case you are missing 'pause music' plugin, this now requires"
-	elog "enabling USE pulseaudio."
-	elog
 	elog "The Android .apk file is available via"
 	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
 	elog "or via"
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index ac552de062dc..ec463784219c 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,8 +1,4 @@
-AUX kdiff3-1.8.2-crash-w-o-clipboard.patch 950 BLAKE2B a075e1e8a06958e5f849b024d65f7d709be49a7facda5b4bd2a223374735a80b19a94ee983c9d1245733fed6c46f6d4c70cf631d32c2c2aa5f345b999e437674 SHA512 43d0c4898841fb822571502257a0d7acd359deaa7e906a0a80fb9d2f9cb8b61008a6b96d08acf74d5a76534b519fc6f3435e08034651aa4572c637817be4e025
 AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
-DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
 DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
-EBUILD kdiff3-1.8.2-r1.ebuild 1092 BLAKE2B 9e32869ac25e4341b2604e001a6e7079ea02487d5a5349756fb7931e1554327814a22295978448a0bc164abd56cbcfa0991d4886b5cded7c19a8d8880207d06c SHA512 624c8c8d282bdcf5d0797b795decc55fbe558a590e240586967f064623281444a8f722c1a0d66db8eca3de22a058288bd14601d686afec33068c20aa29399e15
-EBUILD kdiff3-1.8.3-r1.ebuild 1080 BLAKE2B cb676ecd233a5473b29354aea91f257858a2ac36b4df798357542f19793f5f9147f524a265f4ab822e64a12f0b047b971dae78bf1a486907d67b063dcbd2c1da SHA512 f79079f1ab3976b09cac4414cf4da5c2b57c48573fd025b15378cfa0a3269d78fc6a7269fa51d2a52d439e1d79366c2c51dcc1966252d1d7f9237076d0db1dcb
-EBUILD kdiff3-1.8.3.ebuild 1036 BLAKE2B 8c6d9b36f5eb10d6c2f5af8075ec1e4b08c28377b6c9e4cfab49ed2a4dcbc51a5ae40320e840559f897c4de0eb59b1b14458131c20296d71b3888ee5d43f6e07 SHA512 54a845c025f3c771e8d1eebec160d94dcc86c82958c0b5d9755ac5868d5f765ca94607178857d3a9dce88d121793e11ac46138e42d63e30372f81a3a6bd70962
+EBUILD kdiff3-1.8.3-r1.ebuild 1078 BLAKE2B fefd53a09e26ab9c0c699ad7f939ba456d55e2497220159a6c3b06497d79f1c8e2de6f3c00e7aabf85fdc861af7bc1ff709b81d9ffa71ea84745b5bc7b3ed258 SHA512 59142b7b8b835121f61c7013f8f678bea635e03440041abdfe11da3d9fe6d62c6acee158f05197dc92c9ca45362035f4a5a504acfb664319d6060c994963da5e
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
deleted file mode 100644
index b1d00a12f47d..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <cfeck@kde.org>
-Date: Thu, 30 Apr 2020 18:27:58 -0400
-Subject: Fix crash when clipboard is not available
-
-Summary:
-QClipboard::mimeData() can be nullptr according to documentation.
-
-BUG: 419722
-FIXED-IN: 1.8.3
-
-Reviewers: mreeves
-
-Reviewed By: mreeves
-
-Differential Revision: https://phabricator.kde.org/D29248
----
- src/pdiff.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index f3f2284..3588e3e 100644
---- a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged()
- {
-     const QClipboard* clipboard = QApplication::clipboard();
-     const QMimeData* mimeData = clipboard->mimeData();
--    if(mimeData->hasText())
-+    if(mimeData && mimeData->hasText())
-     {
-         QString s = clipboard->text();
-         editPaste->setEnabled(!s.isEmpty());
--- 
-cgit v1.1
-
diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
deleted file mode 100644
index 0659672ef390..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-"
-
-PATCHES=( "${FILESDIR}/${P}-crash-w-o-clipboard.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
index 9611b4dd9139..678e2ab4e74a 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
deleted file mode 100644
index 50728ca4d608..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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
-"
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 07d371f14766..36c2739edac4 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,6 +1,5 @@
-AUX kio-gdrive-1.2.6-refresh-credentials.patch 4224 BLAKE2B f70a40eef14d31f296effb554308303fe9b82c21b8e3c3a56020d5548dfbd9a967ef27d24ac4b44398c681db64dabff87a088ad3e47fe9e5f962af2080471f31 SHA512 8fc99adb52f1e9b9c49c94357103a51d3de367ea1d5a98afe361910307fe1a424b9f0c5fb0ec1e5f0cc2183ac87f2d6cb1730ed12fecc76b68e8860317dfbedf
-DIST kio-gdrive-1.2.7.tar.xz 46748 BLAKE2B 308c7d8d55c4eef175e2ef6030f1fbcdb59fdc6cd33f6c0bd5c35efe7bd21cf7f6cf7293b355f30b7b05effae79b91e357cc5a93ed866db850953f392bd65e0f SHA512 f1eedad2cd244e38f6cdf397e9488cb7f31fe7c4b17825f3b0882ff46f7f62f087e7b2bc59db434b4a55641920b8b03f3dec6adf7031ccc2277c7a0b166f9c80
 DIST kio-gdrive-1.3.0.tar.xz 51668 BLAKE2B a5c9bc347e5b40998449b613e8ad73c362d82d2486a1e91527f84acc5473d603b3cca422bd7c67cff28e49b08803904fdf752bec742bae752e868b8a84321684 SHA512 b0a6be2b59512d3faf6c677c6f3ffdcc9a38fff3a41d0bc6a29566008d7da3ab524fb189ddd219308a8ac8244fbed67c01da480e8193ed0aeb815fe64d72988a
-EBUILD kio-gdrive-1.2.7-r1.ebuild 1227 BLAKE2B 095b7909158ccce7a930a508a67593ccfe88afa272ec82fe1698bcad9f61e4681dc07941f716fdfcbbdaec686553b05bb8be805c19bda08218d1b7789db1d6af SHA512 bcece19ec575eadcd98ef32cfcf7bce9e80c54e709e5904a436921f18fa47ae34d594801f3334e60c9524bcc19cc6f331e6aff3645f02d3205dc4420c45e56b8
-EBUILD kio-gdrive-1.3.0.ebuild 1072 BLAKE2B 79d8f31c01a5d2d58649ca7b9c3be1e84e2f7243ac2fa257b463525cf661cd180031d04b164dc20aa798e6f9b89c3f66c0b404696498fd19f87319bb50792c40 SHA512 b25b7b09fe6611c0f2a4c3a585c2aa32360818092687309c90bfceae283e7004881f7f19f736b4a793072c1d1d2e44a3183ebb8a6acdf7451690c6f3e8796dfc
+DIST kio-gdrive-20.08.0.tar.xz 57016 BLAKE2B 079c79d2de151b3dcc073006d925bb3d00b48993dab02720bccdf0e2d0051b78826741cd12bcb3bfeb429cbf67bc9ae2f94d55deb54ba0b67681564d5e12f145 SHA512 ac96dae7bc3700e5a7a681d043596a964ea167ce79d74f0a8ed159912573ebd6df56c6072b87a5c7e1eef8dc6b4aef2e8264989c0c946dfa1aa5fee26d752075
+EBUILD kio-gdrive-1.3.0.ebuild 1069 BLAKE2B 258a60d0c4a8cb207b1799a4e8bbe05c0d75f616377d4eccfeb02b317c8cc4a06c6cd03b4f4c217e7fde0b822feb4a5e18044365c66f23b4385f6548fdc76622 SHA512 8900f71af6c32a24cbd232cb1c9bfc3189919ac4a0f682fd057480e4296dae6891ea97a26ea376e50d9cfc8a1ce342a53d338ba8a329ca62498399fd64fca9f1
+EBUILD kio-gdrive-20.08.0.ebuild 1050 BLAKE2B db4a9e73a22fb1dcf249c8b29dd700bc2209c49e6fa15f8667e6992313563b1d4922947919e31d58a30d5dc0ed7cb2e26a2c5f906d1fea40860d1ecfc8610656 SHA512 8b3cca5eaa2f2e7879abeea2201542b25565e867d11fbb2bed31f7bf1678115327e6842b6297e9e6966475ce0d197195da10ac8bb5ec3a6acfacc66d43c8c556
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-refresh-credentials.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-refresh-credentials.patch
deleted file mode 100644
index 2d5958827866..000000000000
--- a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-refresh-credentials.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 4ded388b2b2672f5f7fb953a0150a69fcfaa7cb0 Mon Sep 17 00:00:00 2001
-From: David Barchiesi <david@barchie.si>
-Date: Mon, 8 Jul 2019 09:54:08 +0200
-Subject: Re get Google credentials from KAccounts when a refresh is needed.
-
-Summary: Currently, when the Google access token in use expires, the KIO slave silently ignores refreshing the token (only 'not implemented' gets logged) and fails all subsequent api requests. This patch prevents the slave from breaking by requesting new credentials from KAccounts.
-
-Test Plan: Open a Google Drive folder in Dolphin, wait until accounts token needs a refresh, open another Google Drive folder. The folder loads because a new access token was requested.
-
-Reviewers: elvisangelaccio
-
-Reviewed By: elvisangelaccio
-
-Subscribers: mck182, elvisangelaccio
-
-Differential Revision: https://phabricator.kde.org/D22009
----
- src/kaccountsmanager.cpp | 45 ++++++++++++++++++++++++++++++++-------------
- src/kaccountsmanager.h   |  2 ++
- 2 files changed, 34 insertions(+), 13 deletions(-)
-
-diff --git a/src/kaccountsmanager.cpp b/src/kaccountsmanager.cpp
-index 08272df..dc35852 100644
---- a/src/kaccountsmanager.cpp
-+++ b/src/kaccountsmanager.cpp
-@@ -85,8 +85,19 @@ AccountPtr KAccountsManager::createAccount()
- 
- AccountPtr KAccountsManager::refreshAccount(const AccountPtr &account)
- {
--    Q_UNUSED(account)
--    qCWarning(GDRIVE) << Q_FUNC_INFO << "not implemented.";
-+    const QString accountName = account->accountName();
-+    for (auto it = m_accounts.constBegin(); it != m_accounts.constEnd(); ++it) {
-+        if (it.value()->accountName() != accountName) {
-+            continue;
-+        }
-+
-+        const auto id = it.key();
-+        qCDebug(GDRIVE) << "Refreshing" << accountName;
-+        auto gapiAccount = getAccountCredentials(id, accountName);
-+        m_accounts.insert(id, gapiAccount);
-+        return gapiAccount;
-+    }
-+
-     return {};
- }
- 
-@@ -143,19 +154,27 @@ void KAccountsManager::loadAccounts()
-             }
-             qCDebug(GDRIVE) << account->displayName() << "supports gdrive!";
- 
--            auto job = new GetCredentialsJob(id, nullptr);
--            job->exec();
-+            auto gapiAccount = getAccountCredentials(id, account->displayName());
-+            m_accounts.insert(id, gapiAccount);
-+        }
-+    }
-+}
- 
--            auto gapiAccount = AccountPtr(new Account(account->displayName(),
--                                                      job->credentialsData().value(QStringLiteral("AccessToken")).toString(),
--                                                      job->credentialsData().value(QStringLiteral("RefreshToken")).toString()));
-+AccountPtr KAccountsManager::getAccountCredentials(Accounts::AccountId id, const QString& displayName)
-+{
-+    auto job = new GetCredentialsJob(id, nullptr);
-+    job->exec();
- 
--            const auto scopes = job->credentialsData().value(QStringLiteral("Scope")).toStringList();
--            for (const auto &scope : scopes) {
--                gapiAccount->addScope(QUrl::fromUserInput(scope));
--            }
-+    auto gapiAccount = AccountPtr(new Account(displayName,
-+                                              job->credentialsData().value(QStringLiteral("AccessToken")).toString(),
-+                                              job->credentialsData().value(QStringLiteral("RefreshToken")).toString()));
- 
--            m_accounts.insert(id, gapiAccount);
--        }
-+    const auto scopes = job->credentialsData().value(QStringLiteral("Scope")).toStringList();
-+    for (const auto &scope : scopes) {
-+        gapiAccount->addScope(QUrl::fromUserInput(scope));
-     }
-+
-+    qCDebug(GDRIVE) << "Got account credentials for:" << gapiAccount->accountName() << ", accessToken:" << gapiAccount->accessToken() << ", refreshToken:" << gapiAccount->refreshToken();
-+
-+    return gapiAccount;
- }
-diff --git a/src/kaccountsmanager.h b/src/kaccountsmanager.h
-index 235d11a..d2dbc43 100644
---- a/src/kaccountsmanager.h
-+++ b/src/kaccountsmanager.h
-@@ -40,6 +40,8 @@ public:
- private:
-     void loadAccounts();
- 
-+    KGAPI2::AccountPtr getAccountCredentials(Accounts::AccountId id, const QString& displayName);
-+
-     QMap<Accounts::AccountId, KGAPI2::AccountPtr> m_accounts;
- };
- 
--- 
-cgit v1.1
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
index 1283f3246810..3778ffc71683 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-20.08.0.ebuild
index e7eb5ed98d46..ff0a142385e5 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7-r1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-20.08.0.ebuild
@@ -5,45 +5,39 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KDE_ORG_CATEGORY="network"
+KDE_RELEASE_SERVICE="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
+HOMEPAGE="https://kde.org/applications/internet/org.kde.kio_gdrive"
 
 LICENSE="GPL-2+"
 SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+kaccounts"
 
 BDEPEND="dev-util/intltool"
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-apps/libkgapi-19.12*:5
+	>=kde-apps/libkgapi-19.08.0:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
-	kaccounts? ( =kde-apps/kaccounts-integration-19.12*:5 )
+	kaccounts? ( >=kde-apps/kaccounts-integration-${PVCUT}:5 )
 	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 "
-RDEPEND="${COMMON_DEPEND}
-	kaccounts? ( >=kde-apps/kaccounts-providers-19.08.0:5 )
-"
 
 DOCS=( README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kaccounts KAccounts)
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index a93ee7696556..55df2878c57d 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,4 +1,5 @@
 AUX krename-5.0.0-exiv2-0.27.patch 5106 BLAKE2B 756e29fe3bdc0d83d3612ec9af7fe0936d70eda023c64bafb198c9b0d29bb69e4978fd5c2eaa7606e41b2d730ae1566217983f7fb2dba72c996b11982beaef49 SHA512 98a917db7212f120f1cab3fdf89e9e09d05205da386df2f838b770ac378ec3b71d5a25bd022740569a34c39cb20b3ced0c489b7945c4ed3d85fd4442988b8f4f
+AUX krename-5.0.0-kf-5.72-findtaglib.patch 1158 BLAKE2B 16e1c23eb7000456cbf651e24e5bb5a9218671abc9fbe08b1b83e2640c3327b55b24cd197d42da391a4beb5024b5a4e658476dfdab8cfd4c29e50c622659eb4a SHA512 1a934e22bb149ab7be169192adff387bfd5326cd1b4782391ee54c13ada2ba8744ed4a0eb39da8ff07829efc56ea8692405d1e656eae69bfde4ccc7ac1702c9d
 DIST krename-5.0.0.tar.xz 279968 BLAKE2B fefbcb4ba1bac3f505db9392c3407af780ae7669f6bf105dd9faca32b0527e64b0a9a8590ac7df429d2cdbc2fe0028eca1215c056f895038f1c02685e42636a6 SHA512 9a52d921342f81990236aecb260beebca04f65578b34704c338f94214117d0e18d8b39e9832ddb5fed39a8f1d9f58f05a445e7dec3631e7cac062f30fce09597
-EBUILD krename-5.0.0-r1.ebuild 1533 BLAKE2B 57ee1cf34cf736c935cf51807a6207e9043c127bece60cc9abf55fbe4d24f7fcd484a07d37fb75776ee961c6ece11f2bfd4dea1c0701788ffce25d75836c3ebf SHA512 8b9189c5133f7928312ab602d3613110707cdf13a378514c09963a2fcb86f937098653bbf517dcb97efa111105b04512dade777c3872a9348f7c386998a36b4c
+EBUILD krename-5.0.0-r1.ebuild 1579 BLAKE2B 006cdec76760504116f61487ce44f8714b14ceb0c5eda80d8e356e31de0e7bbf4b91d0d89e9271773772996a1184d9646ef774d8801825525efaed299d5325bf SHA512 3649a7b82124cc0b5c5e70b4643637b6b746f88533f9f19c3c0107d345686dacf1181b421d1b87ddf4d0b21488d7c9409e2a08d40911a8ec5e2f20c1765b69d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
new file mode 100644
index 000000000000..672d0c106818
--- /dev/null
+++ b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
@@ -0,0 +1,36 @@
+From c1e0259445f32516785a6cb6e82e7cb401b6df37 Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Fri, 19 Jun 2020 16:44:47 +0100
+Subject: [PATCH] use local cmake modules first, fixes build failure
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 602129b..4550621 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(krename)
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ # search packages used by KDE
+ find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ 
+ include(KDEInstallDirs)
+ include(ECMInstallIcons)
+@@ -28,8 +28,8 @@ find_package(KF5 REQUIRED COMPONENTS
+     XmlGui
+ )
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+-                      ${CMAKE_SOURCE_DIR}/cmake/modules)
++set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
++                      ${CMAKE_MODULE_PATH})
+ 
+ add_definitions(
+     -DQT_DEPRECATED_WARNINGS
+-- 
+GitLab
+
diff --git a/kde-misc/krename/krename-5.0.0-r1.ebuild b/kde-misc/krename/krename-5.0.0-r1.ebuild
index 3884d54fa106..b650df235fa7 100644
--- a/kde-misc/krename/krename-5.0.0-r1.ebuild
+++ b/kde-misc/krename/krename-5.0.0-r1.ebuild
@@ -45,7 +45,10 @@ RDEPEND="${DEPEND}
 	!kde-misc/krename:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-exiv2-0.27.patch"
+	"${FILESDIR}/${P}-kf-5.72-findtaglib.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-misc/markdownpart/Manifest b/kde-misc/markdownpart/Manifest
new file mode 100644
index 000000000000..af5aee2bfeef
--- /dev/null
+++ b/kde-misc/markdownpart/Manifest
@@ -0,0 +1,3 @@
+DIST markdownpart-0.1.0.tar.xz 17232 BLAKE2B f4f9358e659370b6c7bca50ba314a8aea2deb29b83c3d382ee6585aa250aa4ac8b5b0bd9bbedd304bd2c20ac96c620fc32cfc86af000b92e8cd95ad11bc8521c SHA512 0c8c916090151b1dd048bb00d1b9bf6ec9945753863fac62497c843a61d1706856ff83bf601eb82a1a6d2418ad0c0769cce78d27d42d38cb57e91d40a8ad8940
+EBUILD markdownpart-0.1.0.ebuild 763 BLAKE2B 4d1fa7ca33eb28722b74baabef4e462c6535334d3f8f111119301cfa853fd3afe56e3beb48b52bafd38e4507cb53d2aa8d3d94bd955589f905ec4f67a6d77f12 SHA512 34bed9696c4f54f065778942854f29a30bb729057b86a2b5e7df9f51c2a34d0eb6429e38afc4f6b8afe441bb4828930a5b4446e5dcd1be6125017529373f12dc
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/markdownpart/markdownpart-0.1.0.ebuild b/kde-misc/markdownpart/markdownpart-0.1.0.ebuild
new file mode 100644
index 000000000000..08b5653d4c81
--- /dev/null
+++ b/kde-misc/markdownpart/markdownpart-0.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.70.0
+QTMIN=5.15.0
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument"
+HOMEPAGE="https://invent.kde.org/utilities/markdownpart"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-misc/markdownpart/metadata.xml b/kde-misc/markdownpart/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-misc/markdownpart/metadata.xml
@@ -0,0 +1,8 @@
+<?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/skanlite/Manifest b/kde-misc/skanlite/Manifest
index e5a9e1338403..22c8e7d8d38b 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,5 +1,3 @@
-AUX skanlite-2.1.0.1-cmake.patch 2978 BLAKE2B 68d39415f4199b018028b16727f734117a7499be83904e80b9aeb2837a835141363516e0b452d81ddaab8b874de75e869168c9215babb3230c9a02a33b7f33e7 SHA512 7a7ee0f6b7b82a2b8e90ac58d632c92eb7c0992195f104ed794d14c451a21fefb7a3621bc22c14948b83b8e9aa86d9868ebd97d780a8d31f01186485d507d3ce
-AUX skanlite-2.1.0.1-hidpi.patch 2234 BLAKE2B c2867f5d6251b2258097e1682e2cc8a8263631000f32701802940d84d63e657d12a45b326932d3bb087c571928b08529d2e050cf5298addcb9749d38337a3635 SHA512 d5c559a8d057acce73db1252d52299a72788554845dd0a00fb000c15b7d0a4ba8d20f72a24dddd032c2cb8cf84ff6bef9b2d365cbb70e98f7003523d479e9e92
-DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
-EBUILD skanlite-2.1.0.1-r1.ebuild 1040 BLAKE2B 68f0e4f91e43a3e5b2acd4b9c7d809fcce8d8136fd1cd1ede94f36943b21da2d0339efd6775c4d2cc4b96e2a80f23b8d1511bb2614c2178adb28eb5976dc39e4 SHA512 0066e2f8de64404fac44075e2a9c67d4c77e24f62b2d39039ae42de5cfe310041d1edd8f7c3c5cb1cb3143b91edcef27a6884c2fadefa9612cec7b83c1cf3748
+DIST skanlite-2.2.0.tar.xz 2415104 BLAKE2B 4ae5d909cdfdf55a552c11346ac689190aa67fd960e2af98ccc02cbf834ec6668e2926a5ab8a07ff6c4a4ef375dc1979250686c5ba05f1a94be4c59026f44f1a SHA512 cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20
+EBUILD skanlite-2.2.0.ebuild 963 BLAKE2B ed5ce6f331c0919afb9885e92ec305bdefc1adc7f9d54ee6c70fdb38a283447797f628392786f8e1de286dd56e28e1764fcc4fab1f34be7d12c7503c163fe99c SHA512 081d96ae41052eb8b8755eebb6c3cf6e34fb629a83de74f4dedea41e94d90de63347058760616a1d25859286881aa5c757f0ad7d93875f3646c65a93a303e14e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
deleted file mode 100644
index 7b7daae11eac..000000000000
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 2 Apr 2018 21:27:52 +0200
-Subject: [PATCH] Cleanup CMakeLists.txt
-
-Summary:
-Cleanup duplicate find Qt5 and move all below #Dependencies block.
-Sort dependencies.
-KF5Sane is not an actual framework, so separate it from KF5 modules.
-
-Make use of FeatureSummary
-
-Reviewers: sars
-
-Reviewed By: sars
-
-Subscribers: ltoscano
-
-Differential Revision: https://phabricator.kde.org/D11861
----
- CMakeLists.txt | 32 +++++++++++++++-----------------
- 1 file changed, 15 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c23351..6b326df 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
- include(GenerateExportHeader)
- 
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
--
- # be not so strict with the poor developer who just wants to use strings
- remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
- 
--set(KF5_VERSION "5.1.0")
-+set(REQUIRED_QT_VERSION "5.2.0")
-+set(KF5_MIN_VERSION "5.1.0")
- 
- ecm_setup_version(
--  ${KF5_VERSION}
-+  ${KF5_MIN_VERSION}
-   VARIABLE_PREFIX SKANLITE
-   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
-   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
- )
- 
-+set(SKANLITE_VERSION_STRING "2.1.0.1")
-+
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
-+
- # Dependencies
--set(REQUIRED_QT_VERSION "5.2.0")
-+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
- 
--# Required Qt5 components to build this framework
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
- find_package(PNG REQUIRED)
--
- include_directories(${PNG_INCLUDE_DIRS})
- 
--set(SKANLITE_VERSION_STRING "2.1.0.1")
--
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
--
--find_package(KF5 ${KF5_VERSION} REQUIRED
--    COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
-+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-         CoreAddons # KAboutData
-+        DocTools # yields kdoctools_create_handbook
-         I18n
--        XmlGui # KAboutApplicationDialog
-         KIO # contains the KIOWidgets which we use in target_link_libraries
--        DocTools # yields kdoctools_create_handbook
--        Sane # will find KF5Sane
-+        XmlGui # KAboutApplicationDialog
- )
- 
-+find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
-+
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- 
- # Subdirectories
-@@ -62,6 +58,8 @@ add_subdirectory(src)
- add_subdirectory(doc)
- add_subdirectory(autotests)
- add_subdirectory(tests)
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
- find_package(KF5I18n CONFIG REQUIRED)
- ki18n_install(po)
--- 
-2.16.3
-
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
deleted file mode 100644
index 563f5950063a..000000000000
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From cb382f87d63bdc3736696ee289875bde2ecee9e5 Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <a.volkov@rusbitech.ru>
-Date: Thu, 25 Apr 2019 18:09:59 +0300
-Subject: Add HiDPI support
-
-Reviewers: sars, davidedmundson, ngraham
-
-Reviewed By: sars
-
-Differential Revision: https://phabricator.kde.org/D20821
----
- src/ImageViewer.cpp | 14 +++++++++++---
- src/main.cpp        |  1 +
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp
-index 09f9b3d..5cf1439 100644
---- a/src/ImageViewer.cpp
-+++ b/src/ImageViewer.cpp
-@@ -87,14 +87,19 @@ void ImageViewer::setQImage(QImage *img)
-     }
- 
-     d->img = img;
--    d->scene->setSceneRect(0, 0, img->width(), img->height());
-+    const auto dpr = devicePixelRatioF();
-+    d->img->setDevicePixelRatio(dpr);
-+    d->scene->setSceneRect(0, 0, img->width() / dpr, img->height() / dpr);
- }
- 
- // ------------------------------------------------------------------------
- void ImageViewer::drawBackground(QPainter *painter, const QRectF &rect)
- {
-     painter->fillRect(rect, QColor(0x70, 0x70, 0x70));
--    painter->drawImage(rect, *d->img, rect);
-+    QRectF r = rect & sceneRect();
-+    const auto dpr = d->img->devicePixelRatio();
-+    QRectF srcRect = QRectF(r.topLeft() * dpr, r.size() * dpr);
-+    painter->drawImage(r, *d->img, srcRect);
- }
- 
- // ------------------------------------------------------------------------
-@@ -118,7 +123,10 @@ void ImageViewer::zoomActualSize()
- // ------------------------------------------------------------------------
- void ImageViewer::zoom2Fit()
- {
--    fitInView(d->img->rect(), Qt::KeepAspectRatio);
-+    QRectF r = d->img->rect();
-+    const auto dpr = d->img->devicePixelRatio();
-+    r = QRectF(r.topLeft() / dpr, r.size() / dpr);
-+    fitInView(r, Qt::KeepAspectRatio);
- }
- 
- // ------------------------------------------------------------------------
-diff --git a/src/main.cpp b/src/main.cpp
-index aa704be..ae0d9b6 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -34,6 +34,7 @@
- 
- int main(int argc, char *argv[])
- {
-+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-     QApplication app(argc, argv);
- 
-     Kdelibs4ConfigMigrator migrate(QLatin1String("Skanlite"));
--- 
-cgit v1.1
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild b/kde-misc/skanlite/skanlite-2.2.0.ebuild
index 1a7a7c968a19..a79b4e6c1ead 100644
--- a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
+++ b/kde-misc/skanlite/skanlite-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
 HOMEPAGE="https://kde.org/applications/graphics/org.kde.skanlite"
-SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/2.2/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
 SLOT="5"
@@ -33,8 +33,3 @@ DEPEND="
 	media-libs/libpng:0=
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-hidpi.patch"
-)
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index addf50a958ea..a6775691a0f2 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,6 @@
-DIST tellico-3.2.3.tar.xz 5589552 BLAKE2B e22f0344ccd879694976bc00fa6bcb52e3b878d4ef92c05b9b9a62ab74b1e84cd4b649682a55ee4a1b2da4678676abe8f1da5591f57dbd7db156b5e5bd0b9dd1 SHA512 4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7
+AUX tellico-3.3.1-kf-5.72-findtaglib.patch 914 BLAKE2B 106852573d04d61d19dafb4b9156052f000c1b2547bab846420a8e563e0ad55f4fcde8f029de36f74983d0708647738c2fb462128c2806396a2cc0980237ce96 SHA512 32afc5f3959532ea387aaec93089f721bb4f274062c82c819fb3d78d5f2db041f2380b2d329e06b469801b2e82b7a21a38c17eef9f61277fd91d4ecce19a44b4
 DIST tellico-3.3.1.tar.xz 5619068 BLAKE2B 5b70f42102c2dbb349f343146edb30e94d73b891f7b95fcba87cc19ea6228a62273f9f0321c32037a62cb2cffa2ec61108db519b3387968d2a0ebd1ca332bfd7 SHA512 12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74
-EBUILD tellico-3.2.3.ebuild 2274 BLAKE2B 8e8e349acda8333b06c48e343cf441437961894c84c8d0a36e8f50da118835f8bbf85b2e08091f2822fbf232142930fac60d1ff1f12abcee23551e2c8dc7d01c SHA512 ebcc4734e81cb790e98fccf5fcb344b7fae5c6c1a0174a0201786c11c6e1da1f293400af2c0d39dced149fdafdb05c93ab44940b14956263f7c4641f43605cb0
-EBUILD tellico-3.3.1.ebuild 2276 BLAKE2B c4b8a113e598a8c19eefb94a8a3630483bba2c964bf9a0e440f72438fa30488e99cd34d3582f1457568b8dc97f2983e5892b9f350e7279a91541ab307c72a2c0 SHA512 a9803f077c989d4aa80e54fa594615e6b87e65d9c6a4f90a325cb619dc9b3b23bc980a40c6c3b25f9806fc2a514b8292728e1fd7c4e8b8225fd99f59e628c9a8
+DIST tellico-3.3.2.tar.xz 5623808 BLAKE2B 2c709a40799f53d8431cc4eeab5d33242e9f967fa9af02c05675730fdb9b249b05c7af17ab8269fec0b53e3d4ad6144213f060aa4b2c32e27bca93bd905d7828 SHA512 4e304553e58ea3cfcc8aabdbe86ea2b1b52edb6d4f690d0f9e5c5c6de152dac25889a7beea3394eac711ef2195efe1bf1f3fd48bf57aece923ed47b975d664d8
+EBUILD tellico-3.3.1.ebuild 2331 BLAKE2B ae0662da93b1ba2aec53aefb282901a61cf6402cf92b37f4e32feeed0531b180a731415bb94517e5e284e0bcc83c0a62837fcbae20ad9b8bac12492fe4fbe8e8 SHA512 66317ea638e63e6ae8ced0d7c8c57b7fecc630a6dbb4688dc2095ad69360f0660f85de7f5246cc27a6acff678681b936efef44c77624d2ad03b98170513c2bf9
+EBUILD tellico-3.3.2.ebuild 2276 BLAKE2B c4b8a113e598a8c19eefb94a8a3630483bba2c964bf9a0e440f72438fa30488e99cd34d3582f1457568b8dc97f2983e5892b9f350e7279a91541ab307c72a2c0 SHA512 a9803f077c989d4aa80e54fa594615e6b87e65d9c6a4f90a325cb619dc9b3b23bc980a40c6c3b25f9806fc2a514b8292728e1fd7c4e8b8225fd99f59e628c9a8
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch
new file mode 100644
index 000000000000..5d77a9816ba0
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch
@@ -0,0 +1,28 @@
+From 1051b34db65a45a4fd5f12cad0eebc27325a2be3 Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Fri, 19 Jun 2020 15:35:08 +0100
+Subject: [PATCH] switch order of cmake modules so it gives priority to the
+ local copy which will be the one it expects.  fixes build failure on KDE neon
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00ee0035..5b96f25b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,8 +20,8 @@ endif(POLICY CMP0063)
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+-                      ${ECM_MODULE_PATH}
+-                      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
++                      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
++                      ${ECM_MODULE_PATH})
+ 
+ #include(ECMAddTests)
+ #include(ECMMarkNonGuiExecutable)
+-- 
+GitLab
+
diff --git a/kde-misc/tellico/tellico-3.3.1.ebuild b/kde-misc/tellico/tellico-3.3.1.ebuild
index f39a4200a144..17945c0039b0 100644
--- a/kde-misc/tellico/tellico-3.3.1.ebuild
+++ b/kde-misc/tellico/tellico-3.3.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://tellico-project.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
@@ -71,6 +71,8 @@ DEPEND="${RDEPEND}"
 # tests need network access
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
diff --git a/kde-misc/tellico/tellico-3.2.3.ebuild b/kde-misc/tellico/tellico-3.3.2.ebuild
index b176e576cc48..f39a4200a144 100644
--- a/kde-misc/tellico/tellico-3.2.3.ebuild
+++ b/kde-misc/tellico/tellico-3.3.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://tellico-project.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
@@ -24,6 +24,14 @@ BDEPEND="
 	sys-devel/gettext
 "
 RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-perl/Text-BibTeX-0.780.0-r1
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	kde-frameworks/karchive:5
 	kde-frameworks/kcodecs:5
 	kde-frameworks/kcompletion:5
@@ -48,14 +56,6 @@ RDEPEND="
 	kde-frameworks/kxmlgui:5
 	kde-frameworks/solid:5
 	kde-frameworks/sonnet:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-perl/Text-BibTeX-0.780.0-r1
 	cddb? ( kde-apps/libkcddb:5 )
 	discid? ( dev-libs/libcdio:= )
 	pdf? ( app-text/poppler[qt5] )
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index 9567280aba02..3cb432bb2667 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,3 +1,6 @@
+AUX zanshin-0.5.71-akonadi-20.07.80.patch 605 BLAKE2B 7a7e3b8575499f53ec51dc958e2886dbd5202f9b533df7f7638ee1feed3de921bfff34de931274529a98b8f025116e044853b86ae315f0156cd62ec05ece49cd SHA512 cdf23cbaa72ec4179ddb85df41109f428614d66aa8d7a781135d092aaa51cf96ba2146a0f631ed1adbc93e8d78b007d5a7e2f94a5d237718c9f2f95f75a08121
+AUX zanshin-0.5.71-kontactinterface-20.07.80.patch 1656 BLAKE2B d28e5e881b31c3552939204ffc8aa68e1ee46c18045b67bbf711727e500105e6798c66e04399c90394da91d26efbb340674d359f87c2d55d468b880e9d0d84d9 SHA512 f2e588a92d7ef598ffcb7056868a008642ea32f06680d28cc17b1bb6f359de5bedaa37e6e709c3236b6e83532d145ffc739192ac7a2a15240634e05b393e0bc0
 DIST zanshin-0.5.71.tar.xz 307872 BLAKE2B 3b767af7527348177b7105126acedd47e222859985feb47f89066732293d77d89347ab105b3a8269717c5fc723f1b8bcd1a52e5242bf77828019e55a48e2db6a SHA512 47b4fa8797dd50372dcf176198e1c80348cd1ba604d1ed61cd973956e54ba5551caea33c766d857bc3ad598bd0eae9882ffc315e13e6e3b9c1033d01c8e029d8
-EBUILD zanshin-0.5.71-r1.ebuild 1831 BLAKE2B 8b09c397f7ab81504875be6c6f80aff65f0e1c9d0fbd5038f4b92763b4843c4efbd2276b6e1a7630d303d8eeab47f1feba7ffac1dd639799ec995c9f7ee4fc39 SHA512 36154332e7212d62d2e881c947eb761546e4c63ad0a47185e7a5e1d874ee36bacf1e2d8dbe4a2969fa012bfcaf43da6fb2fbf8bed8497470f2ed589ef1b8b705
+EBUILD zanshin-0.5.71-r1.ebuild 1708 BLAKE2B 7a2587d90857f7072138f408b8a0a2ad4b04a2b8e337f0f855c3c985e595789229e8a879c34c7c651aea2ce8ac2a3e2f585bd34c1c63410bd59aac4fa1f12f8a SHA512 bf35cfd229c687f143ad323964375fd8e6144be0a66a8ea0213460fb93100e1633ef93e9a1a98d054ce614c1d8393e64effd822779fd9d84faae549dd3627eb4
+EBUILD zanshin-0.5.71-r2.ebuild 1918 BLAKE2B 89ac432b66deb52aa29aeec3b27b4dbc8ae5833651a7352ab413466e4118aeb7716acf98d92ecaa66024dd079511952d95c8b7bb823ecc17c0ccb5f951d44d6c SHA512 f9f9757261be097e06d89c85bdbb78a32183c1a800b5d7a777011f309ef17615601294d897ca638de3756836b8755ce3b208263964843811244db1adb8c1f1a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch b/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch
new file mode 100644
index 000000000000..59afdfad7762
--- /dev/null
+++ b/kde-misc/zanshin/files/zanshin-0.5.71-akonadi-20.07.80.patch
@@ -0,0 +1,24 @@
+From d37e34f78b3cb3ec5890ce22b0d15ad6e639f9be Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sat, 20 Jun 2020 09:44:44 +0200
+Subject: [PATCH] Build against a recent Akonadi
+
+---
+ tests/testlib/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/testlib/CMakeLists.txt b/tests/testlib/CMakeLists.txt
+index 794ac2b2..9b786b77 100644
+--- a/tests/testlib/CMakeLists.txt
++++ b/tests/testlib/CMakeLists.txt
+@@ -21,6 +21,7 @@ target_link_libraries(testlib
+     KF5::AkonadiCore
+     KF5::AkonadiXml
+     KF5::CalendarCore
++    Qt5::DBus
+     Qt5::Test
+ )
+ 
+-- 
+GitLab
+
diff --git a/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch b/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch
new file mode 100644
index 000000000000..a5b39bbe6756
--- /dev/null
+++ b/kde-misc/zanshin/files/zanshin-0.5.71-kontactinterface-20.07.80.patch
@@ -0,0 +1,58 @@
+From 4850c08998b33b37af99c3312d193b063b3e8174 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 11 Apr 2020 17:36:25 +0200
+Subject: [PATCH] Port to kontactinterface >= 5.14.42, with ifdefs
+
+---
+ src/zanshin/kontact/kontact_plugin.cpp | 7 +++++++
+ src/zanshin/kontact/kontact_plugin.h   | 5 +++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/zanshin/kontact/kontact_plugin.cpp b/src/zanshin/kontact/kontact_plugin.cpp
+index b03d9674..4b0d2f92 100644
+--- a/src/zanshin/kontact/kontact_plugin.cpp
++++ b/src/zanshin/kontact/kontact_plugin.cpp
+@@ -33,9 +33,16 @@ Plugin::Plugin(KontactInterface::Core *core, const QVariantList&)
+     setComponentName(QStringLiteral("zanshin"), QStringLiteral("zanshin"));
+ }
+ 
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
++KParts::Part *Plugin::createPart()
++{
++    return loadPart();
++}
++#else
+ KParts::ReadOnlyPart *Plugin::createPart()
+ {
+     return loadPart();
+ }
++#endif
+ 
+ #include "kontact_plugin.moc"
+diff --git a/src/zanshin/kontact/kontact_plugin.h b/src/zanshin/kontact/kontact_plugin.h
+index 0d45564e..a270ba16 100644
+--- a/src/zanshin/kontact/kontact_plugin.h
++++ b/src/zanshin/kontact/kontact_plugin.h
+@@ -25,6 +25,7 @@
+ #define ZANSHIN_KONTACT_PLUGIN_H
+ 
+ #include <KontactInterface/Plugin>
++#include <kontactinterface_version.h>
+ 
+ class Plugin : public KontactInterface::Plugin
+ {
+@@ -36,7 +37,11 @@ public:
+     int weight() const override { return 449; }
+ 
+ protected:
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
++    KParts::Part *createPart() override;
++#else
+     KParts::ReadOnlyPart *createPart() override;
++#endif
+ };
+ 
+ #endif
+-- 
+GitLab
+
diff --git a/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
index 7a3ae88bf309..d864e26cf2b1 100644
--- a/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
+++ b/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KDE_APPS_MINIMAL=19.08.3
 KFMIN=5.60.0
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
@@ -24,18 +23,18 @@ SLOT="5"
 IUSE=""
 
 BDEPEND="
-	test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] )
+	test? ( <kde-apps/akonadi-20.04.50[tools] )
 "
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/kmime-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5
+	<kde-apps/akonadi-20.04.50
+	<kde-apps/akonadi-calendar-20.04.50
+	<kde-apps/akonadi-contacts-20.04.50
+	<kde-apps/kmime-20.04.50
+	<kde-apps/kontactinterface-20.04.50
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -59,5 +58,5 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-misc/zanshin:4
-	>=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5
+	<kde-apps/kdepim-runtime-20.04.50
 "
diff --git a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
new file mode 100644
index 000000000000..e8fe90d5d2c2
--- /dev/null
+++ b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_APPS_MINIMAL=20.08.0
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Getting things done application by KDE"
+HOMEPAGE="https://zanshin.kde.org/ https://userbase.kde.org/Zanshin
+https://kde.org/applications/utilities/org.kde.zanshin"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5[tools] )
+"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/akonadi-calendar-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/akonadi-contacts-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kmime-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kontactinterface-${KDE_APPS_MINIMAL}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${KDE_APPS_MINIMAL}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-kontactinterface-20.07.80.patch"
+	"${FILESDIR}/${P}-akonadi-20.07.80.patch"
+)