gentoo resync : 25.08.2020

4 files changed, 12 insertions, 64 deletions

diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index b13c75c7b2b8..8345e02c8a27 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,6 +1,5 @@
-AUX krdc-19.12.3-kf5bookmarks-5.69.patch 1465 BLAKE2B da8cee814ad2b6ae1e1f054c1265a61b6a7553a9473ef4c436634d2f03929435a0d9329fae79eaefb73bec6ba2e87814b1561ffa4b59018ca9c123afe29d2629 SHA512 6a88262a2434316b516134d9419c5d0652133a4c10d925171cc549e1f11392f6c7b2f44295a5ed96b55ba2ebc6ae1d6cba54f9f766e968f58ed665f36387ac9f
-DIST krdc-19.12.3.tar.xz 1424052 BLAKE2B b03514265d0e7af5e75dab5a224f61b43f33e36a1617dac7e99270e82e5954fc8910072e11561fb51fd1d8ee7287aaf24371d9b1d1022418e4e30defcb45ad48 SHA512 f752180980eebc9aaee92180d3bbc9e4db723ef0ed637b3ec66a5944e30eba3c224972d4e8f543ee1c32a4e62a0d90d37c4f82f575e94a3ac8d9dbe5feb63474
-DIST krdc-20.04.2.tar.xz 1425020 BLAKE2B f6c7416710292511a34426f6d9b5ee6aef8c619683a581359d954fb6da556a1994d218e1544572c952f3f4e904cf33304c5e4743603488dc7b7ab7810b0d265a SHA512 b57689ac2e3a06aadfc256458b826c081717291b6d40660d736ee34cd3f2f1bcc18508697e6049248e11b9dbd6e4fa9f5a932b233659119483a6e42f26d36692
-EBUILD krdc-19.12.3-r1.ebuild 1528 BLAKE2B 678bd6452863fd11f0c1562b2c95ac07d7e561b42c58a1cd304c27fdc03fc426a6463a050ef1ef2f3b1e2a6c8e77a505ae66d0857e86f4f0a0b3c258c61106a5 SHA512 fd5afcc1a8c63a0ee697eab6b0c7c0f913370c42ef48f657bfd4b6a71b5accc72a89fa04253edb1136360089a499a7b0df9ce39ef867f49fb76add78c522060e
-EBUILD krdc-20.04.2.ebuild 1418 BLAKE2B 5e74f4028f06f85131423c04b1f65febdde7b9dc477d0fb65aaacb173dffae512c021d849b340d1647a2a23e7c09e3a6438248a756528ee761c8ea4a0a870336 SHA512 31fad09086ddfc156ae01152acf7086a8b008c84d05c2e50db86f0ef767f8100e179c81e74444d5a6ce361e89654c6aed93b0d3c261b0dafe99df41fe939cc32
+DIST krdc-20.04.3.tar.xz 1424740 BLAKE2B 92f3751c14974ea3b79e17dbadd8f89665adbcc5c147bc5228d9bf6bb146e079a82343840adb62e812b31dc4553faa77a45bdd4a176f83f9e4d14f4423b86be2 SHA512 f7ff9be6ffa612e8da0766309f812e7041393eb9b5ff4b1cb58385f1f754c0851357a4509bff7eea76e0e035bcefac9580415710561f1369dab1dd4e9f86a4ff
+DIST krdc-20.08.0.tar.xz 1564072 BLAKE2B 26242c5b114f57f063e4facab55aad63b7a55da92c59ddb5af8c66fcb12698a4469296fcc1aa72071b2f015d607c8c6c4d0751d111f9534be9d8dd9cf74e14ca SHA512 14aa0d59110945ff61355c4866ae794aeaf4c5362861d4f002df9d98927ee50c169e8aae6ed52cc51f5599ceb8d1a766567f5730425ff4a50f4c0c307ed24303
+EBUILD krdc-20.04.3.ebuild 1415 BLAKE2B 5a417f4fedc9887c5e58a0e4b8533cb5c630bff2b473a40217e760feb34641649e7168c8faae44643ed43721b6037ced46c02aeb648ad7cecb768d3d780a3b14 SHA512 0f4508934ba6683c4f3375ae3bfc603f22e8f666ed6135fd24369247bf74e9db94d655544d54c985afdfceef38dc9d47129a94027977414f07c0528305ec0ac8
+EBUILD krdc-20.08.0.ebuild 1418 BLAKE2B 676f21fb069a414263df92b70eb881d826d5e302790bee6efcab5e08cf0cf6bf067ea4b8ce2f2d41e51f05144e0736bf3d59384d818b0cd753b5fa7c7a901ba9 SHA512 98e9450275220f1ec9c20bb09d0cb74c39070622d789504522317b91ce62399da117a64461e4295f31e557eaca812d457a07b59f30dba93fb7e1ec946f3a4733
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch b/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch
deleted file mode 100644
index 03dc0059147a..000000000000
--- a/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 70e9d2728a4928dd2aeb170935d966e934315cf4 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 17 Apr 2020 15:52:15 +0200
-Subject: Adapt to changes in KBookmarks >= 5.69
-
-Test Plan:
-The Bookmarks menu is still added as expected and the actions still show
-in the configure shortcuts dialog. I couldn't test actually creating a
-bookmark as I have no access to remote servers.
-
-Reviewers: cfeck, uwolfer, murrant
-
-Reviewed By: cfeck
-
-Differential Revision: https://phabricator.kde.org/D28920
----
- bookmarkmanager.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/bookmarkmanager.cpp b/bookmarkmanager.cpp
-index 47ac779..a34cb2c 100644
---- a/bookmarkmanager.cpp
-+++ b/bookmarkmanager.cpp
-@@ -25,6 +25,7 @@
- #include "mainwindow.h"
- #include "krdc_debug.h"
- 
-+#include <kbookmarks_version.h>
- #include <KBookmarks/KBookmarkOwner>
- #include <KLocalizedString>
- 
-@@ -41,7 +42,13 @@ BookmarkManager::BookmarkManager(KActionCollection *collection, QMenu *menu, Mai
- 
-     m_manager = KBookmarkManager::managerForFile(file, QLatin1String("krdc"));
-     m_manager->setUpdate(true);
-+
-+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
-     m_bookmarkMenu = new KBookmarkMenu(m_manager, this, menu, collection);
-+#else
-+    m_bookmarkMenu = new KBookmarkMenu(m_manager, this, menu);
-+    collection->addActions(menu->actions());
-+#endif
- 
-     KBookmarkGroup root = m_manager->root();
-     KBookmark bm = root.first();
--- 
-cgit v1.1
-
diff --git a/kde-apps/krdc/krdc-19.12.3-r1.ebuild b/kde-apps/krdc/krdc-20.04.3.ebuild
index 967beea4ffec..e8ae84239198 100644
--- a/kde-apps/krdc/krdc-19.12.3-r1.ebuild
+++ b/kde-apps/krdc/krdc-20.04.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="optional"
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Remote desktop connection (RDP and VNC) client"
@@ -16,10 +16,12 @@ SLOT="5"
 KEYWORDS="amd64 arm64 x86"
 IUSE="+rdp +vnc"
 
-# drop kbookmarks subslot operator when KFMIN >= 5.69.0
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
 DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -35,17 +37,12 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	vnc? ( >=net-libs/libvncserver-0.9 )
 "
 RDEPEND="${DEPEND}
 	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
 "
 
-PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package vnc LibVNCServer)
diff --git a/kde-apps/krdc/krdc-20.04.2.ebuild b/kde-apps/krdc/krdc-20.08.0.ebuild
index 49fc1c00bb43..38d98430e2f1 100644
--- a/kde-apps/krdc/krdc-20.04.2.ebuild
+++ b/kde-apps/krdc/krdc-20.08.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="optional"
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Remote desktop connection (RDP and VNC) client"