gentoo resync : 17.02.2020

4 files changed, 9 insertions, 63 deletions

diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 6c838bdf5dc3..9d47568d647c 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,6 +1,5 @@
-AUX plasma-integration-5.17.4-fix-filedialog-size.patch 1791 BLAKE2B 12e510a9cded2df70c3380a6162e3db874468613acb37249501060402628b4a42755d684fcdf542bdb1a9d5f72db049ed05b5038e827c65eb7f5fec51c715098 SHA512 ff17e527bafa72f6165136d4d588af7861296fcc12c60f70163a6f76eaacfec8b34b803fb3c8f3c1540f9deb57a6512a77fdec875c9b8cb77feb67a94b16cadd
-DIST plasma-integration-5.17.4.tar.xz 56724 BLAKE2B 74a86033ac9f00effdac120f237e06cd96789711c06007f716c5eb33bccae0b38125731ff4f5735faa13d1969c884a54f7d5358f82c714c3c786e62a210989e5 SHA512 301fb2faa42cf2c579070a2136c3e39db495b35e715abcd336a5fc1044a5134b5006e022ad9d69b530e7f308e2ad2486ee44317f3436d9c42412bf61a3047ebd
 DIST plasma-integration-5.17.5.tar.xz 56836 BLAKE2B aa22d2f362f07e33ca75ada88b05a93ee9bc6f2bb6e136d9a08526e54a1e68a5c7947e617085f068363f40d5748b9fdcb7a93ad57016dd6844718d843c01897f SHA512 9341ca525e1c02b0ee00d01221a68f683717f89c19408f5b94004fa13fb63fa7983609756ce64fd0b21301fb2a51a3e531c0b2bc1c46ca656dc41b08076baca2
-EBUILD plasma-integration-5.17.4-r1.ebuild 1285 BLAKE2B 8c991bc0e598fb5c2900950cbb9e7fb521010158e1f857ec21d7e5ebcdf180b75d7fe154903c98df05ca3befbf159662ebefa7da9a779968bdeec01c6861f8bf SHA512 51f0c7f3690d1f2819d19e6084ba1e03d1ce889b7cce5ab51f2516cee717a5bac610e1b8348016805719944e6469eb96c33dd792dcbc0622491a66cee6ec5a02
-EBUILD plasma-integration-5.17.5-r1.ebuild 1309 BLAKE2B 19351b8ba9fba41fac4626885809fdf7d9d8731284156912628995cf852df5e62cab87e10aaafa289dc0900e8c5befa7ede9aae3cdfd98af43205690f194bbb2 SHA512 ea1e9c3ca8c7a03da51a575e8f0211b539892351693feb968f597f3d49712ce426bfa1e1e1278ecffffdc5fe656ac6f7988ac2bf873fc71fd0565f8e420e09de
+DIST plasma-integration-5.18.0.tar.xz 57712 BLAKE2B 3144b397cb7316a760fe35a5bac75f04bc511d5a6b3af54494cbde3df98a14f3c4d754d1136043b70182e0e252bd247b6edeb68428ac87dfb550a7fef4e8571f SHA512 c6ba798d6525c7d8cfd46874a1ffd7c6147e600f64a49b410b124945f7a46de0003166b049981897fb20f8776a66d14b9cf7fc1e4729497dc6285421d5161850
+EBUILD plasma-integration-5.17.5-r1.ebuild 1306 BLAKE2B fa1cef4c16b42503cdf668c5029242bd3df4e597844abed15d3b552b75e64a709458a7f871545f89244ce9b92339b12f999a0f65ecde5f2b17931a2c372665a9 SHA512 810e9037df1415f6e224a64b912c3db67e6dd72c1b25cf6e679799eb28e1cc0d42cf67685b0d8a00ca03690d0dccf1d943f39149abd33125e150a2e28f88bb8a
+EBUILD plasma-integration-5.18.0.ebuild 1221 BLAKE2B 0ff45380455d36c387b0988a31d2bbfc3b2fbd3a56fefda0082bdb07fb4889b7dea4ea58b535e4e412fd75157cdc3dd5ddcf58ead2785e2410df17b2f0ad7f39 SHA512 d10e219863d0c94aae1bb07151943d37322c6b837569208594ba0eeecd3213385f1540a7a17c2ff04a3727200589d6221bbdcd17ceeea5c289047b5faaa353d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch
deleted file mode 100644
index b49006bcde99..000000000000
--- a/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 2e9f96847432c707a9dfbfe0748f0524a128abb7 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Sat, 14 Dec 2019 14:03:30 +0100
-Subject: Resize file dialog window before size restore
-
-Summary:
-KDEPlatformDialogHelper explicitly resizes the window contents to the
-window as part of a bug fix. This means we lose the common path where
-the window resizes to the content's size hints that happens later.
-
-If we resize the window to the size hint in advance we keep our size
-hint.
-
-(alternatively it seems to be me we can remove that old hack...but it
-needs testing by people with Qt5.12)
-
-Test Plan:
-KWrite -> open
-
-Size is 900x600, the size hint
-not 640x480 the QPA default
-
-Reviewers: #plasma, ngraham
-
-Reviewed By: ngraham
-
-Subscribers: ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D25986
----
- src/platformtheme/kdeplatformfiledialoghelper.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp
-index efb7b60..4c67547 100644
---- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
-+++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
-@@ -370,6 +370,10 @@ void KDEPlatformFileDialogHelper::restoreSize()
- {
-     m_dialog->winId(); // ensure there's a window created
-     KSharedConfig::Ptr conf = KSharedConfig::openConfig();
-+
-+    // see the note below
-+    m_dialog->windowHandle()->resize(m_dialog->sizeHint());
-+
-     KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize"));
-     // NOTICE: QWindow::setGeometry() does NOT impact the backing QWidget geometry even if the platform
-     // window was created -> QTBUG-40584. We therefore copy the size here.
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.5-r1.ebuild
index 315b84856988..812b0146b60a 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.17.5-r1.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.17.5-r1.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.18.0.ebuild
index 0cb03091d71d..e7b482cfa171 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.18.0.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
+KFMIN=5.66.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~ppc64"
 IUSE=""
 
 DEPEND="
@@ -45,5 +46,3 @@ RDEPEND="${DEPEND}
 
 # requires running kde environment
 RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-filedialog-size.patch )