gentoo resync : 18.05.2019

4 files changed, 8 insertions, 90 deletions

diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index a7dc415bd99c..2a978c613dfd 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,6 +1,5 @@
-AUX kxmlgui-5.54.0-kcheckaccelerators.patch 2830 BLAKE2B 0b2efb47f00c14da7b2e4cde06129f6c3d39aa7232908521458b5e09aaa3564c7ed8bae5ba383f587db27f154d7685e918318ed8db2145fa3f3634483503f562 SHA512 5f960842be0f2d4a5fbac8f08af49ce8c1247b152b96feecbfdfface3039a38dbf17bf4f0f584ff6956d842e9bfdb9884db7651a636c01bb872b279ed2dd5222
-DIST kxmlgui-5.54.0.tar.xz 869308 BLAKE2B f9f19452444074e2ce78f7a8c902b9703e0532974659ac5a34898debe52cd6dd05752c4923a9d1afe9606e628cb696ff59f0a5b78ad6d13f75c077b9bbde35e9 SHA512 bde15df90e758f778116d29446dd30b16628b02050ac6ba73dd2c9505bbf26f13106a7257680009169dc1d8c196ac7f3e8c1ffad2d63a6f0a9b8fb66ae89bbf5
 DIST kxmlgui-5.57.0.tar.xz 870632 BLAKE2B 27e16e66f3bb1eb82863b470a6635aef79f6e131af3f3dd74f06346dd5e5c8a471da9c081fa4b56428a37691728a26bffd129d17ad11df16d931078addb81ac3 SHA512 30ab6e8734a03d387880e7e9b4f33f4dda2d3b778d7689093575c03ddeee1e640d1b0ffc17cc8eb82c3fb49eaeca422bc7e05b28838e9ebe5f725e08e4fb625b
