Fixed bug #258862, ebuild clean up

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

4 files changed, 112 insertions, 3 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index f81c7694dec1..feb2def4e65b 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/lastfmplayer
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.34 2008/12/11 23:32:16 yngwin Exp $
+# 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 $
+
+*lastfmplayer-1.5.1.31879-r2 (17 Feb 2009)
+
+  17 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
+  +files/makefile-qt45.patch, +lastfmplayer-1.5.1.31879-r2.ebuild:
+  Use EAPI2,fixed doc installation, fixed Qt4 dependencies, fixed bug
+  #258862
 
 *lastfmplayer-1.5.1.31879-r1 (11 Dec 2008)
 
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index fb593493a783..a50a3de43ee1 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -1,5 +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
 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
@@ -8,6 +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.ebuild 2332 RMD160 17fcbd21291779c5c8f98b828dd29b99a287bdae SHA1 e307f14951e115faab65ed709dbadb0b635b990a SHA256 9e81ab416e9245a7740271a7dbec1c56e2b862c9d21dd0cf4378eb7f53cb20c6
-MISC ChangeLog 7169 RMD160 818ff44ca3439d7595135730b4c2f23ff597fafb SHA1 0ad5e40f97925a00bc8d6ca9954a7ce790ff140d SHA256 e9ad55de2547efa562d92f05c3c1cda4188ac95ad2e5fa7a3b57ef6d6524438a
+MISC ChangeLog 7416 RMD160 71ccded1bf664962c2281d9410e705248216eff3 SHA1 66d0b87ade3dcfb29fb2e9f3d9e162ee16937f4c SHA256 ef2140e617f946c06a34194f716d1b9005dfce57c8ca359cca9d011eb98c9eec
 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
new file mode 100644
index 000000000000..c7db8aca7f09
--- /dev/null
+++ b/media-sound/lastfmplayer/files/makefile-qt45.patch
@@ -0,0 +1,12 @@
+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/lastfmplayer-1.5.1.31879-r2.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879-r2.ebuild
new file mode 100644
index 000000000000..51b67efac83e
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.1.31879-r2.ebuild
@@ -0,0 +1,88 @@
+# 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 $
+
+EAPI="2"
+
+inherit eutils multilib qt4
+
+MY_P="${P/lastfmplayer/lastfm}.dfsg"
+
+DESCRIPTION="A player for last.fm radio streams"
+HOMEPAGE="http://www.last.fm/help/player"
+SRC_URI="mirror://debian/pool/main/l/lastfm/lastfm_${PV}.dfsg.orig.tar.gz
+	mirror://debian/pool/main/l/lastfm/lastfm_${PV}.dfsg-1.diff.gz"
+#http://cdn.last.fm/client/src/${MY_P}.src.tar.bz2
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ipod"
+RESTRICT="mirror"
+
+RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-sql:4 ) x11-libs/qt:4 )
+	media-libs/libsamplerate
+	sci-libs/fftw
+	media-libs/libmad
+	ipod? ( >=media-libs/libgpod-0.5.2 )
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	app-arch/sharutils"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch lastfm_${PV}.dfsg-1.diff
+	cd "${S}"
+	for i in $(< debian/patches/series); do
+		epatch debian/patches/$i
+	done
+	if ! use ipod ; then
+		sed -i '/src\/mediadevices\/ipod/d' LastFM.pro || die "sed failed"
+	fi
+}
+
+src_compile() {
+	emake src/Makefile || die "emake src/Makefile failed"
+	epatch "${FILESDIR}/makefile-qt45.patch"
+	emake || die "emake failed"
+	cd i18n; lrelease *.ts
+}
+
+src_install() {
+	# Docs
+	dodoc ChangeLog README debian/README.source || die "dodoc failed"
+	doman debian/lastfm.1 || die "doman failed"
+
+	# Copied from debian/rules
+	uudecode -o - debian/icons.tar.gz.uu | tar -xzf -
+	uudecode -o - debian/trayicons22.tar.gz.uu | tar -xzf -
+	insinto /usr/share
+	doins -r icons
+	insinto /usr/share/lastfm/icons
+	doins user_*.png
+
+	sed -i -e "s,/usr/lib,/usr/$(get_libdir),g" debian/lastfm.install
+	# make directories
+	for i in $(<debian/lastfm.install); do [ ${i:0:1} == / ] && dodir $i; done
+	# debian installation
+	sed -i -e "s:^:mv :" -e 's: /:${D}/:' debian/lastfm.install
+	bash debian/lastfm.install
+
+	# copied..
+	mv "${D}"/usr/bin/lastfm.sh "${D}"/usr/bin/lastfm
+	fperms 755 /usr/bin/lastfm
+	rm -f "${D}"/usr/share/lastfm/icons/{*profile24,systray_mac}.png
+}
+
+pkg_postinst() {
+	elog "To use the Last.fm player with a mozilla based browser:"
+	elog " 1. Go to about:config in the browser"
+	elog " 2. Right-click on the page"
+	elog " 3. Select New and then String"
+	elog " 4. For the name: network.protocol-handler.app.lastfm"
+	elog " 5. For the value: /usr/bin/lastfm"
+	elog
+	elog "If you experience awkward fonts or widgets, try running qtconfig."
+}