Fix last.fm plugin linking, bug #276972.

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

4 files changed, 201 insertions, 2 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 93236037c68b..8d103f2253ca 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.153 2009/07/06 21:55:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.154 2009/08/09 21:52:08 eva Exp $
+
+*rhythmbox-0.12.3-r1 (09 Aug 2009)
+
+  09 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +rhythmbox-0.12.3-r1.ebuild, +files/rhythmbox-0.12.3-lastfm.patch:
+  Fix last.fm plugin linking, bug #276972.
 
 *rhythmbox-0.12.3 (06 Jul 2009)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 6609f4b7c4b3..ad66435015c8 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.11.5-libmtp-0.3.0-API.patch 426 RMD160 f48440d266ba4209e5025c2e1525c606516db49e SHA1 9d4822b237d0434376e3f3c072ee8fb52ee11386 SHA256 3de9f0ecfbfac969a93a199da576cff4fd3d9f411ae5d2d71dfb6112f63a36b8
 AUX rhythmbox-0.12.2-link-fixes.patch 5280 RMD160 ad9ee18b2ccf12cce769c9e15e0f1d6aee386234 SHA1 360582ecfeacc5a11ea80394ec47aafb7c7123c5 SHA256 a53b023e2de6bb92eef969514468c8bce61e9d500c03f46ff435b7a0234c51b4
+AUX rhythmbox-0.12.3-lastfm.patch 764 RMD160 3f2b8edeb7e03d102541f6ddb0788e2c23009809 SHA1 80ac030d5811440e636358e6d548d2b5faba1f5e SHA256 5efd050bb9c8eae04bb9442d5ee298f2abb58a2409529f4561b9ed9acdb3a9a3
 DIST rhythmbox-0.11.6.tar.bz2 4683400 RMD160 3fd6b8595705a91c779c458a26333575ba5e2233 SHA1 4364447bd4f6fb0e969039213cea37d6d3e4fb58 SHA256 687f566817a0c1c6a2c0e9cc462bb10cded39b8d22b224fa55be00ae1cbdc151
 DIST rhythmbox-0.12.2.tar.bz2 4909310 RMD160 bf50fe01295c8a4fc185b0f811dccff829dbfac4 SHA1 dd72ffd092760fc70b5a86e7f5ccf8157e56fb98 SHA256 3f0a9cbe8722383a3563e4f9030937cec32c48636793ac8a8e9c2f6326fc60ec
 DIST rhythmbox-0.12.3.tar.bz2 4999529 RMD160 8fc030b320065578b4a0851ecd87c5753b6dce93 SHA1 f1def95f92993ade14f7b0ec2323e9d2e4aaad03 SHA256 7069442a13d94424bf1916c600c5dbb320190a9c3a03f65c4770fc96558ac305
 EBUILD rhythmbox-0.11.6-r1.ebuild 4615 RMD160 ebff53ac9f76bdca4fa9c9cdd484a1cf8f1174b2 SHA1 eac8c8362f023fea11312e2fd8ad8f9598dc9cfe SHA256 888e1faa9bc55bc49a9f013f98a548e9bad8000a57542090071e38f63ca20641
 EBUILD rhythmbox-0.12.2-r1.ebuild 4303 RMD160 2533216eafc9641cb1bc173d90c9521c2bc4fe08 SHA1 3c00a7f9cd4efe0420e45e5a0e66fa25726616ee SHA256 335c7a22b8a19ec9727aff72ba95f495e516dc3f6b200db5832ebb04da8c93d8
+EBUILD rhythmbox-0.12.3-r1.ebuild 4247 RMD160 16650ec4c214e6c188f8a8876d2f212783c8339c SHA1 b06e1c63fd94b4173d45a6d844fcf14e42081c03 SHA256 a9091494f54dda7b7986c82c4db8e54b4033069099514370f255614c04a04894
 EBUILD rhythmbox-0.12.3.ebuild 4060 RMD160 baeee381c88f595a453ebb4d18d9f5d07e88c0a6 SHA1 5ca48e3576f5f88cd6d23f1fa7a0e045d590c53a SHA256 623f5f8403b51cc8d994d80b294ae1a0641d86794bdbb8a85d1265935bbec47a
