gentoo resync : 23.03.2018

3 files changed, 56 insertions, 1 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 4f750dec7608..1f85da02a21b 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,4 @@
+AUX kdevelop-5.2.1-qt-5.11.patch 1581 BLAKE2B 83ef207fb434b3faa7c73752e9b48d7d52182b7cb2bee0f7ad840a124066b72431cd4b69601ea866bb79de483cca2ddfa6fb4d6ad6bcba8cefa0d2833e5067bd SHA512 d4adbcb6c1a26e9198d7997b84ee059216094b1b8d518bb39d1ddafbd968de6f40123e4495b8f2b3a649524247796fcd026545b09b62e9d544e0fd6b1ec74a69
 DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
-EBUILD kdevelop-5.2.1.ebuild 3815 BLAKE2B 14d2d8356eb6fa135c0668fc27ccd660ab1526fda1def3481abb777f1cb21ef563da883a69afefc74fe7b156b81f5c74286817291ae59e5db4e162a29228df3d SHA512 516ca8d270549cdee2bb1dd199b125540fca632ef4ff5c4e645e32f896ca061cc4172fca0b370711dc3f844e259f7d14a1df4e320ddd57e3667d5a08d3b252b6
+EBUILD kdevelop-5.2.1.ebuild 3861 BLAKE2B a1d47f34a8dbf9a1cf00de8b8abee636450ddb7850f413806b7d82e11d27ff138a81be8a7f825676608df7019ced76de5226e0476b4221a3ad9ce3a1f4aa5f40 SHA512 5da724760ff0ea0e82de7208c6622436f01b12f32464dd20382d20eedc36cc6fa1371240ea1f579c1d534f2bc41549c90e8a21900c3191325cd867ceb64bc1bf
 MISC metadata.xml 794 BLAKE2B 765d868d9ca5ac71ee71a7c22d85beb02951dd7a601c2d52da87b1d49686494e8ce17c9e7e0f5f2767e0cb02625d74bcc6a95cfe3ae6793298150fcb651fcae4 SHA512 4d96ffa2a718e987a2d61531fe4a194c3fca3e863ab9cf8ac59d3b187a526c841066936f0a92591475672c6c22b57bd04a798908932f839644025b615ce8b417
diff --git a/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch b/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
new file mode 100644
index 000000000000..72b0f8b035cf
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
@@ -0,0 +1,52 @@
+From a5ec6847bad98d1fc45f5b8c1cc289f3fcc84b72 Mon Sep 17 00:00:00 2001
+From: Andras Mantia <andras@kdab.com>
+Date: Mon, 12 Feb 2018 17:52:15 +0200
+Subject: Add includes to build with Qt 5.11
+
+(cherry picked from commit 0e361a5184bda61796162830ecff88b41c1b305b)
+---
+ plugins/debuggercommon/widgets/disassemblewidget.h | 1 +
+ plugins/externalscript/editexternalscript.cpp      | 1 +
+ plugins/git/gitnameemaildialog.cpp                 | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/plugins/debuggercommon/widgets/disassemblewidget.h b/plugins/debuggercommon/widgets/disassemblewidget.h
+index e8d32ef..543b69f 100644
+--- a/plugins/debuggercommon/widgets/disassemblewidget.h
++++ b/plugins/debuggercommon/widgets/disassemblewidget.h
+@@ -26,6 +26,7 @@
+ 
+ #include "mi/mi.h"
+ 
++#include <QActionGroup>
+ #include <QTreeWidget>
+ #include <QUrl>
+ 
+diff --git a/plugins/externalscript/editexternalscript.cpp b/plugins/externalscript/editexternalscript.cpp
+index 5ec756b..2c0de28 100644
+--- a/plugins/externalscript/editexternalscript.cpp
++++ b/plugins/externalscript/editexternalscript.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include "externalscriptitem.h"
+ 
++#include <QAction>
+ #include <QDialogButtonBox>
+ #include <QPushButton>
+ 
+diff --git a/plugins/git/gitnameemaildialog.cpp b/plugins/git/gitnameemaildialog.cpp
+index ba24a70..ddba09c 100644
+--- a/plugins/git/gitnameemaildialog.cpp
++++ b/plugins/git/gitnameemaildialog.cpp
+@@ -27,6 +27,8 @@
+ 
+ #include <QDialog>
+ #include <QPushButton>
++#include <QRegularExpression>
++#include <QValidator>
+ 
+ using namespace KDevelop;
+ 
+-- 
+cgit v0.11.2
+
diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
index d0dab918f875..386f403299a9 100644
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
@@ -96,6 +96,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kapptemplate-16.04.0
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 RESTRICT+=" test"
 # see bug 366471