qcachegrind: Enable build for Qt5.

With qt4 gone in the main tree this is crucial.

diff --git a/dev-util/qcachegrind/Manifest b/dev-util/qcachegrind/Manifest
index 52ef064fda6c9b0ef72d772a021a97f793499073..9729f4dd123036dc6fa225da538ea98ce0009d49 100644 (file)
--- a/dev-util/qcachegrind/Manifest
+++ b/dev-util/qcachegrind/Manifest
@@ -1,3 +1,4 @@
-AUX qcachegrind-disable-dbus.patch 398 SHA256 207a43ea50171363721995408b17b593ec898c2e6892f832cbbe34cefbd226f6 SHA512 a69afa4a9ae48c46653d809fc590fbbc9f47738dd6d3dce2150b2b0bd2dfc62b6a4a27fd6b6aed61c6e056ea05fda61d6cba15d1a07f4a3b4adfe3672992d3ee WHIRLPOOL 8d58797c6eb13a38013b927d0a2e9b2d79c4800213cca1ad53ed194cc0db10a3b3afba160ab26f321708e4b13262fcd4bfc1bb65010c5df81ffa2fb61f50bcb1
-DIST kcachegrind-0.7.4.tar.gz 314057 SHA256 0bf6efb647d500bf09bbbab617d30a8a2a0a2cbf87fd1f2a1375d774c005b379 SHA512 ad27ad139d80aefc5d79229ca73a4198e771b2578f881696009cc56cd407fc6f20573604a7dfca81405de139390f4eb46528b01d06fa6a50ead18cb4eb617f3b WHIRLPOOL 950aef5a32c172c28e80764d9df5ca658a95ba041fbde065ee581b5cedd6c9b5aed951d8dde47baaaade68277f06e89c06a925bda7f55bc2029765a413e76390
-EBUILD qcachegrind-0.7.4.ebuild 810 SHA256 d6d46e6e1324c0b75d93786359945ae616f79b70c572841d41a67f81518e1b6f SHA512 7a16e45e92a2e4e807c9bedccdb3736db261a8081d171003c9c2a366d9f006d38b83c46f7479411768dca8d25dc7340669cc060edbd767b886003448a3c82c7b WHIRLPOOL b889b54c7560be1b49769b722185c346c8ed96e1f6cf81d8c1f912229f2645ca369912ffd2b5e07740520b972ebde2ad44eda3c3cbe0a35a65169751a471b3b9
+AUX qcachegrind-0.7.4-qt5-fix.patch 553 BLAKE2B b0016c52b3c6893bedb24c1c9601c2391927fbe3f0a630ef2865f248ce1bf93e0c0dd15ce4b65b1ed5fe6e3bcfca30d0f975934f069c022f8b5a05f42f83fe63 SHA512 8de5c3a8c798dd6b9ac57f9244298a33c5e57775b62ae60cbdeb548249a0d8137ac68688398b90cf9f96bc247cb5f26b06ea9d89f744959001c70c83cb1292e5
+AUX qcachegrind-disable-dbus.patch 398 BLAKE2B 58de0f1b1ac508225689635760af41d1156cce8f4d90f0f9e30dff75ac343c21cb77e7cfa43873c3919fbb61d042db1bac39e8fc143dfe3bd6fa84e195b1f9a9 SHA512 a69afa4a9ae48c46653d809fc590fbbc9f47738dd6d3dce2150b2b0bd2dfc62b6a4a27fd6b6aed61c6e056ea05fda61d6cba15d1a07f4a3b4adfe3672992d3ee
+DIST kcachegrind-0.7.4.tar.gz 314057 BLAKE2B 0b9d101390c63802d9005daf966e1bae34d26ef0d64689fd294c56e52521020414bbe42d8dcb5b47064116adf9416d7464449e0ef1dfbc81c8b8e04b4fcc809a SHA512 ad27ad139d80aefc5d79229ca73a4198e771b2578f881696009cc56cd407fc6f20573604a7dfca81405de139390f4eb46528b01d06fa6a50ead18cb4eb617f3b
+EBUILD qcachegrind-0.7.4-r1.ebuild 1083 BLAKE2B f0da4bdfcea2d52ff86aa2a472da496e084bde327b6c1a1f0b15b4569c35d799da70a07b66b5a41686d6da8364222914c62019e7f8d802136cb25ebf8a7a46c7 SHA512 4cd6b0cf010bd70459e1905e1fd7a1513a71340b133bd5ef2f217aa62416e75b37db054853e7c0d327a4bcab5f3f12dfe61fcace3cfbb4eb22d7a50e1269d227

