Add new 'dbus' use flag to support dbus extension

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

4 files changed, 203 insertions, 15 deletions

diff --git a/media-sound/lastfmplayer/ChangeLog b/media-sound/lastfmplayer/ChangeLog
index 2bfe4dd98e1a..f8ab3f93ee11 100644
--- a/media-sound/lastfmplayer/ChangeLog
+++ b/media-sound/lastfmplayer/ChangeLog
@@ -1,6 +1,15 @@
 # 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.57 2011/01/23 18:26:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/ChangeLog,v 1.58 2011/01/24 14:29:53 hwoarang Exp $
+
+*lastfmplayer-1.5.4.27091-r1 (24 Jan 2011)
+
+  24 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
+  +lastfmplayer-1.5.4.27091-r1.ebuild,
+  +files/lastfmplayer-extensions-path.patch:
+  Add new 'dbus' use flag to support dbus extension. See
+  http://www.last.fm/forum/21716/_/397336 for more info. This plugin supports
+  both dbus and mpris interfaces
 
 *lastfmplayer-1.5.4.27091 (23 Jan 2011)
 
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
index 9abd68c7afea..257d1efecb0e 100644
--- a/media-sound/lastfmplayer/Manifest
+++ b/media-sound/lastfmplayer/Manifest
@@ -2,6 +2,8 @@
 Hash: SHA512
 
 AUX fix_plugin_path.patch 540 RMD160 bcfe86a5c193824ee4605bc3989905fa2745d1f8 SHA1 768a15ed2600d0050b6577e1dec0af69663132ed SHA256 e4a44bad4bf286eb2ecbece48df873a3e8b29afcef7cc5b0c624936c1e459fab
+AUX lastfmplayer-extensions-path.patch 1507 RMD160 8489ee04a47a1263996e92b8ee2220e83ae32445 SHA1 3bc79e72796730ea8294032ecd2ba6c6325aa161 SHA256 4ec6beecbe5de40937b148ac72bc7d52a81f7636c8ef11b1a821db6488578153
+DIST dbusextension-2.0.tar.bz2 11101 RMD160 729afa5944c157cf4ff44dbb947fb5fab1eaf2d1 SHA1 7b43f450dfd6923afb1c58d89c829ca92ad02158 SHA256 db9f5040b593886a36ec409bb1e5b96f2225132207c841cc0b3c15c6242741d2
 DIST lastfm-1.5.4.27091+dfsg.tar.gz 1480448 RMD160 db34c471d8500ffde7bda71db4daf988372828d6 SHA1 3084e06d3a1e992204f7ea26e5a335722acad081 SHA256 b26596f35e71c9f5b20505486cb73f34404bbef01949c166929f566a5d9d6505
 DIST lastfm_1.5.4.26862+dfsg-4.debian.tar.gz 67416 RMD160 31d85e3f2d5319e2c8726f9f06e6de14fb4bfcff SHA1 822119a9cb058c6b5af545b51647a7530639b390 SHA256 2cbe532ca81085cc538bd547408a6d14e5e54b6885d397df70f6d2184d40fafb
 DIST lastfm_1.5.4.26862+dfsg-6.debian.tar.gz 67186 RMD160 4d58347ca904cdaaf7e7ebeec3e81eda9393e578 SHA1 43a7799595f27463d3906c4afceada3c585d7f9a SHA256 a3c555918a0b1e867ab1b11300e82741a61217eba918e1548b8dd07c4b811a18
@@ -9,23 +11,24 @@ DIST lastfm_1.5.4.26862+dfsg.orig.tar.gz 1478047 RMD160 ddd302f0748654d9cd3e0e70
 DIST lastfm_1.5.4.27091+dfsg-2.debian.tar.gz 69004 RMD160 6145207d64e85d8b949c44022e17b8f66a0ba9e8 SHA1 bca8826e627b2bdada28619acf00931cbaea16ff SHA256 e5953574db35c098b0d82537d69c0e15369bd3d3a84920a7ae42948ce9d42db7
 EBUILD lastfmplayer-1.5.4.26862-r2.ebuild 3674 RMD160 fe15700aa713922618a81d9c7eb473af66e4a176 SHA1 12441260d61d8a7f029b0cfe863775511c420795 SHA256 5508c35316191a188f1e8c7a69c1b76950de0e63c32c1b4bc16377a490ff0811
 EBUILD lastfmplayer-1.5.4.26862-r3.ebuild 3729 RMD160 717a14c5b49cce9ecaed8906ac9d648b0ad4b79c SHA1 5a4daea28f5a842768dfdb37037f299ae17f7847 SHA256 2920f7a50a0a9ec788c3cc475dbafe7e302eaef35af7bdedf50e86d4af3c7d6b
