gentoo resync : 25.08.2020

4 files changed, 9 insertions, 63 deletions

diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index c3913e186fb5..22726e8e6c5b 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,6 +1,5 @@
-AUX kcharselect-19.12.3-kf5bookmarks-5.69.patch 1438 BLAKE2B 35ac0e002594fe44f538f234deb5db12a10ce4ef2b1d68970b7793dc625f5c3d0ab146a20f45a75b84e6559f78147843e634bbb0282bb591c33c786e286f660e SHA512 22ab35f9bdd112c296f654dc231078461c90a17398d351cbf0e8b56565339f52da4ac5921f543eef8ef8ae01352cd5409d4fe7f783b5fa71c7a7539fa67819ab
-DIST kcharselect-19.12.3.tar.xz 334996 BLAKE2B 894618ae1e3837169247a3ad4a79b9f74ef7771a19ad0d3615c52039b0f2821e7e21175dd4b9a64a7eba852b0228324b93eb51273902326da53e8891a28f55c8 SHA512 85851910deb6c9eab2b02ce7d18fa703c78175f029469500f064e4af86d58b914287da33aeab9372db8919da7a509137849a3038e29e0d03bc125cfae9745006
-DIST kcharselect-20.04.2.tar.xz 335648 BLAKE2B bc7d550dc2ae552975b5fbf8a2f68756ef3626e13f8b9b73811066c90b5f8859a34dec889c3724eeb800d8e6fa9b9e0ac5f7e610430d0c91fb4725633c1ac484 SHA512 47f84a4e193accb13febf3270bf2c00e52e0d5c70fa19d2b345ce6dcb9a54332ea3b29fcbdf449d78e00b49fd1b4d6f91b506c41d77bf4777c17d721fa39792b
-EBUILD kcharselect-19.12.3-r1.ebuild 912 BLAKE2B 647ddad4aea05a92864cae6a1bbda33dfeee1347f4698430f0e3c85ad1bc5698125180a4bb71b5bde75b0cd7f60d87ec416f7c8ab447b6c398604a0a971319a5 SHA512 e0a213748deb896ca0a4b7132826a7ef9b8fa34a2d83cf10bbecfee7d524ad779b233176469c38e45066bd4d3bd885bd5afde9179eb3e7a76156eb8da821ac68
-EBUILD kcharselect-20.04.2.ebuild 802 BLAKE2B 594e9dd7c3928d403caaa760a5e758ffc3329b9d70cf0e2741ec321bfdc3de5150138094ab7b6eac9d08efd8990327e37bbce2381cbba48a54b8fbd1f480874c SHA512 8fefed27b7217609f714ae17f879f781e61a5cbc7bbafaf3c470607aea53b2719ae5dd071fc7aebb16ed7ecc5f43064efb2fa51e91ff6f114e47d9bebf2ad9f3
+DIST kcharselect-20.04.3.tar.xz 335620 BLAKE2B bb5aa7fe86ac2be85e84d8b3004ac0a7e9f15e77591bde7008fb1412b8df20175d2cca7d825792c504737db4a694425f0f04655314bcfaa1fb103bcd7c0895bd SHA512 f286115802d76d94ec7b42d874cbae750b707fccce00f3292cf861ded72ce32bc905a477c07afd03b24c214e3716ee7db445d1174bb6642fff9692a5046ff998
+DIST kcharselect-20.08.0.tar.xz 366020 BLAKE2B ee34e6fcf4a95d28845c7225e15456fe2a362f63e5a2f8e2475fc18916eaa316982161d29a50c59bbeaf5f51b1c0f3f88dfec91bc93f5bcc1c1c3cd9ef86bf1e SHA512 84b62fdc5071c3c156fd9cef9ba208e5d32f58a3f99c7e068443ea303d8596dbb6175a6c4b9c724122ac1a9d25e721e119549d64d9c021a5933929d3c8d2c540
+EBUILD kcharselect-20.04.3.ebuild 799 BLAKE2B c8a72511c1991f440a75c3ed2f4b40d9b741ee9869bdd713a29f4aa28674867dfa268d3b7c9c42a50ad276497be6958e4c56dc3efbc80c5c364dc72d413d7246 SHA512 4cb3bdcf84df80cb5b2a182d3fd19851d3054bd60fb386debd9b3116d86240b54dad917803e78cf5e5b1b94c42fe55e06c7318bb5e98617c3e2c80f4d274d7ec
+EBUILD kcharselect-20.08.0.ebuild 802 BLAKE2B e62520c5a90c5de1644371076a6656095f45c05a0b3af1a8f7f2a13ec1b4e919b91f85a618a25d646f80a681fa5eec4b22ed5068d227c2e2df30fdfc75456fcc SHA512 88718d5395f4b7acd527cd8d8629c191f97d04e6842873d17ac50e3dd75f539e49168a0f52b7066389de45c71c156471c64f4b9754769428c19fe204189397c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch b/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch
deleted file mode 100644
index 46d943bb0372..000000000000
--- a/kde-apps/kcharselect/files/kcharselect-19.12.3-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7972b9858bcdd2bf8cd2b09cb7e8b6c9b51dfec9 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 17 Apr 2020 21:49:00 +0200
-Subject: [KCharSelect] Adapt the code to KBookmarks-5.69 changes
-
-Test Plan:
-The Bookmarks menu has the usual entries, and the bookmark actions are
-displayed in the configure shortcuts dialog.
-
-Reviewers: cfeck
-
-Reviewed By: cfeck
-
-Subscribers: asturmlechner, kde-utils-devel
-
-Differential Revision: https://phabricator.kde.org/D28927
----
- kcharselectdia.cc | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/kcharselectdia.cc b/kcharselectdia.cc
-index 116cba4..37ef894 100644
---- a/kcharselectdia.cc
-+++ b/kcharselectdia.cc
-@@ -27,6 +27,7 @@
- #include <QMenu>
- 
- #include <KActionCollection>
-+#include <kbookmarks_version.h>
- #include <KBookmarkManager>
- #include <KBookmarkMenu>
- #include <KConfigGroup>
-@@ -185,7 +186,14 @@ KCharSelectDia::KCharSelectDia()
-   action->setText(i18n("Bookmarks"));
-   QMenu *bmmenu = new QMenu(this);
-   action->setMenu(bmmenu);
-+
-+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
-   KBookmarkMenu *bm = new KBookmarkMenu(manager, new KCharSelectBookmarkOwner(this), bmmenu, actionCollection());
-+#else
-+  KBookmarkMenu *bm = new KBookmarkMenu(manager, new KCharSelectBookmarkOwner(this), bmmenu);
-+  actionCollection()->addActions(bmmenu->actions());
-+#endif
-+
-   bm->setParent(this);
- 
-   setupGUI(ToolBar|Keys|Save|Create);
--- 
-cgit v1.1
-
diff --git a/kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild b/kde-apps/kcharselect/kcharselect-20.04.3.ebuild
index c4875ac0788d..cd7a9ba2cd5d 100644
--- a/kde-apps/kcharselect/kcharselect-19.12.3-r1.ebuild
+++ b/kde-apps/kcharselect/kcharselect-20.04.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE character selection utility"
@@ -17,11 +17,10 @@ SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-# drop kbookmarks subslot operator when KFMIN >= 5.69.0
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5=
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -30,5 +29,3 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" )
diff --git a/kde-apps/kcharselect/kcharselect-20.04.2.ebuild b/kde-apps/kcharselect/kcharselect-20.08.0.ebuild
index 361f2e67db2f..dc845b25aff3 100644
--- a/kde-apps/kcharselect/kcharselect-20.04.2.ebuild
+++ b/kde-apps/kcharselect/kcharselect-20.08.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE character selection utility"