New patch for qt-4.5 compatibility. Removing old ebuild

(Portage version: 2.2_rc26/cvs/Linux x86_64)

4 files changed, 34 insertions, 16 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index feb2def4e65b..6800cb56ee0e 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/lastfmplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.35 2009/02/17 20:07:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.36 2009/03/22 23:42:49 hwoarang Exp $
+
+*lastfmplayer-1.5.1.31879-r3 (22 Mar 2009)
+
+  22 Mar 2009; Markos Chandras <hwoarang@gentoo.org>
+  -files/makefile-qt45.patch, +files/volumeslider_h-qt45.patch,
+  -lastfmplayer-1.5.1.31879-r2.ebuild, +lastfmplayer-1.5.1.31879-r3.ebuild:
+  New patch for qt-4.5 compatibility. Removing old ebuild due to ugly
+  workaround
 
 *lastfmplayer-1.5.1.31879-r2 (17 Feb 2009)
 
diff --git a/media-sound/lastfmplayer/files/makefile-qt45.patch b/media-sound/lastfmplayer/files/makefile-qt45.patch
deleted file mode 100644
index c7db8aca7f09..000000000000
--- a/media-sound/lastfmplayer/files/makefile-qt45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lastfm-1.5.1.31879.dfsg/src/Makefile
-===================================================================
---- lastfm-1.5.1.31879.dfsg.orig/src/Makefile
-+++ lastfm-1.5.1.31879.dfsg/src/Makefile
-@@ -959,6 +959,7 @@ compiler_uic_clean:
- ../build/ui_playcontrols.h: playcontrols.ui \
- 		volumeslider.h
- 	/usr/bin/uic playcontrols.ui -o ../build/ui_playcontrols.h
-+	sed -i "s/phonon\/Phonon::VolumeSlider/volumeslider.h/" ../build/ui_playcontrols.h
- 
- ../build/ui_failedlogindialog.h: failedlogindialog.ui
- 	/usr/bin/uic failedlogindialog.ui -o ../build/ui_failedlogindialog.h
diff --git a/media-sound/lastfmplayer/files/volumeslider_h-qt45.patch b/media-sound/lastfmplayer/files/volumeslider_h-qt45.patch
new file mode 100644
index 000000000000..c2ce673be28a
--- /dev/null
+++ b/media-sound/lastfmplayer/files/volumeslider_h-qt45.patch
@@ -0,0 +1,19 @@
+Index: lastfm-1.5.1.31879.dfsg/src/myvolumeslider.h
+===================================================================
+--- /dev/null
++++ lastfm-1.5.1.31879.dfsg/src/myvolumeslider.h
+@@ -0,0 +1 @@
++#include "volumeslider.h"
+Index: lastfm-1.5.1.31879.dfsg/src/playcontrols.ui
+===================================================================
+--- lastfm-1.5.1.31879.dfsg.orig/src/playcontrols.ui
++++ lastfm-1.5.1.31879.dfsg/src/playcontrols.ui
+@@ -146,7 +146,7 @@
+   <customwidget>
+    <class>VolumeSlider</class>
+    <extends>QFrame</extends>
+-   <header>volumeslider.h</header>
++   <header>myvolumeslider.h</header>
+    <container>1</container>
+   </customwidget>
+  </customwidgets>
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879-r2.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879-r3.ebuild
index 51b67efac83e..e172e7477614 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879-r2.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879-r2.ebuild,v 1.1 2009/02/17 20:07:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879-r3.ebuild,v 1.1 2009/03/22 23:42:49 hwoarang Exp $
 
 EAPI="2"
 
@@ -31,7 +31,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/volumeslider_h-qt45.patch
+)
+
 src_prepare() {
+	qt4_src_prepare
 	cd "${WORKDIR}"
 	epatch lastfm_${PV}.dfsg-1.diff
 	cd "${S}"
@@ -44,8 +49,6 @@ src_prepare() {
 }
 
 src_compile() {
-	emake src/Makefile || die "emake src/Makefile failed"
-	epatch "${FILESDIR}/makefile-qt45.patch"
 	emake || die "emake failed"
 	cd i18n; lrelease *.ts
 }