[proaudio] [1261] fix horribly broken qjackctl-9999

[subversion@xxxxxxxxxxxxx]

Revision: 1261
Author:   gimpel
Date:     2008-08-04 22:14:08 +0200 (Mon, 04 Aug 2008)

Log Message:
-----------
fix horribly broken qjackctl-9999

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/qjackctl/Manifest
    trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-9999.ebuild


Modified: trunk/overlays/proaudio/media-sound/qjackctl/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/qjackctl/Manifest	2008-07-26 21:13:21 UTC (rev 1260)
+++ trunk/overlays/proaudio/media-sound/qjackctl/Manifest	2008-08-04 20:14:08 UTC (rev 1261)
@@ -4,6 +4,6 @@
 EBUILD qjackctl-0.2.23.ebuild 1326 RMD160 ebc606de2df3afc9507962425276b074795a63b2 SHA1 4b34b5ed984cb58c61c4e7bd5707b3249b3c21c5 SHA256 5c521c24c36610ced5c7401d48b302c3e2972830ed70aabc813d1ebf04d9a754
 EBUILD qjackctl-0.3.1a.ebuild 1337 RMD160 8e30f1e66708d7868e941d1e760c38267e7582ca SHA1 5b673256898287d264847a90e12aa39540d8eeb9 SHA256 6b3a22b70197843eed3552a9a9fb780af52a9e60414e01beabeb44e11e093f72
 EBUILD qjackctl-0.3.2.ebuild 1509 RMD160 2b69816a3e3947e84d2adb140c04fb0c4beb016e SHA1 ba8b6fccbcdb4c7bfbffb0573f161ea9b427dbfb SHA256 1310f3840037e418922833915ef584602df52cdc9b90bf90f1677ac1fe58d86a
-EBUILD qjackctl-9999.ebuild 1491 RMD160 e07acf2579e4cace6713b8c9736aad082d9587ba SHA1 0d34d1e0c39339f6614643e3e7fbe8bca29b3659 SHA256 5aec8f5d4eadf2142a49739b915931a727694b65e25a70a15db1b508e6546288
+EBUILD qjackctl-9999.ebuild 1556 RMD160 a59503e198cefebea88ec6f8fef7f5ff7f3e6cb6 SHA1 f2f36c807ffa1ec293ea6a41fdffccb2cb85b7ac SHA256 9918921da89d275fa73f93f8c4a63a85d038c3eb160a0b23a627fb6b57ea1621
 MISC ChangeLog 444 RMD160 bf02b95cddc1a133385392141f63770b2afb98e2 SHA1 d12816e315a130b449bf2bc1a8680371a9d0feac SHA256 820a1ef377154bb18c8ace973ffcab32b69df5947a8c738443e36e52298fdc71
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-9999.ebuild	2008-07-26 21:13:21 UTC (rev 1260)
+++ trunk/overlays/proaudio/media-sound/qjackctl/qjackctl-9999.ebuild	2008-08-04 20:14:08 UTC (rev 1261)
@@ -1,19 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils qt3 cvs
+EAPI=1
 
+inherit eutils qt4 cvs
+
 DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
 HOMEPAGE="http://qjackctl.sourceforge.net/";
-SRC_URI=""
 
 ECVS_SERVER="qjackctl.cvs.sourceforge.net:/cvsroot/qjackctl"
-ECVS_USER="anonymous"
-ECVS_PASS=""
-ECVS_AUTH="pserver"
 ECVS_MODULE="qjackctl"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,7 +19,10 @@
 IUSE="alsa debug jackmidi"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
-	$(qt_min_version 3.1.1)
+	|| ( (
+			x11-libs/qt-core:4
+			x11-libs/qt-gui:4
+		) >=x11-libs/qt-4.1:4 )
 	media-sound/jack-audio-connection-kit"
 
 pkg_setup() {
@@ -34,25 +34,28 @@
 	fi
 }
 
-S=${WORKDIR}/${PN}
-
 src_compile() {
-	emake -f Makefile.cvs
+	make -f Makefile.cvs || die
 	econf \
-		$(use jackmidi jack-midi) \
+		$(use_enable jackmidi jack-midi) \
 		$(use_enable alsa alsa-seq) \
 		$(use_enable debug) \
 		|| die "econf failed"
-	emake || die "emake failed"
+
+	# Emulate what the Makefile does, so that we can get the correct
+	# compiler used.
+	eqmake4 ${PN}.pro -o ${PN}.mak || die "eqmake4 failed"
+
+	emake -f ${PN}.mak || die "emake failed"
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	rm "${D}/usr/share/applications/qjackctl.desktop"
 
 	# Upstream desktop file is invalid, better stick with our for now.
-	make_desktop_entry "${PN}" "QjackCtl" "/usr/share/icons/qjackctl.png"
+	make_desktop_entry "${PN}" "QjackCtl" "${PN}"
 
 	dodoc README ChangeLog TODO AUTHORS
 }