gentoo resync : 03.03.2019

5 files changed, 38 insertions, 10 deletions

diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index 606a9bba1cec..22b30cd5a32a 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,7 +1,8 @@
+AUX notepadqq-1.4.8-qt-5.11-QDateTime.patch 682 BLAKE2B 34bf2eed6c5499f79caacdcb51e3ec1d09951bafb38f3a66308a33d5cc3724c36787aa7fed21bd1eb23b34517572d0898274d03b2963dd420fd7210a669f2b39 SHA512 a80234dfe6308ac223ce8e9a8117e06b93d1f13034c978a2024c938699864d4609e20a9f077c2bc988ccbf7cb957744068b65e93e5d53c0e5f98abe635e8184f
 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 1051 BLAKE2B 54985b4b7040b5f3e424a5964862af89dd02c95f3ec37ed7a0b875cc0c613ee86c9b1197909376332aa8f7999eefc3280fbb4cd86e58f2d12c1b24df1703a6ef SHA512 670f79bcafc25bdb446bc01389407222a237594e8144a925fb6eb4be85cd4938bea673184b707bcdb7a5ae805547cfb064d4b520b200b89780e803248e99c4b2
-EBUILD notepadqq-9999.ebuild 1031 BLAKE2B 0a78f7bf57da204287bfcfc851937827020839bd8f44a3dacd4965de1b54f4b0811cc1e5057e0751cced0aa61cb7f113aed5a5dbaac87166221a1780b31a36ac SHA512 92cc2853f7324bbb185fce2db306c1ea557f26cb265b4795393b46862fe99646ebd7f65bb78ef4861e35e91ce4c2fd26bf24c222c70b8b0641fdb30a9edfdd62
+EBUILD notepadqq-1.2.0.ebuild 912 BLAKE2B 0d06d1b89f647f0ef9cd3d3faef6a3a15e02bf6f0b0b75fa9e687393c9813bfd2806ebef1bd94b75ab9391d22a00032e02493fb94cb6f4c0d549c9bff2862668 SHA512 c0e497538cdac45447ac12cf417be0f51d5a9b3af407e410529d66e9ed540aca513858ef81b733502bc463b6f2b5c650200adda77409e1bd8ab053a4236dba90
+EBUILD notepadqq-1.4.8.ebuild 1087 BLAKE2B 6fb6b740fd1b2424dd0397a8bea6a2d43725d20c787feea9331dbfa6b23d4328b6f072536ff1baf74ec3dcf19c586a40a6bd9dfc4c40ba957c7a17a2a3bcac12 SHA512 a3cf9675eb024f484278b9dc2166024f2b647d9d359af2dc3df1a0092617c7946eba2fba6effea6d2d6d4a96bf4e0af7cbef60adf40638e53d015b2c331f4b3a
+EBUILD notepadqq-9999.ebuild 1056 BLAKE2B cbf0476b6e53739fba402f439c8b77d312c68c5cab89beb7e13546d04e9c1bf9708217eb97c4d46cf5a27f59657bd3184a026f973df8d86729570fbb145e9a3a SHA512 6beecae8c53a76175ff08e2238223b226a68fb84af005a2d8272586031e41038eeed33ce154b13387367aeeae809388dc35bee31bc21ee4b365ae118be76a685
 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
new file mode 100644
index 000000000000..d0158c33527c
--- /dev/null
+++ b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
@@ -0,0 +1,25 @@
+From 8d5dc3dfb279f8420457fbc04a3ff6fb5f3f8a21 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 26 Feb 2019 00:47:26 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (add missing QDateTime include)
+
+Downstream report: https://bugs.gentoo.org/668392
+---
+ src/ui/stats.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ui/stats.cpp b/src/ui/stats.cpp
+index 59837c9..e0f3cbd 100644
+--- a/src/ui/stats.cpp
++++ b/src/ui/stats.cpp
+@@ -3,6 +3,7 @@
+ #include <QNetworkAccessManager>
+ #include <QJsonDocument>
+ #include <QNetworkRequest>
++#include <QDateTime>
+ #include <QNetworkReply>
+ #include <QSysInfo>
+ #include <QTimer>
+-- 
+2.21.0
+
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
index cbebd28ae63f..ad4de06fd0d8 100644
--- a/app-editors/notepadqq/notepadqq-1.2.0.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
 "
 
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-1.4.8.ebuild
index 0ce0b7273f52..810b3dd47740 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 Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,12 +27,12 @@ RDEPEND="
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+PATCHES=( "${FILESDIR}"/${P}-qt-5.11{,-QDateTime}.patch )
 
 src_prepare() {
 	default
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index 8d386f10ca80..040e2d2a99b4 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils xdg-utils
 
@@ -30,6 +30,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	dev-qt/linguist-tools:5
 	dev-qt/qtsvg:5
 "