gentoo resync : 21.06.2020

4 files changed, 27 insertions, 60 deletions

diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index d39f2c5ddcf6..27486e867ea9 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,6 +1,5 @@
 AUX ghostwriter-1.8.1-appdata-path.patch 811 BLAKE2B d3feb82a74d27484c56e5f05818f8f78914cd269700457deef69854fe8158d1e4068393c7b57114093450f7b347d26e4b143fc426bf5b66e0997f5ee94382276 SHA512 8e015c55dd1905dabb7ddcb06cb8a05e93bf8bdeedfb2002f2568232382871e65251ebfeda632e614e9a090372dde10fb468002459d50641847d4f97c9b789de
-DIST ghostwriter-1.8.0.tar.gz 1195999 BLAKE2B d751e570aed94bcf0806ca20d82b0ac2b465649caf31f01b761f0370a4f1b04ac8f948213b15c05a71541b8068ef21dfb2105b5fc91d5637e498e2d4c8f6bf9a SHA512 aff500d9221f28f6a06a93bf0b5ddb590792b22bc551749b790f52751cd7f2e27ea59778927c2f117320cb1791b45d51d8efdf479f0894319755afb1a509f7bd
+AUX ghostwriter-1.8.1-qt-5.15.patch 550 BLAKE2B 2c0d60746273f851f94677c0f0dd8b14f4bc4ab24d59605855cd5ad8570b30b8d4bf92a2bcfe32825a19b1c2b39fee4bf783affc75bc6ecf0c516cc95a731ebd SHA512 2bc77bd62a9d6adbd5eb1cfd40b1893fc2b6f2c321db228e0b22f4cf85a3c09634c3b5fa15c7a9fd25fd7071012efe636f69065776abc51c9ed920920f2feaed
 DIST ghostwriter-1.8.1.tar.gz 1220000 BLAKE2B 3fa3d95ed819bc8f7b76b396e6634658a8bda23e9100cbb298d301fc382db451430a4a31fbd092326af198825c83d2c998172c90a7e318aeb57ef7799751995a SHA512 9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521
-EBUILD ghostwriter-1.8.0.ebuild 1069 BLAKE2B 6e50854e96afdfed7057b2b70684cf860e07d4fc59eb83941dbc5ae4caf622a67ba1c9aafad4513eec12e0d3a76d878e90ea31192b14fda88d45f74b0e0614e0 SHA512 f8016952ebf4be4ae9401654eb55577e49a52592a44288339a8ae53160f776a2b7b5c7cd7f6d151d3b190b76aa43a76516fbd3af9ae11ac822dea6f9fe1d6db7
-EBUILD ghostwriter-1.8.1.ebuild 1168 BLAKE2B b5af661d60a19fffeea76b12fad147178817d05de1a15a1f3622cc3ea2862753b7c3397040d2382fb9212203a10b06e0d683249e73b4923a1e337132f62e5ee0 SHA512 bd2133ea0def1ab28ad5cb7bebff067a6b99b479cb016c7a976c019cfe0fc6f301b1a25c21ddd6cc6865572e164efc1b4dab9525644f4d22f1ebbf40899e3529
+EBUILD ghostwriter-1.8.1.ebuild 1216 BLAKE2B d43b703b8af7c0a62e747e0796dc9303ec2f1ea96278c047177328354ea18fe892e3a577f44e6191ba65720eb66901e4889bb6f19346b236e86a42ec99d7f5e4 SHA512 24748a5f81ef965b3b95355e6a75294956f6ecac4bbadc6ad302bd9b94221f13c6266a0254afb2fb340251588a194200576061a5ec40925ce5a43c6ee68763fa
 MISC metadata.xml 563 BLAKE2B 0f231e68a0335b4e4578d5ec28d8b202a26e7cf5c9f48fe9f4d430b01532aac1cb6022e13ef72c91a3ff68a86ecee0ec780a5bfe7e0c1ac1f158d8cbef84f7bd SHA512 585e39bd37abab4db3422b91a342aac06bcb76b3a6447a60c4607e3ac6edadbbbcabc1480828094d480c241a44d07ba81fbb5a4502f71da75c20e28db4583fe3
diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
new file mode 100644
index 000000000000..0f7425ff35e7
--- /dev/null
+++ b/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch
@@ -0,0 +1,21 @@
+From f8f4ec0a1b53d1f3e670817f051c59444851cf7f Mon Sep 17 00:00:00 2001
+From: Jakob Gahde <j5lx@fmail.co.uk>
+Date: Tue, 9 Jun 2020 10:30:44 +0200
+Subject: [PATCH] Fix build error with Qt 5.15
+
+---
+ src/MarkdownEditor.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp
+index c5e46d5..c103173 100644
+--- a/src/MarkdownEditor.cpp
++++ b/src/MarkdownEditor.cpp
+@@ -30,6 +30,7 @@
+ #include <QUrl>
+ #include <QPixmap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QFileInfo>
+ #include <QDir>
+ 
diff --git a/app-editors/ghostwriter/ghostwriter-1.8.0.ebuild b/app-editors/ghostwriter/ghostwriter-1.8.0.ebuild
deleted file mode 100644
index a6fa48460be7..000000000000
--- a/app-editors/ghostwriter/ghostwriter-1.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
-HOMEPAGE="https://wereturtle.github.io/ghostwriter/"
-SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-BDEPEND="dev-qt/linguist-tools:5"
-
-RDEPEND="
-	app-text/hunspell
-	dev-qt/qtwebchannel:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CREDITS.md README.md )
-
-src_prepare() {
-	default
-
-	sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version"
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild b/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
index 0943a04747d6..eb51f8371cc7 100644
--- a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CREDITS.md README.md )
 
-PATCHES=( "${FILESDIR}/${P}-appdata-path.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-appdata-path.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch" # git master
+)
 
 src_prepare() {
 	default