-MISC ChangeLog 22652 RMD160 455eb3f9b05d02321862829fcc89ec1865bb0111 SHA1 0c4a077a1d7a00f49bbba62537b2163a9fc0546f SHA256 a9d3c6b9b889854ebd1456abecaa278be9ccb372c31a4b0c3436672c5e74f454
+MISC ChangeLog 22855 RMD160 1cc9a2dd6436558a2ea324bf6578131c8629be36 SHA1 ad843f3b2aa13b6841ad330d08823e1c9c677d76 SHA256 2e3f69f05f8154ca6e22ef56e8df9d4dcbbae8620a6f4e134bc428ef92e5b7af
 MISC metadata.xml 419 RMD160 8b8a38779ea642d4a89cce79dc00b53c0c06676e SHA1 813dcd9fa754f027cc01ec74380e594aa1e148c6 SHA256 bd5fea9a6884f59afaecd6bb32c5f535452f65e23e82d669bf7b82b92a19da88
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkp/RQ4ACgkQ1fmVwcYIWAannQCfTGA4nuqL7HBjCbQ5tY5jLqss
+PxwAoM6Dhf4ltvkgWuW8WTrdksZQBjLs
+=Ymjo
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.12.3-lastfm.patch b/media-sound/rhythmbox/files/rhythmbox-0.12.3-lastfm.patch
new file mode 100644
index 000000000000..5a883459648d
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.12.3-lastfm.patch
@@ -0,0 +1,20 @@
+commit df34ae56b0d8e57f2415264c168f8021c656c17d
+Author: Götz Waschk <waschk@mandriva.org>
+Date:   Sat Jul 11 12:39:46 2009 +1000
+
+    last.fm: link the plugin with libsoup-gnome (bug #588248)
+
+diff --git a/plugins/audioscrobbler/Makefile.am b/plugins/audioscrobbler/Makefile.am
+index 558f509..ef063d9 100644
+--- a/plugins/audioscrobbler/Makefile.am
++++ b/plugins/audioscrobbler/Makefile.am
+@@ -18,7 +18,8 @@ libaudioscrobbler_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+ libaudioscrobbler_la_LIBTOOLFLAGS = --tag=disable-static
+ libaudioscrobbler_la_LIBADD = 				\
+ 	$(top_builddir)/corelib/librhythmbox-core.la	\
+-	$(TOTEM_PLPARSER_LIBS)
++	$(TOTEM_PLPARSER_LIBS)				\
++	$(RHYTHMBOX_LIBS)
+ 
+ INCLUDES = 						\
+         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild
new file mode 100644
index 000000000000..787a109e645f
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.3-r1.ebuild,v 1.1 2009/08/09 21:52:08 eva Exp $
+
+EAPI="2"
+WANT_AUTOMAKE="1.10"
+
+inherit eutils gnome2 python multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+brasero cdr daap doc hal ipod gnome-keyring libnotify lirc musicbrainz mtp nsplugin python test"
+
+# FIXME: double check what to do with fm-radio plugin
+
+SLOT="0"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.16
+	>=dev-libs/dbus-glib-0.71
+	>=dev-libs/totem-pl-parser-2.26.0
+	>=gnome-base/gconf-2
+	>=gnome-extra/gnome-media-2.14.0
+	>=net-libs/libsoup-2.26:2.4[gnome]
+
+	>=media-libs/gst-plugins-base-0.10.20
+
+	cdr? (
+		brasero? ( >=app-cdr/brasero-0.9.1 )
+		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
+	daap? ( >=net-dns/avahi-0.6 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
+	hal? (
+		ipod? ( >=media-libs/libgpod-0.6 )
+		mtp? ( >=media-libs/libmtp-0.3.0 )
+		>=sys-apps/hal-0.5 )
+	libnotify? ( >=x11-libs/libnotify-0.4.1 )
+	lirc? ( app-misc/lirc )
+	musicbrainz? ( media-libs/musicbrainz:3 )
+	python? (
+		>=dev-lang/python-2.4.2
+		|| (
+			>=dev-lang/python-2.5
+			dev-python/celementtree )
+		>=dev-python/pygtk-2.8
+		>=dev-python/gnome-vfs-python-2.22.0
+		>=dev-python/gconf-python-2.22.0
+		>=dev-python/libgnome-python-2.22.0
+		>=dev-python/gst-python-0.10.8 )"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-plugins/gst-plugins-soup-0.10
+	>=media-plugins/gst-plugins-libmms-0.10
+	|| (
+		>=media-plugins/gst-plugins-cdparanoia-0.10
+		>=media-plugins/gst-plugins-cdio-0.10 )
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	>=media-plugins/gst-plugins-taglib-0.10.6
+	nsplugin? ( || (
+		net-libs/xulrunner
+		www-client/seamonkey
+		www-client/mozilla-firefox ) )"
+
+# gtk-doc-am needed for eautoreconf
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	test? ( dev-libs/check )"
+
+DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+pkg_setup() {
+	if ! use hal && use ipod; then
+		ewarn "ipod support requires hal support.  Please"
+		ewarn "re-emerge with USE=hal to enable ipod support"
+	fi
+
+	if ! use hal && use mtp; then
+		ewarn "MTP support requires hal support.  Please"
+		ewarn "re-emerge with USE=hal to enable MTP support"
+	fi
+
+	if ! use cdr ; then
+		ewarn "You have cdr USE flag disabled."
+		ewarn "You will not be able to play audio CDs."
+	fi
+
+	if use brasero; then
+		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
+	else
+		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
+	fi
+
+	G2CONF="${G2CONF}
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
+		$(use_with gnome-keyring)
+		$(use_with ipod)
+		$(use_enable libnotify)
+		$(use_enable lirc)
+		$(use_enable musicbrainz)
+		$(use_with mtp)
+		$(use_enable nsplugin browser-plugin)
+		$(use_enable python)
+		$(use_enable daap)
+		$(use_with daap mdns avahi)
+		--enable-mmkeys
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--disable-static
+		--disable-vala"
+
+	export GST_INSPECT=/bin/true
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	# Fix last.fm plugin linking, bug #276972
+	epatch "${FILESDIR}/${P}-lastfm.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautomake
+}
+
+src_compile() {
+	addpredict "$(unset HOME; echo ~)/.gconf"
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	gnome2_src_compile
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "test failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use python && python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
+
+	ewarn
+	ewarn "If ${PN} doesn't play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
+}