Allow arguments when launching lastfm from desktop file. Bug #395277

Package-Manager: portage-2.2.0_alpha83/cvs/Linux x86_64

3 files changed, 157 insertions, 15 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index e394b14c6e56..1aaf42154fca 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lastfmplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.65 2011/08/07 12:38:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.66 2011/12/30 09:49:31 hwoarang Exp $
+
+*lastfmplayer-1.5.4.27091-r2 (30 Dec 2011)
+
+  30 Dec 2011; Markos Chandras <hwoarang@gentoo.org>
+  +lastfmplayer-1.5.4.27091-r2.ebuild:
+  Allow arguments when launching lastfm from desktop file. Bug #395277
 
   07 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
   -lastfmplayer-1.5.4.26862-r3.ebuild, -lastfmplayer-1.5.4.27091.ebuild:
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index ce84d83aa509..1d46d5ed45a7 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -7,22 +7,23 @@ DIST dbusextension-2.0.tar.bz2 11101 RMD160 729afa5944c157cf4ff44dbb947fb5fab1ea
 DIST lastfm-1.5.4.27091+dfsg.tar.gz 1480448 RMD160 db34c471d8500ffde7bda71db4daf988372828d6 SHA1 3084e06d3a1e992204f7ea26e5a335722acad081 SHA256 b26596f35e71c9f5b20505486cb73f34404bbef01949c166929f566a5d9d6505
 DIST lastfm_1.5.4.27091+dfsg-2.debian.tar.gz 69004 RMD160 6145207d64e85d8b949c44022e17b8f66a0ba9e8 SHA1 bca8826e627b2bdada28619acf00931cbaea16ff SHA256 e5953574db35c098b0d82537d69c0e15369bd3d3a84920a7ae42948ce9d42db7
 EBUILD lastfmplayer-1.5.4.27091-r1.ebuild 4340 RMD160 1632634e2c30bd1d3e2b5b5f56df41ade0869d0d SHA1 4659385ed3bdda5e9531a77de23032b65aefa8d0 SHA256 7c20ba3f085c96102a58c16dfcba18afa0f1a163049587b8b248f8dd8120c0c7
-MISC ChangeLog 12470 RMD160 f76801a13495ce166389dda8b5fcbeae17df7f3b SHA1 8e9684549fec54b905e2530ee444a9658a43f159 SHA256 d8142ceb208de3cb9709e7416dcbdd1f122464f92f33f0932e81e398c3e6c096
+EBUILD lastfmplayer-1.5.4.27091-r2.ebuild 4496 RMD160 a4c181ca77fd641d7a3015df73cbf200778dbed5 SHA1 ea19dacd0c6ad64b7b49972d4cd2e16b32152108 SHA256 26f6434d3e291700fe286121dc3231e59c9fbf89d961a95238a4661f4dabdb54
+MISC ChangeLog 12678 RMD160 f3070152f7b7a318d946ecc9e059cfe8111f5d30 SHA1 c7a0939eebcadfe86a66927415f481d920003755 SHA256 6ff9b74771eb7984e858ad73d0eaa5a9183e5c412862df4b3ef19c3e1e22fdcb
 MISC metadata.xml 251 RMD160 a3b846afdec6f11b4217978cc994b85fc82088ba SHA1 3f5086c6624e6ef17caefa9fb432efaf416e27b0 SHA256 12a2bce19c4087d3496fe929a182659413c12565c7dad8a4ddad9d2e6c73d8a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOPocoAAoJEPqDWhW0r/LCR24P/jBbXT80aTABdYr0HU4zrkeh