-EBUILD kxmlgui-5.54.0-r1.ebuild 1278 BLAKE2B daa0100abbb8bc497ff8e78c99eb5851115d16919dd8c8ad3ddd82fd46e95803c5d239ceb127e4b71b6463efb76de4162a13cf9c7b46410fe3e51f186e6e8645 SHA512 0131175add118e31824565c95a71a9a7b9b5ffa2b9d2333cb603257c0bb51ebb26fecb76e25b3f285c68112df5cee113d1b83664c899422e28e680cc6bb6245e
-EBUILD kxmlgui-5.57.0.ebuild 1222 BLAKE2B 45653c9b4eabc2e63417c9d5ba62ccfa4eb4bbf26e5e10876fb0f5e1edb9d7ed56a795a0a65e7636edb0c0e7ab3aea05d83102ae8249bc282d9133646041c325 SHA512 7ae7298346f82aa412b1155161d6efc5e0c63cfe193d0d76a6a80b3dabbe99d8e9d2f595f30dc2276d87b23c43a227be49fafaeb0e83b0eaa990fadd05ddd628
+DIST kxmlgui-5.58.0.tar.xz 869828 BLAKE2B 93ccca5b0fa12e37f86ef3ca3dc52f2955ece71583ac32db7ee077160c95d095170bc1ee3ebd9bade730112eec807259bb1ee9e9849040f4f1ac4300d267cfda SHA512 22d718f49b5d9b4caca4fc38be4fac42c21d2ff481d0fa0d821df0223b255a79ac27dfd83773a8c0d24b9db79bbc0d486ada7c73d44ce1aeae35792ab4551be6
+EBUILD kxmlgui-5.57.0.ebuild 1220 BLAKE2B d2feb3da9ef378f5327dac99d8edcaf7a23905e7594786a73b109a75e9ec8e3cf4113aaa831db5e75cf613974e9812d0c6d0752a2a6820a1147fbe7b2c010d08 SHA512 e87d0c09235e58aeff9e9c82e8cb5b0f171ab37deb72199fb0c55de1eb0395dd6a397fb6ce0d7a66148b42d03326c71fc02ace43ba8dfc5d1c7a7ab949991632
+EBUILD kxmlgui-5.58.0.ebuild 1222 BLAKE2B 45653c9b4eabc2e63417c9d5ba62ccfa4eb4bbf26e5e10876fb0f5e1edb9d7ed56a795a0a65e7636edb0c0e7ab3aea05d83102ae8249bc282d9133646041c325 SHA512 7ae7298346f82aa412b1155161d6efc5e0c63cfe193d0d76a6a80b3dabbe99d8e9d2f595f30dc2276d87b23c43a227be49fafaeb0e83b0eaa990fadd05ddd628
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch
deleted file mode 100644
index 0882d5f09f9c..000000000000
--- a/kde-frameworks/kxmlgui/files/kxmlgui-5.54.0-kcheckaccelerators.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 02b523bad09aab062355e46771889b0f3709692f Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sat, 12 Jan 2019 18:39:33 +0100
-Subject: Make KCheckAccelerators less invasive for apps that don't directly
- link to KXmlGui
-
-Summary: BUGS: 337491
-
-Test Plan:
-Ran qtcreator and it no longer has the & in Details
-Added some debug and checked that okular still gets the code called
-
-Reviewers: anthonyfieroni
-
-Reviewed By: anthonyfieroni
-
-Subscribers: davidedmundson, anthonyfieroni, kde-frameworks-devel
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D18204
----
- src/kcheckaccelerators.cpp | 38 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/src/kcheckaccelerators.cpp b/src/kcheckaccelerators.cpp
-index 13fc012..e08447d 100644
---- a/src/kcheckaccelerators.cpp
-+++ b/src/kcheckaccelerators.cpp
-@@ -80,10 +80,44 @@ public Q_SLOTS:
- 
- static void startupFunc()
- {
--    // Call initiateIfNeeded once we're in the event loop
--    // This is to prevent using KSharedConfig before main() can set the app name
-+    // Static because in some cases this is called multiple times
-+    // but if an application had any of the bad cases we always want
-+    // to skip the check
-+    static bool doCheckAccelerators = true;
-+
-+    if (!doCheckAccelerators) {
-+        return;
-+    }
-+
-     QCoreApplication *app = QCoreApplication::instance();
-+    if (!app) {
-+        // We're being loaded by something that doesn't have a QCoreApplication
-+        // this would probably crash at some later point since we do use qApp->
-+        // quite a lot, so skip the magic
-+        doCheckAccelerators = false;
-+        return;
-+    }
-+
-+    if (!QCoreApplication::startingUp()) {
-+        // If the app has already started, this means we're not being run as part of
-+        // qt_call_pre_routines, which most probably means that we're being run as part
-+        // of KXmlGui being loaded as part of some plugin of the app, so don't
-+        // do any magic
-+        doCheckAccelerators = false;
-+        return;
-+    }
-+
-+    if (!QCoreApplication::eventDispatcher()) {
-+        // We are called with event dispatcher being null when KXmlGui is being loaded
-+        // through plasma-integration instead of being linked to the app (i.e. QtCreator vs Okular)
-+        // For apps that don't link directly to KXmlGui do not do the accelerator magic
-+        doCheckAccelerators = false;
-+        return;
-+    }
-+
-     KCheckAcceleratorsInitializer *initializer = new KCheckAcceleratorsInitializer(app);
-+    // Call initiateIfNeeded once we're in the event loop
-+    // This is to prevent using KSharedConfig before main() can set the app name
-     QMetaObject::invokeMethod(initializer, "initiateIfNeeded", Qt::QueuedConnection);
- }
- 
--- 
-cgit v1.1
-
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.57.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.57.0.ebuild
index 2d76a9afcd7f..01c7708c9951 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.57.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.57.0.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 LICENSE="LGPL-2+"
 IUSE="attica"
 
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.58.0.ebuild
index 81ce23d344dc..2d76a9afcd7f 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.54.0-r1.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.58.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="LGPL-2+"
 IUSE="attica"
 
 # slot op: includes QtCore/private/qlocale_p.h
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -32,9 +32,7 @@ RDEPEND="
 	$(add_qt_dep qtxml)
 	attica? ( $(add_frameworks_dep attica) )
 "
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-kcheckaccelerators.patch" )
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(