gentoo resync : 15.09.2018

4 files changed, 37 insertions, 10 deletions

diff --git a/app-text/cutemarked/Manifest b/app-text/cutemarked/Manifest
index 910bc18ed645..77f5a33899c4 100644
--- a/app-text/cutemarked/Manifest
+++ b/app-text/cutemarked/Manifest
@@ -1,4 +1,6 @@
 AUX cutemarked-0.11.1-respect-destdir.patch 992 BLAKE2B 17c10668ead3f212a6038d83881faaa09b9e4de0bc6e835236e21eda97581129ced3d3d607147729c942db243e8072c04cf9314cf4b40ebf6a84a812e9ad1dbf SHA512 dc6c48c7c0b9b4684b333d1f1aa000d95422b1cac4e71f16cb84eb8bcede63fcc653528005af17fb6757475c9c05c50bffe859d64d5c568e831de7e7769fc92d
+AUX cutemarked-0.11.3-bgcolor.patch 315 BLAKE2B fa5bcae83522c24d62214eb10852cc991eadefb2fc125bcfb4bca5372e0a766476db8b6adf9cfbe6d9fe9660547233628853cbaabbf0a9bf36d9524f4b1481cc SHA512 f7d1975436dd27b97204fd772a5d210ea1f25e85c3da60b066923e21087eae5d1dcc2db94dfde50705d19a85bbf4667da8b94c4e7284686f9a03876e7807a98a
+AUX cutemarked-0.11.3-qaction-include.patch 367 BLAKE2B dd6686f855ed4e1229d5d0692d7aef167b04fd36aea21e73d5ce5d3ef57731149b19ed33b58e84a1e12fdba3219f62a871b5d807f8cd05daa49c93c7ad438402 SHA512 27b95703c340950b6789266b43c7b5752c56e2d7c45ff86f377f57d39cc56664d266046a06b63411afb23858de318d9c7a2c21c0614ab1713c3953af467acba5
 DIST cutemarked-0.11.3.tar.gz 772238 BLAKE2B 1acc7291d968f26f87a1b2fc1070ca3a61053b8bba04c57d91917ed3dea6a5893b9cab41004cef044ddb656e3d334d177d6765db7624d33f91f749d5787b23b2 SHA512 3b776f6453812ce4afa37532bf03adce01ad3ec2fb0d848e3a0e5f18ca30be6f1e9f6b3c815917a96c9637c722d53a5bc249d5f58b209000d7d794239626ca30
-EBUILD cutemarked-0.11.3.ebuild 730 BLAKE2B e00d9dd67ef4c3b9f19ec502c5f1fdac6efc476136bacdc26851a15ba6bd86f0239ba5b1d8f1e3b1628684da33b68d7501b8e83d6b233272604b4a4c4f7b4214 SHA512 b19d529d6b924a038375c8a4dc9a881fc865fd85b33cbf64b0035fe729d48b68a01e01c1738251b2fe6a1a2d903b71e1af0c161d144557c0c080f6224b517e7d
+EBUILD cutemarked-0.11.3-r1.ebuild 809 BLAKE2B 0f879ae1920bf640f7c7c80c3db54cf437d26236e04bcedb13d5a352b66bcf10185f4fe2ecf3cc60fc40fc6d26632d04b39d413ded37964b7e7cd24c1ecd7537 SHA512 7f6cf97a9f8e19ef8667f32bd7e0bf8e4e69aa6469d7a55a6e65c837f97b6a207772f58430ee116ee530247a7259a5400dca2cbe1226dc21c4c391caf16e3590
 MISC metadata.xml 342 BLAKE2B e03fde7a5232c8c6c2134ee0f9441d6f72440d942025655d5ee2c74f7069416057b315bbc5b3f9e468507ec1324f9d9f6abc4598e01590c7dae1efdbbbcfc56c SHA512 4568bb1fe2212d4dcde357798fb5e0c3ab4155e5ff388e6fd545a8a2c2ffad023eefc2e874bebd7005cee77266ee034f11dddf8f260cab0be396094db9e2f39a
diff --git a/app-text/cutemarked/cutemarked-0.11.3.ebuild b/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild
index a6afe6931aeb..d4f1373747d4 100644
--- a/app-text/cutemarked/cutemarked-0.11.3.ebuild
+++ b/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit qmake-utils
 
@@ -15,23 +15,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
+	app-text/discount
+	app-text/hunspell
+	dev-qt/linguist-tools:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtwebkit:5
-	dev-qt/linguist-tools:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qttest:5
-	app-text/discount
-	app-text/hunspell
+	dev-qt/qtwebkit:5
 "
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/CuteMarkEd-${PV}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}"-0.11.1-respect-destdir.patch
-}
+PATCHES=(
+	"${FILESDIR}/${PN}"-0.11.1-respect-destdir.patch
+	"${FILESDIR}/${PN}"-0.11.3-qaction-include.patch
+	"${FILESDIR}/${PN}"-0.11.3-bgcolor.patch
+)
 
 src_configure() {
 	eqmake5 ROOT="${D}" CuteMarkEd.pro
diff --git a/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch b/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch
new file mode 100644
index 000000000000..8cf1fe5f1c30
--- /dev/null
+++ b/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch
@@ -0,0 +1,12 @@
+diff --git a/app/styles/markdown.css b/app/styles/markdown.css
+index 7c87385..607f025 100644
+--- a/app/styles/markdown.css
++++ b/app/styles/markdown.css
+@@ -25,6 +25,7 @@ body{
+     line-height: 1;
+     max-width: 960px;
+     padding: 30px;
++    background-color: #ffffff;
+ }
+ h1, h2, h3, h4 {
+     color: #111111;
diff --git a/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch b/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch
new file mode 100644
index 000000000000..5e585945902c
--- /dev/null
+++ b/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch
@@ -0,0 +1,11 @@
+diff -Nru a/app/optionsdialog.cpp b/app/optionsdialog.cpp
+--- a/app/optionsdialog.cpp	2016-03-28 13:48:50.000000000 +0200
++++ b/app/optionsdialog.cpp	2018-06-05 07:28:09.086517828 +0200
+@@ -17,6 +17,7 @@
+ #include "optionsdialog.h"
+ #include "ui_optionsdialog.h"
+ 
++#include <QAction>
+ #include <QFontComboBox>
+ #include <QItemEditorFactory>
+ #include <QKeySequence>