-vKn/Ut5OUcXIZcg0lYuO9Tw8mE0+GRIkqmwlaBgdlmRu2IZrFbN1ScHFDhy2WsvQ
-Z+OfEFyH/AkX53AhdxCCsPAwann4PoA+0HIInmd+tBRiYjbHGNihYOySNaEmhvzY
-qru00XEx2hoeTCfgl23RDTijlivfnNYFdwtWJGo93V0LGtP3phEIqPW0Rpb+BJh3
-MOiVqA+bBspP3pJuDE1JrtYoZclRmCjZqr34ynuuLJWHiqm743WPCwkuIC6AzXXC
-Kycggx4P82B56D3gUJf60xVa+6JWLon9pV9FpnOte6naOweyG70ci3SXiyhfpUpw
-pzahlQTwokZBPHRhtErN0WpQQ4xMT7dxj4g4TfxUpVCphOU171Bf0cJwTh2XrsYl
-NKt0HfGPEFsppKTXdE5YE1eZKSvAGkOWMyAopqYfEEmdSrCtzucqok2r04IPaiBK
-a0v/sJ1Ly+DGtE+rUSUtq9PmGQs0k7nhK7Tasgiqv945vLpC1v36Nyz+vEjD3TYk
-PCk2A0cA1VHO9jzrkThYsVQCoARh7YWCSJ4Rlc/9xuqSoQ+fk5/nh9QUvNIbtb6G
-Hmye0UTSz1Ore42TMhyKcwpu+e1VvNWu9Chdwvc4onABuaF+6oASybxAFhcXY9Xp
-21CRzM2Z47tG/SVseMkN
-=SAyZ
+iQIcBAEBCgAGBQJO/YitAAoJEPqDWhW0r/LCQVsP/RGec7JbM0sGiQKR8XBKknUA
+mNqYccIhf1PusIqcQNWOoB6LERsYDspXi58875O+AeLGjMoGJ/da2PxC85cY1PzR
+EIIuRj5I3sR5bryfO2FV8OBhva5GGDUHGUirZxFuncD2KHu6JZHs/7rEQXAB/Pdv
+S3YKnIF8m4JxwIh8YMEgBSVf99+x7QOBQm+r59ID32E7KC7k/US+cJ0wNal/ujOo
+1ZoHqzw7XDXCT29j6GrMLQn4uRt71Z0V0TXxmZCmxQpxCOxFkLMmRfVXnWcrmJmM
+6eFYyP3CbaDN7Xiro6Yf1lmV6n156BT53FsxNeZH75dKkpHza18yT/rwOO7JVEe6
+YYVqoL48Dtx2vBeIOTnh6l3La56zoe0Je8koJsnll3XZVHyGDPZWhPSfB6Cy1++K
+dwEetrMRYT2SKDukSU4OmD1ryn2UNNew8zaVxECNF52OvpKg0/b4xIqeKIQs4Azr
+Rqz+O0Oi2ASsC6t3daT+hZV9MKlEo0BEXtoXtsq3kBRyz4uvpSRpOpItEGlvVOLd
+Q6JMUWsru5Ny47VwGNuT0DYOqoLHgZZPa1uhe+oDIxLuRibhTUlbUWyqnNIKPDm3
+baANcOx8kSX7An1DOvANbke+20nPIiWKhBMIM0oI8916zS/wafMYBDAfKEHPYcqk
+fXHEhq7C02/1uj18+xg5
+=Jt6d
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
new file mode 100644
index 000000000000..999cbd4deade
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 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.27091-r2.ebuild,v 1.1 2011/12/30 09:49:31 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
+	http://www.mehercule.net/staticpages/index.php/lastfm"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/lastfm-${PV}+dfsg.tar.gz
+	http://dev.gentoo.org/~hwoarang/distfiles/lastfm_${PV}+dfsg-2.debian.tar.gz
+	dbus? ( http://glue.umd.edu/~rossatok/dbusextension-2.0.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="dbus ipod"
+
+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
+	# Use a different extensions path
+	epatch "${FILESDIR}"/${PN}-extensions-path.patch
+	einfo "Applying Debian patchset"
+	sed -i "/^tray-icon-size.diff/d" "${WORKDIR}"/debian/patches/series
+	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
+	#fix plugin search path for multilib support
+	sed -i -e "s:/usr/lib/:/usr/$(get_libdir)/:g" \
+		"${S}"/src/libMoose/MooseCommon.cpp
+	if use dbus; then
+		mv "${WORKDIR}"/dbus "${S}"/src/dbus
+		sed -i -e "/include/s:../definitions.pro.in:definitions.pro.in:" \
+			-e "/TARGET/s:dbusextension:LastFmDbusExtension:" \
+			"${S}"/src/dbus/dbusextension.pro
+	fi
+}
+
+src_configure() {
+	if use dbus; then
+		pushd "${S}"/src/dbus
+		eqmake4 dbusextension.pro
+		popd >> /dev/null
+	fi
+	qt4-r2_src_configure
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
+	if use dbus; then
+		einfo "Building DBUS plugin"
+		emake -C "${S}"/src/dbus || die "failed to build dbus extension"
+	fi
+	cd i18n; lrelease *.ts
+}
+
+src_install() {
+	cd "${WORKDIR}"
+	# Docs
+	dodoc "${S}"/ChangeLog.txt "${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"
+	if use dbus; then
+		insinto /usr/$(get_libdir)/lastfm_services/extensions/
+		insopts -m0755
+		doins "${S}"/bin/lastfm_services/extensions/*.so || die
+	fi
+	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
+	# Allow arguments when launching application. Bug #395277
+	make_desktop_entry lastfm "Last.fm Player" lastfm
+	sed -i -e "/Exec/s:lastfm:& %U:" \
+		"${D}"/usr/share/applications/lastfm-${PN}.desktop || die
+}
+
+pkg_postinst() {
+	elog "To use the Last.fm player with a mozilla based browser:"
+	elog " 1. Install gnome-base/gconf"
+	elog " 2. gconftool-2 -t string -s \
+/desktop/gnome/url-handlers/lastfm/command \"/usr/bin/lastfm %s\""
+	elog " 3. gconftool-2 -s \
+/desktop/gnome/url-handlers/lastfm/needs_terminal false -t bool"
+	elog " 4. gconftool-2 -t bool -s \
+/desktop/gnome/url-handlers/lastfm/enabled true"
+	elog
+	elog "If you experience awkward fonts or widgets, try running qtconfig."
+}