gentoo resync : 22.10.2018

4 files changed, 33 insertions, 4 deletions

diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index 98850a53ce6d..606a9bba1cec 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,6 +1,7 @@
+AUX notepadqq-1.4.8-qt-5.11.patch 664 BLAKE2B 442012f9ad0046abf7ed6206d69db42b49b0f9d407ae99a4e7a6df0d5340dfadd664a3e8f97a90beb41014bba668174ca6090c9ad46dd090013ca3ffa07d03f5 SHA512 584e7f4c4032719c42eafcc9ff23031c7e980084aeac3044669a136be33ebc4fe0b6e6e61dbf1a70195953949ac05fae9150f97fb369bc9399ddae099a744549
 DIST notepadqq-1.2.0.tar.gz 2082931 BLAKE2B 41f81be45b5e36d58c2632fc9d03c6802b1a99f5ff9603682f3e1c6907143767f57034f053677d8edffae68a098ddf56d2b90e57fd9884442d80749a670f9d4a SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717
 DIST notepadqq-1.4.8.tar.gz 4418925 BLAKE2B 91d993fd952609a7255c6541e97580b5dd01e6902cb6a84b77da7fbf8bc52a9a07ba85845d33e5801d539d8c560804b69947df965550dfb981e228330ea46ffd SHA512 fa1937b75a378fb81486a871a5b736f6ba216cd4b71f99e342e457de65ea034c2ee4d2c9f42754c4737671ccb1083fb1e6c946240ab2094042125430578141fa
 EBUILD notepadqq-1.2.0.ebuild 890 BLAKE2B 86363e195a2347add303903a1f9cf3930e0ad09549bc85d9b9dfe65a113c64cffac65a8b43b74458f6c9da6e80fee6252b0d3742f85384e0a5bb860cd92f3c95 SHA512 946d934e8d931a76bb5e958bfd7b46a2713229837a64059c9ea60e7ac790e777de41dc9f5e3cdb634d9ce424bf93942596ca7f16ec28ddc830cc868d85ab4078
-EBUILD notepadqq-1.4.8.ebuild 1008 BLAKE2B c65cc138faee367ad66004fc41b875a7fd4e2581ef6675ac9bd3d17bc4e032210e6a855a5566e5411b388f4acdcddf349a68ac96cca7c31d58fc5013e3ef1a76 SHA512 68f988d84a6f6535d2edf92a2b46dcee09b10019a62e9be01ac97eb4c5a6f26588939e4e4937592e6093a5e9227e63f310aad7363428d866f56cb76892c126d0
-EBUILD notepadqq-9999.ebuild 1034 BLAKE2B 39c30d0811cab55d047285f1aebc5788fb09f06a59668d5bae1fb42ee891ff56e5cd205c955614f060c10e2cadc92053d85cba06045ada2c9174501130913e13 SHA512 f2bf51e64055fb5f5b2560be7926a37327416b690a932b7778b32b04b83be72ee0e3aab0ebf68ec6fd47234fcb6faca097f818a696a80306e962bc11e7bb3082
+EBUILD notepadqq-1.4.8.ebuild 1051 BLAKE2B 54985b4b7040b5f3e424a5964862af89dd02c95f3ec37ed7a0b875cc0c613ee86c9b1197909376332aa8f7999eefc3280fbb4cd86e58f2d12c1b24df1703a6ef SHA512 670f79bcafc25bdb446bc01389407222a237594e8144a925fb6eb4be85cd4938bea673184b707bcdb7a5ae805547cfb064d4b520b200b89780e803248e99c4b2
+EBUILD notepadqq-9999.ebuild 1031 BLAKE2B 0a78f7bf57da204287bfcfc851937827020839bd8f44a3dacd4965de1b54f4b0811cc1e5057e0751cced0aa61cb7f113aed5a5dbaac87166221a1780b31a36ac SHA512 92cc2853f7324bbb185fce2db306c1ea557f26cb265b4795393b46862fe99646ebd7f65bb78ef4861e35e91ce4c2fd26bf24c222c70b8b0641fdb30a9edfdd62
 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
new file mode 100644
index 000000000000..d656bd920940
--- /dev/null
+++ b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/665286
+
+From 8fabccfe2682583f5190b84dbc1922cce9c8d82b Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 11 Oct 2018 23:23:08 +1100
+Subject: [PATCH] Add missing include.
+
+---
+ src/ui/EditorNS/languageservice.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ui/EditorNS/languageservice.cpp b/src/ui/EditorNS/languageservice.cpp
+index bbe03dc..9a0f212 100644
+--- a/src/ui/EditorNS/languageservice.cpp
++++ b/src/ui/EditorNS/languageservice.cpp
+@@ -6,6 +6,7 @@
+ #include <QJsonDocument>
+ #include <QJsonObject>
+ #include <QJsonValue>
++#include <QTextStream>
+ 
+ namespace EditorNS {
+ 
+-- 
+2.18.1
+
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
index d85db1653d71..0ce0b7273f52 100644
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,8 @@ DEPEND="
 	dev-qt/qtsvg:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_prepare() {
 	default
 
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index 9db258a39568..8d386f10ca80 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6