gentoo resync : 14.04.2018

3 files changed, 34 insertions, 2 deletions

diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index 9fc5b709f3db..54d609664106 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,5 +1,6 @@
 AUX FindQtSingleApplication.cmake 4004 BLAKE2B e6c047be5112811430258e527a6d0ac5217838c9acbdbf6edf49909f3858c6fedb1c3da0471d4301cb918683b6194207650f9c4d06735e62993da3720b263356 SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e
 AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 BLAKE2B 92ee287c1dd3321ba706ea01656037e87a27a5cb6f43695a043481a0c4231b5753d9b4af74f82f9d37f2b2c137871f52d37a310fa9f75188955e761a46279762 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3
+AUX juffed-0.10_p20160323-qt-5.11.patch 719 BLAKE2B d9790a4a6a515a41a988949f8a0d1f52a0b19b53578138acd9d5ce141898317ab1776373f688a5c6fec059e67f14dfb5842c6367f9596df581a673a22e38567b SHA512 04174f544f040ba0cb4f28e1aed8e593d18fd4d7f53f94a6c99c5246a4603a234285959a887ffa155b72ce17f056eadd5dd31a041541c463630dd33d2a2a8952
 DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
-EBUILD juffed-0.10_p20160323-r1.ebuild 1351 BLAKE2B eb99907a7cfbccf8402246003677f51167c2cae499a7fc615eac39952349ac711b73be853052bf1da5fb8876249f7809dfce7729dcf39fbe57b92d949b5c6a2e SHA512 0909c90c605b7daf5937a6822c04a730d1a93a0edcc9737b8d50e94dfb1262e391b289d74b51d6a8c3581e98977160740a0d99506b13c8bad77f1fd9144022c7
+EBUILD juffed-0.10_p20160323-r1.ebuild 1386 BLAKE2B e88936ebe034967e5a6b1eb3b2b1855c1cf1bfad3160e21c6498773a774d9f1fc89db8743ae1686400657f95cfe97c024f41b9d89c53b10c6a3b1489ec0cc5a3 SHA512 60d4c2a48a2c91c3ec1e57245d02da45f0dd021538c82809c9608d5e5916d0f86160f1dc644007b0e7ed4c4c933fc45b00e02826063ed3aa3fceda6787f632b6
 MISC metadata.xml 323 BLAKE2B d45bb12a8240e1b12594d50a1284b69b365e15f7a857b34b0ee12f4c9af0d7681ba22bbc959e7133780f682f6ae6dad53f6ecb2eb7db65cf1b6f4a64c742cdb3 SHA512 43f71ede8fa11b874c187d61b6f1c3949c10bd632e5a98f4094463f785be8f719a2d2205f3f0b7645047398e026fe71b1ef79366d762ff12f257d0a239e84a4d
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
new file mode 100644
index 000000000000..4dfa7fae31f7
--- /dev/null
+++ b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
@@ -0,0 +1,28 @@
+From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 10 Apr 2018 19:43:17 +0200
+Subject: [PATCH] Fix build with Qt 5.11
+
+---
+ plugins/keybindings/KeysPage.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp
+index 6579e3e..e68b039 100644
+--- a/plugins/keybindings/KeysPage.cpp
++++ b/plugins/keybindings/KeysPage.cpp
+@@ -1,9 +1,10 @@
+ #include "KeysPage.h"
+ 
+-#include <QPushButton>
++#include <QAction>
+ #include <QHeaderView>
+ #include <QKeyEvent>
+ #include <QMessageBox>
++#include <QPushButton>
+ 
+ #include "KeySettings.h"
+ #include "Log.h"
+-- 
+2.17.0
+
diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
index e8118beedc92..97e18f2d896c 100644
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
+++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog README )
 
-PATCHES=( "${FILESDIR}/${P}-qscintilla-2.10.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qscintilla-2.10.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
 
 src_prepare() {
 	# Upstream version outdated/dysfunctional and CRLF terminated