Version bump. Ebuild was almost rewritten. Use debian tarballs+patches.Fixes plugin installation. Fixes bug #321211

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

4 files changed, 137 insertions, 3 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index 01e8da10f6cf..d27a51c96fad 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.41 2009/11/02 20:59:37 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.42 2010/05/24 22:24:42 hwoarang Exp $
+
+*lastfmplayer-1.5.4.26862 (24 May 2010)
+
+  24 May 2010; Markos Chandras <hwoarang@gentoo.org>
+  +lastfmplayer-1.5.4.26862.ebuild, +files/fix_plugin_path.patch:
+  Version bump. Ebuild almost have been rewritten. Use debian tarball and
+  patches + a custom patch to install plugins into different location and
+  support multilib profiles. Fixes bug #321211 as well.
 
   02 Nov 2009; Markus Meier <maekke@gentoo.org>
   lastfmplayer-1.5.1.31879-r3.ebuild:
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index e14839b7248e..d301a2342a76 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -1,6 +1,10 @@
+AUX fix_plugin_path.patch 540 RMD160 bcfe86a5c193824ee4605bc3989905fa2745d1f8 SHA1 768a15ed2600d0050b6577e1dec0af69663132ed SHA256 e4a44bad4bf286eb2ecbece48df873a3e8b29afcef7cc5b0c624936c1e459fab
 AUX volumeslider_h-qt45.patch 685 RMD160 4b64d3ce601d7da01c8adf705aba1a3b129798fb SHA1 e1b5a3b61dce2862f3e552ee6d273f28cbf287e2 SHA256 b1238c155d75e02907934fdbfae3f9d600399bfa2d39135b29928c2c1016a193
 DIST lastfm_1.5.1.31879.dfsg-1.diff.gz 68688 RMD160 c811484cc300223ac358c4a9afc88d2b2349a3a8 SHA1 447eed64da4fc28c07450cba31d27aaa8e421c0a SHA256 853d4f6654ee26b5c5e4a20ace9086bad021c99871958f758f3e27692f4cab49
 DIST lastfm_1.5.1.31879.dfsg.orig.tar.gz 1473266 RMD160 394701227b4a2519df98955924ffa052597b6344 SHA1 7ca3dd4cefec3746b1e189e88c2797213996e95a SHA256 212ba742dfc17cc6541e6361e549edd1217512105ea4d7fe3c08a90f189d78fc
+DIST lastfm_1.5.4.26862+dfsg-3.debian.tar.gz 68548 RMD160 f42cd81fe286df54be8f0fbdb31969d269850bfc SHA1 8e55b12113edb3ea8e9e0ec8fe163d94e7b4d622 SHA256 80fe24fe08e560e2f69dc90b5d70a5f746d34b3c4a6f805c2c82a63c38f5195b
+DIST lastfm_1.5.4.26862+dfsg.orig.tar.gz 1478047 RMD160 ddd302f0748654d9cd3e0e70b05431e45b711908 SHA1 2d9a81b2a14f8f54ac25735a4a77dfa474d70910 SHA256 9131d08fd9c3de895670feb0c5b175a2d72d7d2bad001ea4c55cf8e0d34c700b
 EBUILD lastfmplayer-1.5.1.31879-r3.ebuild 2541 RMD160 e0d042fde2d6bc98f4882d4a699514f7cf2b43f8 SHA1 74e32245e7c6ef178018fe73808e3921b87d4e8e SHA256 d2f107ec60133053ad27b0d5ff2c149369529fd4495fbe0ebc777e4b0d1220de
-MISC ChangeLog 8401 RMD160 cec0f82f10def4a8794fa44709c8cdc716b93fb9 SHA1 f9717028d1a3d98e66531d939ffcc65f3f39a5a7 SHA256 b137e10c220fef21b6f36ae3719444abeb6b73af6bf61f301dabed8c1dcc99b8
+EBUILD lastfmplayer-1.5.4.26862.ebuild 3626 RMD160 24bbf1a24dd0b5cfc854fce1545304120aaae638 SHA1 0dfb2bec854124f9e845799254d41af9a969de9b SHA256 77b6f0a72a6c9a6b37ee7ad13bc0a6815d590708e13a25526aab48b65f62ce32
+MISC ChangeLog 8768 RMD160 d0eb546e990a25a1933c7f9c6772e3c2cc0b30c3 SHA1 58b262f8f05bec5accb885bcf51dc67ab8613bd4 SHA256 f5a82d0afec04d5fac307069a908903a9dd84875239e677e5682a2b11cacf59e
 MISC metadata.xml 251 RMD160 a3b846afdec6f11b4217978cc994b85fc82088ba SHA1 3f5086c6624e6ef17caefa9fb432efaf416e27b0 SHA256 12a2bce19c4087d3496fe929a182659413c12565c7dad8a4ddad9d2e6c73d8a7
