gentoo resync : 11.05.2018

3 files changed, 29 insertions, 2 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index a173c3b16828..390d37b61bb0 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,4 +1,5 @@
 AUX kmymoney-5.0.1-cmake.patch 1089 BLAKE2B 5574c6bebd5502a4f6046a57c14593b5b305734981bf04fe19bc500ccb76dcc56e851213b011c4cef41795d9134e970fb5a83e7372cf928136efbbf84451ace1 SHA512 dc894facca9ff086b92397b8fde830fee54593130eb52523ba8d3c517d037f98af8639918007a4970ce1c0e1df88208dd06a80fa6cf5d00ea6a7e06269702b74
+AUX kmymoney-5.0.1-qt-5.11.patch 735 BLAKE2B 25fbe640be8474010ea8417aece91baa475e3fe2e1bf4b432093496cf8d435fdccf995b9239eeb2744e39946a0a69a5fb0f2252dbe1c73f52e163b0d61678d4d SHA512 7cd3fb3b85c47aad71d049ad71047ed38597449300cfdf17f9eca4cf7429ea931056088fe03e88b238730f770b6ed757db4a388d4596a718341fa37985dd478d
 DIST kmymoney-5.0.1.tar.xz 13307860 BLAKE2B df61285f848df693510f1807bbf66b7cfec4498f2c540df3420731734a8ced8c4ae6426e338af2cecc85278120087eddc261a9e35bad50722991e3bb617d4a9c SHA512 74ace8d98f144c503d572c68cf50c27664a49bc5f4428788b69a1da52b8f72e97e1bb70914dbf041c43884c3b6340e28390618dec179ebe3d1b3ea63bede93e7
-EBUILD kmymoney-5.0.1-r2.ebuild 3098 BLAKE2B ed4c52096ca0dba934af17e1c692938575a296fa6a14b877319cff9f10eded23639b0845d1fc9e078e573726edb8a42d51c2c4a1d69292f4bd315bb18c323c84 SHA512 20048a1ce4a9a4f323bd8237823c1d3558b923fc42fdd6c9ba240dfdb6360a62e097677487dd5c38b4b628d6ec570a0da1dde4aafe760434b8c79f11712c1ccc
+EBUILD kmymoney-5.0.1-r2.ebuild 3133 BLAKE2B 7903b6f072e7e01d52193d459547d629baecdb27564e727b796597b897604de2d30838acc17c3029555a2eccd0eda9d058d28cf3f3a183c004dd7b454aa3ea3f SHA512 8a4e41ab95ada9412f7f1db529cb2ee461413c6ddc3f0c9d956ac679d1589b36ab64b596ee51879f3c6f5c0abf0c114ea2e8b6ff32e879d337291b06403073e5
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
new file mode 100644
index 000000000000..4158e0f8ed5b
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
@@ -0,0 +1,23 @@
+From e5198a902996b27bf9abde0ad24af82d55ab5dc1 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 09:35:34 +0200
+Subject: Fix build with Qt 5.11
+
+---
+ kmymoney/plugins/kbanking/widgets/chiptandialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
+index 928e7a8..53fb2a3 100644
+--- a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
++++ b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
+@@ -28,6 +28,7 @@
+ #include <QQuickView>
+ #include <QQuickItem>
+ #include <QPushButton>
++#include <QRegExpValidator>
+ #include <QStandardPaths>
+ 
+ #include <KLocalizedString>
+-- 
+cgit v0.11.2
diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
index 44363179fe05..7891db19927c 100644
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
@@ -87,7 +87,10 @@ RDEPEND="${COMMON_DEPEND}
 	quotes? ( dev-perl/Finance-Quote )
 "
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
 
 pkg_setup() {
 	use weboob && python_setup