gentoo resync : 02.05.2018

3 files changed, 2 insertions, 67 deletions

diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index e816d597ed11..f98733ca907a 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,6 +1,5 @@
-AUX plasma-integration-5.12.4-remote-dir-selection.patch 2467 BLAKE2B e47442160f991aa0966489c904f3f0260406e9fdf73506fb379ab9e0e90b559116d1b31a4c52b98090beadc7ad2d18d612cbf5b0118d7dd7883e3753b89cde5d SHA512 8920da25c560b430968d20b3683ba1d5b4dbc7e34830881d7e7b6142c853630f56d7c0af2f8c4d35f4930593c97b4da2f9c7a09e68cb73d15fbf8e29c735d691
 DIST plasma-integration-5.11.5.tar.xz 55856 BLAKE2B 4c1d56f9de0007d369eeca5f7a992f95ac9a7853ad30f80b86a762b2ba88a5c87cd0861590e640466314edc4436052063be7e9718754a73388eb60baa253285f SHA512 2e14b0bae19e344dd0ddd27b48ddf9f9075b773c295b58a35b05d0c9d11c1573821ec1c25ae33da4e3a4091386301aef15c51f4d1163aa195a1de5f3ea1844c4
-DIST plasma-integration-5.12.4.tar.xz 53488 BLAKE2B 47b20e5fbf6e340882cc9a610828df3a4c404f9cd496400356e1941128136eb4d402f725959a8734225e9ede98995efa2ff3a883f9913e36a5ab86246241cbcf SHA512 4bbdecf88425459dc10dcae96b2d4aef8d63b7a3c9c6c6ce39b7815881007b580dcada974636f2549ee79aa106512c89b4a4b3ce22c4ef78af63276d9bf06810
+DIST plasma-integration-5.12.5.tar.xz 53664 BLAKE2B e37d44a0a33116ab1b2b1f1edb74a8616ba33aa41438b93f9bf2f45abe5bb49cda57a579b35b8af94a171074387178888f5b80909e50e9c2be4a7a11a1eb0198 SHA512 5ae667a11ea85c6e9f353939bc22d84c36cbb53f053244a93e7c1d185d20452a7fc3d2afed65427ef938910fa537648006c2dda77346419a6a4492a2e292c787
 EBUILD plasma-integration-5.11.5.ebuild 1062 BLAKE2B 85677c190ba956334daaf097c03844c989a2897cc089b6eab540c346885cd3f895a906b3a42b555093fd83978ad61abdf6913808f4523f745bab4e346d6a763f SHA512 d0c91184d4d21d945e16881f879a80d689281632f4c1c0822fcc3153d02be427198dc6f7e12af76ddd0d26f362f1caef714f21a41685e6bb604534b58b8053a5
-EBUILD plasma-integration-5.12.4-r1.ebuild 1123 BLAKE2B 3e33ff19e12848a8003659fb6fef1991382303014d2c242a0c447a1e88f4a0b7304b13505f0218bd0ff05e24faf7ce7e1fcd37d3324053b62cad2ac69a423e5b SHA512 2b0573496ad648197282bb4b491a78d93e04761df367b445a43503e1a4541ce42d7563b2c1dd5567fbb3d4d158f9c62fed1f5f86d9cb8e923065a8c5e9961c80
+EBUILD plasma-integration-5.12.5.ebuild 1064 BLAKE2B 85c18e1cd9d36aa41e3067524e11b87fd4fff69c6202a436a80660824b3839d34fac188cea374c64e4edcb3df04564986692f84c71247ef5838b93287956551c SHA512 f4fa6d0cb0b11d269643af29ce695b48859adde40ecb56b7ec299b36df4af341da6d3587242a59fbbcd91e162aed2ef23c5d49896a0db7ea96db8dfb26c622b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.12.4-remote-dir-selection.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.12.4-remote-dir-selection.patch
deleted file mode 100644
index a3c6d931e2b7..000000000000
--- a/kde-plasma/plasma-integration/files/plasma-integration-5.12.4-remote-dir-selection.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bfd41a95530f90ee8d44cbcfd1fa8c62978334a2 Mon Sep 17 00:00:00 2001
-From: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
-Date: Sun, 8 Apr 2018 11:06:32 +0100
-Subject: KDEPlatformFileDialog: Fix initial directory selection for remote
- files
-
-Summary:
-Previously KDEPlatformFileDialogHelper::selectFile() would change
-options()->initialDirectory() unconditionally even if it was already
-set by the QFileDialog code. Since Qt 5.7.1 it is no longer necessary
-to derive initialDirectory from the selectFile() call. In fact it is
-actuall harmful since it will now override the correct initial directory
-that was set by Qt. Without this patch I got the following debug output:
-
-```
-KDEPlatformFileDialogHelper::setDirectory QUrl("sftp://server/home/alr48/cheri/build_sdk.sh")
-KDEPlatformFileDialogHelper::setDirectory QUrl("sftp://server/home/alr48/cheri/build_sdk.sh")
-KDEPlatformFileDialogHelper::selectFile QUrl("file:///home/alex/build_sdk.sh")
-KDEPlatformFileDialogHelper::setDirectory QUrl("file:///home/alex/)
-```
-The final setDirectory() call is actually a call to
-`setDirectory(options->initialDirectory())` which was set in `selectFile()`.
-
-We now depend on Qt 5.9 so we can remove this code without a check for
-version >= 5.7.1.
-
-BUG: 374913
-
-Test Plan: Remote directory is now opened correctly (tested with Qt 5.10.0)
-
-Reviewers: #plasma, elvisangelaccio
-
-Reviewed By: elvisangelaccio
-
-Subscribers: ngraham, krzyc, anthonyfieroni, elvisangelaccio, graesslin, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D4193
----
- src/platformtheme/kdeplatformfiledialoghelper.cpp | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp
-index 1a2b1b5..d4ea0cd 100644
---- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
-+++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
-@@ -409,11 +409,6 @@ QUrl KDEPlatformFileDialogHelper::directory() const
- void KDEPlatformFileDialogHelper::selectFile(const QUrl &filename)
- {
-     m_dialog->selectFile(filename);
--
--    // Qt 5 at least <= 5.8.0 does not derive the directory from the passed url
--    // and set the initialDirectory option accordingly, also not for known schemes
--    // like file://, so we have to do it ourselves
--    options()->setInitialDirectory(m_dialog->directory());
- }
- 
- void KDEPlatformFileDialogHelper::setDirectory(const QUrl &directory)
--- 
-cgit v0.11.2
-
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.12.4-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.12.5.ebuild
index d9391f82d7d3..1d60d9295f03 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.12.4-r1.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.12.5.ebuild
@@ -41,5 +41,3 @@ RDEPEND="${DEPEND}
 
 # requires running kde environment
 RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-remote-dir-selection.patch" )