Add proper debugging support thanks to Santiago M. Mola Velasco <cooldwind@gmail.com> in bug 142875

Package-Manager: portage-2.1.1_pre4

3 files changed, 35 insertions, 14 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index e72c1aff8b64..725a29d165d7 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lastfmplayer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.6 2006/07/28 22:36:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.7 2006/08/05 17:35:45 genstef Exp $
+
+  05 Aug 2006; Stefan Schweizer <genstef@gentoo.org>
+  lastfmplayer-1.0.0.1_p2113.ebuild:
+  Add proper debugging support thanks to Santiago M. Mola Velasco
+  <cooldwind@gmail.com> in bug 142875
 
   28 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/lastfmplayer-amd64.patch, lastfmplayer-1.0.0.1_p2113.ebuild:
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index 8f45a67b8509..0957538d991b 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -6,14 +6,14 @@ AUX lastfmplayer-amd64.patch 1187 RMD160 5d965cbc1e670c0b1b0f121e78577cc9452f6ad
 MD5 98fd5b839973495daeabb4bd64331416 files/lastfmplayer-amd64.patch 1187
 RMD160 5d965cbc1e670c0b1b0f121e78577cc9452f6ad6 files/lastfmplayer-amd64.patch 1187
 SHA256 fb282c0067bf91a3d62b208a0ffe39da08cc307f84d5c3d6b6001b948bf6089a files/lastfmplayer-amd64.patch 1187
-EBUILD lastfmplayer-1.0.0.1_p2113.ebuild 2903 RMD160 a9391c185c3b6c0084fe9fe846ffb1a654789dfe SHA1 d622e2bbe73840c9e10d9b11455a3358ecc7ffa2 SHA256 384a4a3c37cdf3ae76ca24f50a1d661d46ff77bdee72c18d4ddf1797329048ea
-MD5 381af6f2ec67ab810f7487c8af232c0e lastfmplayer-1.0.0.1_p2113.ebuild 2903
-RMD160 a9391c185c3b6c0084fe9fe846ffb1a654789dfe lastfmplayer-1.0.0.1_p2113.ebuild 2903
-SHA256 384a4a3c37cdf3ae76ca24f50a1d661d46ff77bdee72c18d4ddf1797329048ea lastfmplayer-1.0.0.1_p2113.ebuild 2903
-MISC ChangeLog 1656 RMD160 1aee88d3e6310746153b8e7d57e6caab81547d73 SHA1 94c0dcf7303893cee70792f3edbf609d97c1b00b SHA256 a31b622dcd83a2fbfb63f224ac2c859fa2683006b3fcd164c15d29330599ce81
-MD5 596cda08cabb96bd1f4faf0c9acc35ea ChangeLog 1656
-RMD160 1aee88d3e6310746153b8e7d57e6caab81547d73 ChangeLog 1656
-SHA256 a31b622dcd83a2fbfb63f224ac2c859fa2683006b3fcd164c15d29330599ce81 ChangeLog 1656
+EBUILD lastfmplayer-1.0.0.1_p2113.ebuild 3255 RMD160 c74a0067d9484573c3e83868ee0526504a52f722 SHA1 9b9ee5595251d85b2b498e25fd1a54df8d1a2857 SHA256 3d078b6b723d50d6a7bef67bdf3283cd1483cf40e3fb173476f48e1436770067
+MD5 aa7b827513725396cd41cc058b54236d lastfmplayer-1.0.0.1_p2113.ebuild 3255
+RMD160 c74a0067d9484573c3e83868ee0526504a52f722 lastfmplayer-1.0.0.1_p2113.ebuild 3255
+SHA256 3d078b6b723d50d6a7bef67bdf3283cd1483cf40e3fb173476f48e1436770067 lastfmplayer-1.0.0.1_p2113.ebuild 3255
+MISC ChangeLog 1851 RMD160 77cf2c06b245e83237b12689f707b0daafbee708 SHA1 817afd9d65c4dd1e18303e27e6bffdfe5ab88b19 SHA256 a725f57da48082feabae110af4faf0e68e459a7dcdf7e0c39e8e1c1c90a3a843
+MD5 9b63a67b63e8305d81fd5dfbee36f4cf ChangeLog 1851
+RMD160 77cf2c06b245e83237b12689f707b0daafbee708 ChangeLog 1851
+SHA256 a725f57da48082feabae110af4faf0e68e459a7dcdf7e0c39e8e1c1c90a3a843 ChangeLog 1851
 MISC metadata.xml 251 RMD160 d7ccc9e1d41d94cb971d83931a8ece9a684f6fc6 SHA1 1a65ae8b81af34d32b85ed8a18e1df5caef40ff3 SHA256 c87b81ca4913491f67f603b92fa806fb2af4f29d1fec96891731d2ac7490cb2b
 MD5 99b44433affea389a5ec121d625af495 metadata.xml 251
 RMD160 d7ccc9e1d41d94cb971d83931a8ece9a684f6fc6 metadata.xml 251
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild
index bd65210f5485..1f03f6777169 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild,v 1.2 2006/07/28 22:36:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.0.0.1_p2113.ebuild,v 1.3 2006/08/05 17:35:45 genstef Exp $
 
 inherit eutils subversion versionator
 
@@ -13,7 +13,7 @@ ESVN_OPTIONS="--revision ${PV#*_p}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="debug"
 
 DEPEND="=x11-libs/qt-4*"
 RDEPEND="${DEPEND}"
@@ -29,10 +29,19 @@ pkg_setup() {
 
 		die "no gif or png support in qt"
 	fi
+
+	if use debug && ! built_with_use x11-libs/qt debug ; then
+		eerror "In order to use debug, you need to compile Qt 4"
+		eerror "with debug USE flag."
+	fi
 }
 
 src_compile() {
-	qmake || die "qmake failed"
+	if use debug ; then
+		qmake CONFIG+=debug || die "qmake failed"
+	else
+		qmake CONFIG-=debug QMAKE_TARGET=LastFM || die "qmake failed"
+	fi	
 	emake qmake_all || die "emake qmake_all failed"
 	epatch ${FILESDIR}/lastfmplayer-amd64.patch
 	emake || die "emake failed"
@@ -47,9 +56,16 @@ src_install() {
 	local destination="/opt/lastfm"
 	cd bin
 
+	#Bin name
+	if ! use debug ; then
+		MY_B=LastFM
+	else
+		MY_B=LastFM_debug
+	fi
+
 	# Install the player
 	exeinto ${destination}
-	doexe LastFM
+	doexe ${MY_B}
 
 	# Install libraries and symlinks
 	v=( $(get_version_components ) )
@@ -70,7 +86,7 @@ src_install() {
 	keepdir ${destination}/cache
 
 	# Icon, menu, protcol
-	make_wrapper lastfm ./LastFM ${destination} ${destination}
+	make_wrapper lastfm ./${MY_B} ${destination} ${destination}
 	newicon data/icon.png lastfm.png
 	make_desktop_entry lastfm "Last.fm Player" lastfm.png