gentoo resync : 11.05.2018

4 files changed, 29 insertions, 2 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 8d1fde24f135..e2d157e7af9f 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index 17757cf2aab6..43627fe05168 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,5 +1,6 @@
 AUX kdesvn-2.0.0-deps.patch 1436 BLAKE2B edce1dd6ed89dd991b790aae05da128e585bafc20be94dd220176ec264b9db38c15973ea0b2ec7e4ba566849897bf82d25593a598c31c27e3c128defd725354b SHA512 8a4dffee12f8974d60662b4035baa564f02e69e6f24d81c8e63f03c102302c3b617c5b02a5734616fa614ac6984db600da8765aa1fddf78b2d07ed38436d9c36
 AUX kdesvn-2.0.0-desktop.patch 654 BLAKE2B 8f28395849e732c499ac205970da753af9ba7532cc078321fdb4c214927da38a7f566d7e5c3e30faa46e494599a5ee3c5a49604ccd58969f7fc0d10769b3fac8 SHA512 f12b78a2f5640639a9dc781b8754b7dbdc31fa8198c0f3157771ef199e0d17acb86cd592cb903022ee46fca035c55d6cb80108b76891454ceb630086d88be6eb
+AUX kdesvn-2.0.0-qt-5.11.patch 706 BLAKE2B 8c8aae9d62aae648b6c72239c3ebaf13202953b583c8b6b471e9cd142f04701a5bd1c479eb1388a90732ce379f06ff88855ae5a706a0fae249769709c5da2724 SHA512 f706636642d26f9c97f4c917ac388c9903bce9349dc0607cf35e88d72c70e60a969c0ad94cae0896ed5dddea0ff22341ef720a150d1f20224b285c40c3dcc9c4
 DIST kdesvn-2.0.0.tar.xz 2014660 BLAKE2B 41999913ecb1cd3a526bc898feaddd1385773ffdd64bee4b037625745172da62281cf34da284d1dabdae652fad0e4ab31bf0d305ca30309290c35003a2488d9c SHA512 1c0a6f02ef21fd8f9258a40ea2efba0f3775ae4a3c5b5f137dfaa658940472c3b0f98b6331c96bf7013af712d43ae6092fbee28e0f41688a62fa60dd194d3db2
-EBUILD kdesvn-2.0.0.ebuild 1541 BLAKE2B e02b19387f1e72f61d86b0e016bb6cc00a12d0908301e1114b0ce55268144fc5194aa80e7d99788def8aac4ff001559a7b284ede20f3e67b69de11bf1c500cec SHA512 4bf6cc1aa219d9911e9f471fa4d1e7c59a27fe48600becae7f34a9f52730b5eda6a9215a449148cd6660f3055d3e44066b35ef8a2909e9d42ba276bfbfd63c3b
+EBUILD kdesvn-2.0.0.ebuild 1575 BLAKE2B 66adeca1e53695dd3d268c0f877c88b0d50782c6f68e3d71602621dd4cc6b9313a40dfebd733e9446bd51d541650387132b570ee72e3c29e18f6b202cc1bd775 SHA512 9f14f4b5802c74c3019ddff981cc0676ca678a3c391169337238305ddf9deeb8044780986acb24923b95554269c19deb39d402cf203b435ad1f6f9d0d6657004
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
new file mode 100644
index 000000000000..019d2271001a
--- /dev/null
+++ b/dev-vcs/kdesvn/files/kdesvn-2.0.0-qt-5.11.patch
@@ -0,0 +1,25 @@
+From 605484fd9fc873b9b8d571f398c3cab05c68d860 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 09:28:15 +0200
+Subject: Fix build with Qt 5.11
+
+Some includes added transitively previously now need to be explicitly
+put.
+---
+ src/svnfrontend/blamedisplay.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/svnfrontend/blamedisplay.cpp b/src/svnfrontend/blamedisplay.cpp
+index 2d87502..5673181 100644
+--- a/src/svnfrontend/blamedisplay.cpp
++++ b/src/svnfrontend/blamedisplay.cpp
+@@ -30,6 +30,7 @@
+ #include <KTextEdit>
+ #include <KTreeWidgetSearchLine>
+ 
++#include <QAction>
+ #include <QBrush>
+ #include <QFontDatabase>
+ #include <QInputDialog>
+-- 
+cgit v0.11.2
diff --git a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
index 483633ed6ea6..b89d778a3a1f 100644
--- a/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-desktop.patch"
 	"${FILESDIR}/${P}-deps.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
 )
 
 src_prepare(){