diff --git a/dev-util/qcachegrind/files/qcachegrind-0.7.4-qt5-fix.patch b/dev-util/qcachegrind/files/qcachegrind-0.7.4-qt5-fix.patch
new file mode 100644 (file)
index 0000000..58533c8
--- /dev/null
+++ b/dev-util/qcachegrind/files/qcachegrind-0.7.4-qt5-fix.patch
@@ -0,0 +1,25 @@
+From 69223f24d7c864310b45cd184cb04956b7214b7f Mon Sep 17 00:00:00 2001
+From: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
+Date: Fri, 18 Sep 2015 20:41:43 +0200
+Subject: [PATCH] Compile fix for Qt 5.5
+
+---
+ libcore/costitem.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libcore/costitem.cpp b/libcore/costitem.cpp
+index 71bf49adba27..cbb2dc6bdfd1 100644
+--- a/libcore/costitem.cpp
++++ b/libcore/costitem.cpp
+@@ -18,6 +18,8 @@
+ 
+ #include "costitem.h"
+ 
++#include <QObject>
++
+ #include "tracedata.h"
+ 
+ #define TRACE_DEBUG      0
+-- 
+2.7.3
+

diff --git a/dev-util/qcachegrind/qcachegrind-0.7.4-r1.ebuild b/dev-util/qcachegrind/qcachegrind-0.7.4-r1.ebuild
new file mode 100644 (file)
index 0000000..090e7d2
--- /dev/null
+++ b/dev-util/qcachegrind/qcachegrind-0.7.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright © 2012-2014, 2018 Nick Bowler
+# License GPLv3+: GNU General Public License version 3 or later.
+# There is NO WARRANTY, to the extent permitted by law.
+
+EAPI=6
+
+inherit qmake-utils
+
+MY_P=${P/qcachegrind/kcachegrind}
+
+DESCRIPTION="Qt-based GUI frontend for Callgrind"
+HOMEPAGE="https://kcachegrind.github.io/"
+SRC_URI="https://kcachegrind.github.io/files/$MY_P.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus +qt5"
+
+DEPEND="qt5? (
+               dev-qt/qtgui:5
+               dbus? ( dev-qt/qtdbus:5 )
+       )
+       !qt5? (
+               >=dev-qt/qtgui-4.4:4
+               dbus? ( >=dev-qt/qtdbus-4.4:4 )
+       )"
+RDEPEND="$DEPEND
+       media-gfx/graphviz"
+
+S=$WORKDIR/$MY_P
+
+PATCHES=(
+       "$FILESDIR/$P-qt5-fix.patch"
+)
+
+pkg_setup() {
+       use dbus || PATCHES+=("$FILESDIR/$PN-disable-dbus.patch")
+}
+
+src_configure() {
+       eqmake$(usex qt5 5 4) qcg.pro
+}
+
+src_install() {
+       dobin qcachegrind/qcachegrind
+       dobin cgview/cgview
+
+       newicon -s 48 kcachegrind/hi48-app-kcachegrind.png kcachegrind.png
+       newicon -s 32 kcachegrind/hi32-app-kcachegrind.png kcachegrind.png
+
+       insinto /usr/share/applications
+       doins qcachegrind/qcachegrind.desktop
+}

diff --git a/dev-util/qcachegrind/qcachegrind-0.7.4.ebuild b/dev-util/qcachegrind/qcachegrind-0.7.4.ebuild
deleted file mode 100644 (file)
index f11176d..0000000
--- a/dev-util/qcachegrind/qcachegrind-0.7.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-EAPI=5
-
-inherit qt4-r2
-
-MY_P="kcachegrind-${PV}"
-
-DESCRIPTION="Qt4-based GUI frontend for Callgrind"
-HOMEPAGE="http://kcachegrind.sourceforge.net/"
-SRC_URI="http://kcachegrind.sourceforge.net/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus"
-
-DEPEND=">=dev-qt/qtgui-4.4
-       dbus? ( >=dev-qt/qtdbus-4.4 )"
-RDEPEND="${DEPEND}
-       media-gfx/graphviz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-       use dbus || PATCHES+=("${FILESDIR}/${PN}-disable-dbus.patch")
-
-       qt4-r2_src_prepare
-}
-
-src_configure() {
-       eqmake4 qcg.pro
-}
-
-src_install() {
-       dobin qcachegrind/qcachegrind
-       dobin cgview/cgview
-
-       newicon -s 48 kcachegrind/hi48-app-kcachegrind.png kcachegrind.png
-       newicon -s 32 kcachegrind/hi32-app-kcachegrind.png kcachegrind.png
-
-       insinto /usr/share/applications
-       doins qcachegrind/qcachegrind.desktop
-}