diff --git a/media-sound/lastfmplayer/files/fix_plugin_path.patch b/media-sound/lastfmplayer/files/fix_plugin_path.patch
new file mode 100644
index 000000000000..c4fd5ae522b4
--- /dev/null
+++ b/media-sound/lastfmplayer/files/fix_plugin_path.patch
@@ -0,0 +1,13 @@
+Index: lastfm-1.5.4.26862+dfsg/src/libMoose/MooseCommon.cpp
+===================================================================
+--- lastfm-1.5.4.26862+dfsg.orig/src/libMoose/MooseCommon.cpp
++++ lastfm-1.5.4.26862+dfsg/src/libMoose/MooseCommon.cpp
+@@ -112,7 +112,7 @@ servicePath( QString name )
+         // Hack to get it working with VS2005
+         dirPath = qApp->applicationDirPath();
+     #else
+-        dirPath = qApp->applicationDirPath() + "/services";
++        dirPath = "/usr/lib/services";
+     #endif
+ 
+     #ifndef QT_NO_DEBUG
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862.ebuild
new file mode 100644
index 000000000000..df19f31efd86
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.26862.ebuild,v 1.1 2010/05/24 22:24:42 hwoarang Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs qt4-r2
+
+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-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ipod"
+RESTRICT="mirror"
+
+RDEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-sql: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() {
+	qt4-r2_src_prepare
+	epatch "${FILESDIR}"/fix_plugin_path.patch
+	einfo "Applying Debian patchset"
+	ebegin "Disabling tray-icon-size patch"
+	sed -i "/^tray-icon-size.diff/d" "${WORKDIR}"/debian/patches/series
+	eend $?
+	cd "${S}"
+	for i in $( < "${WORKDIR}"/debian/patches/series); do
+		epatch "${WORKDIR}"/debian/patches/$i
+	done
+	if ! use ipod ; then
+		sed -i '/src\/mediadevices\/ipod/d' LastFM.pro || die "sed failed"
+	fi
+	#don't install plugins into generic location
+	sed -i "s:\$\$BIN_DIR/services:\$\$BIN_DIR/lastfm_services:" \
+		"${S}"/definitions.pro.inc
+	#fix plugin search path
+	sed -i "s:/usr/lib/services:/usr/$(get_libdir)/lastfm_services:" \
+		"${S}"/src/libMoose/MooseCommon.cpp
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
+	cd i18n; lrelease *.ts
+}
+
+src_install() {
+	cd "${WORKDIR}"
+	# Docs
+	dodoc "${S}"/ChangeLog "${S}"/README debian/README.source \
+		|| die "dodoc failed"
+	doman debian/lastfm.1 || die "doman failed"
+
+	# Copied from debian/rules
+	insinto /usr/share
+	doins -r debian/package-files/share/icons || die "failed to install icons"
+	insinto /usr/share/lastfm/icons
+	doins "${S}"/bin/data/icons/*.png \
+		|| die "failed to install application icons"
+	insinto /usr/share/lastfm
+	doins "${S}"/bin/data/*.png || die "failed to install icons"
+	dodir /usr/$(get_libdir)/lastfm_services/
+	insinto /usr/$(get_libdir)/lastfm_services/
+	insopts -m0755
+	doins -r "${S}"/bin/lastfm_services/*.so || die "failed to install plugins"
+	insinto /usr/$(get_libdir)
+	insopts -m0755
+	doins "${S}"/bin/libLastFmTools.so.1* || die "failed to install library"
+	doins "${S}"/bin/libMoose.so.1* || die "failed to install library"
+	#fix symlinks
+	cd "${D}"/usr/$(get_libdir)/
+	ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1
+	ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1.0
+	ln -sfn libMoose.so.1.0.0 libMoose.so.1
+	ln -sfn libMoose.so.1.0.0 libMoose.so.1.0
+	cd "${WORKDIR}"
+	newbin "${S}"/bin/last.fm lastfm || die "newbin failed"
+	insinto /usr/share/lastfm/i18n
+	doins "${S}"/i18n/*.qm || die "failed to install translations"
+	fperms 755 /usr/bin/lastfm
+	rm -f "${D}"/usr/share/lastfm/icons/{*profile24,systray_mac}.png
+	# create desktop entry
+	doicon "${WORKDIR}"/debian/package-files/share/icons/hicolor/48x48/apps/lastfm.png
+	make_desktop_entry lastfm "Last.fm Player" lastfm
+}
+
+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."
+}