New patch for qt-4.5 compatibility. Removing old ebuild

Package-Manager: portage-2.2_rc26/cvs/Linux x86_64

5 files changed, 37 insertions, 19 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/Manifest b/media-sound/lastfmplayer/Manifest
index a50a3de43ee1..77b6936c98d6 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -1,6 +1,6 @@
 AUX lastfm.protocol 159 RMD160 863935a9ee6f66f5c901f39182278346117f80b3 SHA1 827723dfcc15714fa676671ec6656d352419208a SHA256 c0f82b00703ed8c307e448ae49f173e30801a06ea2eb7a82d21a6b3f75f25093
 AUX lastfmplayer-mad-asneeded.patch 443 RMD160 8fe0db8ec176ad4a217a16b0770b2cd3eb002e7a SHA1 194ad97e005d55f9301dcf407e94d84bf4d3a26a SHA256 e113e3251563e91f920e0ec82347b8a5e162a04b39219800cc9e613a7ed92736
-AUX makefile-qt45.patch 578 RMD160 3d99cf1d2d3139847de10f10e44129b8faad39fc SHA1 2d069e05372caf9815a31b0a296c393cc5b28912 SHA256 64ddf1989b1b72cbbdf8a87a4b663525614c946674199ce04288a2cadb1bb186
+AUX volumeslider_h-qt45.patch 685 RMD160 4b64d3ce601d7da01c8adf705aba1a3b129798fb SHA1 e1b5a3b61dce2862f3e552ee6d273f28cbf287e2 SHA256 b1238c155d75e02907934fdbfae3f9d600399bfa2d39135b29928c2c1016a193
 DIST last.fm-1.4.2.58240.src.tar.bz2 7302117 RMD160 dd8adf91514786fd31ee8e8f4e87f92c89eb7cf9 SHA1 b71267b978b1d44c1a877e45855d24fcdf3137a9 SHA256 6e66f3408021b3ea512224451599e81bd0fb9ede464575d9acae2cc16d5b6429
 DIST lastfm_1.4.2.58240.dfsg-1.diff.gz 86651 RMD160 6208140b51234797f314c481c44cdfd43b7499a8 SHA1 360549b3b7126f408a98be52c37421b3ef357dcd SHA256 49d2ac81e20b61ef6d72a746acec0fa973ee5e185f86985ea41fc95ee9083b3c
 DIST lastfm_1.4.2.58240.dfsg.orig.tar.gz 1420805 RMD160 942572d21ff8c4b987c38a7919539af136b0b62a SHA1 7086ace7036d6e53b33e82d35287eb548790a348 SHA256 0e623ac3ec9a57940c7535133c1fcfdd88bb80e488a903ea033ac1b093144ab1
@@ -9,7 +9,7 @@ DIST lastfm_1.5.1.31879.dfsg.orig.tar.gz 1473266 RMD160 394701227b4a2519df989559
 EBUILD lastfmplayer-1.4.2.58240-r1.ebuild 2286 RMD160 333fb5ddf7aa52500b19e4518fcc0bbcff740434 SHA1 fbf5f41bb9b4fb2224352626d78e4e5359d0039d SHA256 cb28c592761cabb85afea6afeeb641b3bcf2c966beed7d598f24559beca39202
 EBUILD lastfmplayer-1.4.2.58240.ebuild 2462 RMD160 27559957be597ecff01ff7bf5390601f3d71b747 SHA1 e987f4af10c74ca5deb7025e4a52170316e1292b SHA256 6b172c5879461332d5e0e1a059da2400c29452353b6db2b9352384df211563dd
 EBUILD lastfmplayer-1.5.1.31879-r1.ebuild 2422 RMD160 93b566ffa9a6f0fb2ab502bbf8b1b3433c1135b2 SHA1 c9d7ebc909771e25c251dff3996d17a1fbe97d8b SHA256 fe9d34a5b63ce05127869f1646f33d709543726b00feca2f3b99e1aa8b6950ec
-EBUILD lastfmplayer-1.5.1.31879-r2.ebuild 2546 RMD160 76ae7c19a7a00d0c4f7940612c581025b5d73ba8 SHA1 97d36375c30bfdbe58d692c832498f109b94ef5d SHA256 e994bf024eefae5732a197af163bfa63c02d239afc1fc8c84603e12a4403fa7c
+EBUILD lastfmplayer-1.5.1.31879-r3.ebuild 2520 RMD160 cceaabb5c5e8d688b9ad2e8911f94eb52e3c6eb4 SHA1 4303b1467940b0394ff3a23511df944b97a0b645 SHA256 7ce76a95e0418abf01fe3f7f97626a3b6f040dd410e53e28e45f854117209464
 EBUILD lastfmplayer-1.5.1.31879.ebuild 2332 RMD160 17fcbd21291779c5c8f98b828dd29b99a287bdae SHA1 e307f14951e115faab65ed709dbadb0b635b990a SHA256 9e81ab416e9245a7740271a7dbec1c56e2b862c9d21dd0cf4378eb7f53cb20c6
-MISC ChangeLog 7416 RMD160 71ccded1bf664962c2281d9410e705248216eff3 SHA1 66d0b87ade3dcfb29fb2e9f3d9e162ee16937f4c SHA256 ef2140e617f946c06a34194f716d1b9005dfce57c8ca359cca9d011eb98c9eec
+MISC ChangeLog 7737 RMD160 a9bb727c555dbc4a2c9dc3c22fd15d66a41dad4d SHA1 32defe501497c819a4f7e78a9f053bc295f0ace4 SHA256 d556f7d964c71bb6352d2ba2588a1d0733079b6d684653bab75f770904b8385c
 MISC metadata.xml 251 RMD160 d7ccc9e1d41d94cb971d83931a8ece9a684f6fc6 SHA1 1a65ae8b81af34d32b85ed8a18e1df5caef40ff3 SHA256 c87b81ca4913491f67f603b92fa806fb2af4f29d1fec96891731d2ac7490cb2b
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
 }