gentoo resync : 25.08.2018

3 files changed, 80 insertions, 0 deletions

diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
index 2661989806ad..3351cad8e058 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1,3 +1,6 @@
+AUX qtm-1.3.19-qt-5.11.patch 757 BLAKE2B f0bc6f3858e7864efa343193d8519a1e83444e69e4532219077f5d3e852bbd4d0bf979023fadbb53d817d41e1632244baf9232434f8b274dcb6d0eec06070ec3 SHA512 c4e886726686ea2fbf785aaaafd1238affbe778f20a0b11cea98360570f52c421a6942b03f27fe57bc08894a93c92427920509a1efac8b23d502464b353e6df0
 DIST qtm-1.3.18.tar.bz2 186137 BLAKE2B b405bc922246d5c8fe65fc68250b3eb401be3b17dd55cc81bfa70d6ddd72280398df25c850b2d71cc4383b9463e3aff6d641ce4080c100d10ae79f9002793055 SHA512 d4685f22a883e1d7513dcac57a807b0d21c26dfceda547b22889ee980758de1a49c2e898c745bb597efd709823d96da59f7494015c0915edb34e9141fa60e2ca
+DIST qtm-1.3.19.tar.bz2 191559 BLAKE2B e193e75771f04b7ecf772a55305c5a0b923449570933c76716235912223417e1340462893b5c566a22c3d6689eb2fc66b7b41aa3148afcbbc4db65abfcc06545 SHA512 a56a5c1d6098213637806a8a8c3889bbfbd11cb5b1d568520197c6c21e51d99f95975359c18f63961aba945b58a5ce3abf3ff85f552a555b91965414934f9565
 EBUILD qtm-1.3.18-r1.ebuild 1067 BLAKE2B 17f2d02385d6b3eadf1feef09dea8e882ca1a7a3a24acdecdfacbc97edf088640b2b70bd23d229615a5df0d75f2d126a0568e03feef0374068f7cfbdf59c7e0f SHA512 a41516a90aa8e5c692bce38e2101c3f0c4ae58aa06b8286aed98a22e83b708cd8022daa4a24f68a93000e855b693281cbf9df1f5931e1e86ee617ecc6e0726df
+EBUILD qtm-1.3.19.ebuild 1112 BLAKE2B ff156e4af9dd3c8492287bf7d6110227605f13507f9fc2a7ba94de9399b2ef9ae80928f95f5b735ae8db9c75c155042764d74dd7df6f708cbe2efd823c303b4e SHA512 001f4de05b04f4578f07948fa9dbd6eef7053c7719c18a574d5459242df5774673aea3a209de6bfc337360dcdcaa63a378532842be58a19a3f31fb5286cb0e1c
 MISC metadata.xml 382 BLAKE2B f06322dd6521d5ca81b3b9f409189f4c0a4e1e1e31dc04a8b5ec03c0b265fe947a377437e75cc906de5f9b8fb1783abd176fa812c5d193663febefe88699f22e SHA512 009632d82fedc2deb9796dba8a2de9910afd0b67617f5c1d9ecd14fc641f61839812815197089dc186a201a8848de3706d56802f12f33f22a3badad2cd99420f
diff --git a/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch b/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch
new file mode 100644
index 000000000000..76bf75e11283
--- /dev/null
+++ b/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch
@@ -0,0 +1,23 @@
+Fixes build error due to internal header cleanup in Qt 5.11.
+Gentoo-bug: https://bugs.gentoo.org/662480
+
+--- a/AccountsDialog.cc	2017-06-12 12:27:59.964042017 +0200
++++ b/AccountsDialog.cc	2018-08-17 23:51:40.559225179 +0200
+@@ -21,6 +21,7 @@
+  *************************************************************************************************/
+ 
+ 
++#include <QAction>
+ #include <QWidget>
+ #include <QDialog>
+ #include <QListWidget>
+--- a/QuickpostTemplateDialog.cc	2017-06-12 12:28:00.244038449 +0200
++++ b/QuickpostTemplateDialog.cc	2018-08-17 23:55:11.793673907 +0200
+@@ -20,6 +20,7 @@
+  *****************************************************************************/
+ 
+ 
++#include <QAction>
+ #include <QWidget>
+ #include <QDialog>
+ #include <QListWidget>
diff --git a/net-misc/qtm/qtm-1.3.19.ebuild b/net-misc/qtm/qtm-1.3.19.ebuild
new file mode 100644
index 000000000000..94d9740b4632
--- /dev/null
+++ b/net-misc/qtm/qtm-1.3.19.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# CMAKE_IN_SOURCE_BUILD="1"
+inherit cmake-utils eapi7-ver
+
+DESCRIPTION="Qt blogging client"
+HOMEPAGE="http://qtm.blogistan.co.uk"
+SRC_URI="https://bitbucket.org/IndigoJo/${PN}-$(ver_cut 1-2)/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug"
+RESTRICT="strip"
+
+RDEPEND="dev-lang/perl
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	virtual/perl-Digest-MD5
+	dbus? ( dev-qt/qtdbus:5 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	virtual/pkgconfig"
+
+DOCS=( Changelog README )
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) # TODO: upstream
+
+src_prepare() {
+	# bug 463810
+	sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die 'sed on qtm-desktop.sh failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQt5=ON
+		-DDONT_USE_PTE=OFF
+		-DINSTALL_MARKDOWN=ON
+		-DNO_SSL=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DDONT_USE_DBUS=$(usex !dbus)
+		-DQDEBUG=$(usex debug)
+	)
+
+	cmake-utils_src_configure
+}