+EBUILD lastfmplayer-1.5.4.27091-r1.ebuild 4341 RMD160 a939972e8720fd919de7ae3f5bae1d602b450b84 SHA1 19f183232949bd59a1a243a1f3572a4b6b8cc5d9 SHA256 8e90c3de5e7d96574f8f3b95473f45076788618b1dd4e94a457e584f1e1b3c35
 EBUILD lastfmplayer-1.5.4.27091.ebuild 3725 RMD160 f440e14b7ded045e856b1b1956912cf89c751ccd SHA1 64ee55c8c0afc2b40a0e7d3e7d633879061bf22e SHA256 ed809372424c577480e5455727a0d43a862e5cc4fbc50fa775b3d768bbe2658b
-MISC ChangeLog 11250 RMD160 402ffc3e9462ce5e0181ab117643b5ac4c27499c SHA1 4662f87885e839d5458a74379429f25fa1627e8a SHA256 2c381819d9b9a68d327b5eb3a626ac1274a2ec521e17e472975504f05ce72337
+MISC ChangeLog 11600 RMD160 fe8beb72b47179c36e19feddd7bd4447725078b0 SHA1 a6b734c57723357bbfda85dc03ec74d7f0dd7c8f SHA256 21f601b1a045fb8cd489469e3d711bd1442dde96827df43be910b1161a38fa5b
 MISC metadata.xml 251 RMD160 a3b846afdec6f11b4217978cc994b85fc82088ba SHA1 3f5086c6624e6ef17caefa9fb432efaf416e27b0 SHA256 12a2bce19c4087d3496fe929a182659413c12565c7dad8a4ddad9d2e6c73d8a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNPHK2AAoJEPqDWhW0r/LChsQQAJjiZ9M+b8dosESbh2/+UjdS
