From 5482e17de9e2e2e195405dba6b314f31e071e250 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Tue, 10 Jun 2014 12:08:11 -0400
Subject: [PATCH] qcachegrind: Version bump and update.

Version 0.7.4 was released some time ago.  Improve the ebuild a bit
while we're at it.
---
 dev-util/qcachegrind/Manifest                 |  5 ++-
 .../files/qcachegrind-disable-dbus.patch      | 16 +++++++
 dev-util/qcachegrind/qcachegrind-0.7.1.ebuild | 27 ------------
 dev-util/qcachegrind/qcachegrind-0.7.4.ebuild | 42 +++++++++++++++++++
 4 files changed, 61 insertions(+), 29 deletions(-)
 create mode 100644 dev-util/qcachegrind/files/qcachegrind-disable-dbus.patch
 delete mode 100644 dev-util/qcachegrind/qcachegrind-0.7.1.ebuild
 create mode 100644 dev-util/qcachegrind/qcachegrind-0.7.4.ebuild

diff --git a/dev-util/qcachegrind/Manifest b/dev-util/qcachegrind/Manifest
index f37d46e..52ef064 100644
--- a/dev-util/qcachegrind/Manifest
+++ b/dev-util/qcachegrind/Manifest
@@ -1,2 +1,3 @@
-DIST kcachegrind-0.7.1.tgz 290134 SHA256 ddf20e3b5c9c1c7c4799eeb8f3ca7fccbf6e2c43341383d73883c609d8163295 SHA512 f6de5076cb4ac2056ac1df3211301462517bc3405f5d55e83495034ba5c29147197097e3c8da13303fcf9854fc2d23a41b7bf5a8915fb47fb9556f4d1feac6b7 WHIRLPOOL 7cd79474ad2c4dd9b8ded1c4013869214610d56c5bcd4a8b9cec9636db29efb0d7c01a5f0c9cd2dcaa2a439aee71ae58a5ba0064761bda81babff3ef3b1b0f31
-EBUILD qcachegrind-0.7.1.ebuild 461 SHA256 0f5a59215fa82cfb901b6c844aa90e9e64d3f418881c24560ce811e6cf3fc6f0 SHA512 65625406a1d9522da3bbfbfb3040a3707b487f5194a5b21d06738c921294045afc30164773ccb5b8104fe4dd8a43fe0c18840f85990f8a2216e9137f1469ceac WHIRLPOOL b3ded186659f07343d326b6879360cd0aaaa2634c207fbeeb946843f99a0b33c29c4ce795d4fbed85c360680899fab8648418a024f159608490e32b37e1cd9c7
+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
diff --git a/dev-util/qcachegrind/files/qcachegrind-disable-dbus.patch b/dev-util/qcachegrind/files/qcachegrind-disable-dbus.patch
new file mode 100644
index 0000000..8396c10
--- /dev/null
+++ b/dev-util/qcachegrind/files/qcachegrind-disable-dbus.patch
@@ -0,0 +1,16 @@
+diff --git a/qcachegrind/qcachegrind.pro~ b/qcachegrind/qcachegrind.pro
+index 58027ea..c099d40 100644
+--- a/qcachegrind/qcachegrind.pro
++++ b/qcachegrind/qcachegrind.pro
+@@ -8,11 +8,6 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+     QT += widgets
+ }
+ 
+-contains(QT_CONFIG, dbus) {
+-    DEFINES += QT_DBUS_SUPPORT
+-    QT += dbus
+-}
+-
+ include(../libcore/libcore.pri)
+ include(../libviews/libviews.pri)
+ 
diff --git a/dev-util/qcachegrind/qcachegrind-0.7.1.ebuild b/dev-util/qcachegrind/qcachegrind-0.7.1.ebuild
deleted file mode 100644
index 2e6a6ef..0000000
--- a/dev-util/qcachegrind/qcachegrind-0.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-EAPI=4
-
-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}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-qt/qtgui-4.4"
-RDEPEND="${DEPEND}
-	media-gfx/graphviz"
-
-S="${WORKDIR}/${MY_P}/qcachegrind"
-
-src_install() {
-	dobin qcachegrind
-
-	insinto /usr/share/applications
-	doins qcachegrind.desktop
-}
diff --git a/dev-util/qcachegrind/qcachegrind-0.7.4.ebuild b/dev-util/qcachegrind/qcachegrind-0.7.4.ebuild
new file mode 100644
index 0000000..f11176d
--- /dev/null
+++ b/dev-util/qcachegrind/qcachegrind-0.7.4.ebuild
@@ -0,0 +1,42 @@
+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
+}
-- 
2.43.0