-wXuvG9fuBDmpoGLu91Ja2VydfLmlj3e92H2TGOy1HRtnnnrAR6no6dSHRnRsCzOB
-7u3ZrIPaF3rP1CepiwwANJln7GgQshMI8nJ1QZWjHG0PAQ4bOt6pZS08Gp6iYEpR
-NB5JPA/kGnlrr/+r+xraWZxewxtG9L97ln9GgxdZzU47I4II4tyUSre4vgP5NyNQ
-449U8FJiBf3Z1VDwDHLFIdTl9bSn/Gv1tfkgBG8TYHTr3wH7AM1Os5KAKxWB1nQ4
-yA5Y93aiNWzrlX/Q1w74trOAV9CW1HoxvxYY1e9Y3lHvuxi8iz/xvMbu/nx3Rzz3
-qAN0NwCckxYKPsyDQLLR2YapUrLyhIMI8e2/5T+txZgR0C4zoug1Y1L8LyZhh/Ln
-QOn8dn3L8CstOBdFX0nNlcB8A1yLk6xoYHiqkei2A6Z7gslvwIplY300ICHD4uKN
-TXinwI6NVtQCgZihQ2DErPIiV9x/QTSWwwKhsPbRwIt3wuMUjbHUbaQ+VpSUge/9
-TrolV6vAD3Nw3tQdrE7QfZSvdFH9xKcR8alTaaTtdLGs6lpLiOOhu/yufi9o01Zm
-zwLqRZawCSNlh5Bfqz2KKdm+O3r9eCkwBwfHcdhHMWb8nAjRKRSKaznf8z48Jhkp
-UI0eEVHPT/7jl5Tjs+vH
-=4sle
+iQIcBAEBCgAGBQJNPYzQAAoJEPqDWhW0r/LCD2UP+wY50B06/FWGTa1KtXOZAJtc
+4XLeNisv6v4jiRvB0fwn3IJYOhjBtiysBDvECydU9vJbF3anSVFYAQhUMJHgVXf1
+XuuYjCcJQDC7Gu824xpK0RctLaxJEcBypmqjIvMaVXUAl+KGQVQXZ+qB6NHzOOt1
+I0MbO3y1vc2XSUCN0srLKmR0oImnR4e/iOfZHmXLCAQ898iDD8IIxzyrTUJ603Jx
+i1WBsovI94c9FnmsbR9rp0BJycl+XvbafUCi9kEqM/Fe0Fx6JT0MAFZWbjnCQzbu
+whSTwMahYI5u1FaCxJO7P03IoRhmFGR/gKvX+RhKSx43Yehi88LqNJowcGeS0loX
+e/b5sH9u5f6UBbGBHYWtmYV73UIy0sAPxLfeQf3QnatZ09EpOtFeZKek7CexAhuY
+8yefr8aZ3fGaux5dRHOhhOFaual4c0kMEuagwTo+APjaIJV+3sFN2jDAgFqkVM0H
+FphuB9ObaZ9K+qj3CWWG1roN44dMDl6IryQ1NKlqwHDCLPicPOPu9kUIKQPVfwK0
+cMEQHnNvOj/14c5K6cICsmsHWHK+TZ+flm6tr90mrg51MmHpBQ5xF2mMHyPV5x/F
+NHzMUuVnf7ELGrhCZwD8D6fU3T6WW6xteBu+A4ZH0eyR+p7yxgTxoEAOqfSxlDUt
+XKEdb6wflJBz3TkNZU3K
+=6cux
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch b/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch
new file mode 100644
index 000000000000..6805dd0eb7ea
--- /dev/null
+++ b/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch
@@ -0,0 +1,44 @@
+Index: lastfm-1.5.4.27091+dfsg/definitions.pro.inc
+===================================================================
+--- lastfm-1.5.4.27091+dfsg.orig/definitions.pro.inc
++++ lastfm-1.5.4.27091+dfsg/definitions.pro.inc
+@@ -10,7 +10,7 @@ CONFIG( service ) {
+     CONFIG += plugin
+ 
+     win32: DESTDIR = $$BIN_DIR
+-    else:  DESTDIR = $$BIN_DIR/services
++    else:  DESTDIR = $$BIN_DIR/lastfm_services
+ 
+     TARGET = srv_$$TARGET
+ }
+@@ -19,7 +19,7 @@ CONFIG( extension ) {
+     CONFIG += plugin
+ 
+     win32: DESTDIR = $$BIN_DIR
+-    else:  DESTDIR = $$BIN_DIR/extensions
++    else:  DESTDIR = $$BIN_DIR/lastfm_services/extensions
+ 
+     TARGET = ext_$$TARGET
+ }
+Index: lastfm-1.5.4.27091+dfsg/src/libMoose/MooseCommon.cpp
+===================================================================
+--- lastfm-1.5.4.27091+dfsg.orig/src/libMoose/MooseCommon.cpp
++++ lastfm-1.5.4.27091+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/lastfm_services";
+     #endif
+ 
+     #ifndef QT_NO_DEBUG
+@@ -358,7 +358,7 @@ extensionPaths()
+     // Hack to get it working with VS2005
+     QString path = qApp->applicationDirPath();
+   #else
+-    QString path = qApp->applicationDirPath() + "/extensions";
++    QString path = "/usr/lib/lastfm_services/extensions";
+   #endif
+ 
+   #ifndef QT_NO_DEBUG
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r1.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r1.ebuild
new file mode 100644
index 000000000000..2ba12143e36c
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r1.ebuild
@@ -0,0 +1,132 @@
+# 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-r1.ebuild,v 1.1 2011/01/24 14:29:53 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
+	make_desktop_entry lastfm "Last.fm Player" lastfm
+}
+
+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."
+}