Version bump, bug #341677. Enhanced multiple python support, bug #313971.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 217 insertions, 3 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index e9ae853a374c..635538191702 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.199 2011/03/23 08:36:39 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.200 2011/03/23 23:01:56 eva Exp $
+
+*rhythmbox-0.13.3 (23 Mar 2011)
+
+  23 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> +rhythmbox-0.13.3.ebuild,
+  metadata.xml:
+  Version bump, bug #341677. Enhanced multiple python support, bug #313971.
 
   23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   rhythmbox-0.12.8-r1.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 9489b940ff39..d588edf77889 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.12-python-initialization.patch 5167 RMD160 cacae6274841d595a0d55ed92c42815793081176 SHA1 0b306455b027f8f9c73e185acdbbb1d041ce882d SHA256 54f3f492d4c3204b93a1fed3886ca76aa42d36737e66c6424426fc0116b25d3e
 AUX rhythmbox-0.12.8-libnotify-0.7.patch 1156 RMD160 78ce782ffc424eefbe9fc59cb94e245714377c61 SHA1 cef431a34f3e82d3475229b3111ca234af8aee7d SHA256 39b66a3b8e439f0e0dbde63a1d7f5472c262f344db1334b24591e18be22fb46d
 AUX rhythmbox-0.12.8-namespace-conflict.patch 2155 RMD160 2ed6fe3966c860845d0d12ca3e8023c78d7e1bdb SHA1 6e67ba7802d6dc1ff4131942d9aa1af91dec2586 SHA256 538b36af3824aa45b215b247d586c872ff1ee6cb174b8764e22a11410fd3a204
 DIST rhythmbox-0.12.8.tar.bz2 5358950 RMD160 072d4fa06408ebc181b40147db1575d0ef4c99fe SHA1 5d27923cc29b81d7bfbc73d867d7976a5295f964 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
+DIST rhythmbox-0.13.3.tar.bz2 9978135 RMD160 f6f155768ce9c87d844ee47f7f1cc4f167d05052 SHA1 1c6e83972dcd7de8fc1a71586843e29092a0c706 SHA256 ad6532864bb4df30f1014ec81ddc0d2d3f69241235627f46abe5578cf629052a
 EBUILD rhythmbox-0.12.8-r1.ebuild 5320 RMD160 163e93a6c72e6c8987e64ec25e7f0d2c7b471054 SHA1 26ce9fdade1676cd8f709a499d76b27594a7e05a SHA256 46c6558a25b0c34ebb46aa81d273df044129e735445bf4bbe2703cb03179b3c3
-MISC ChangeLog 30776 RMD160 4b504c3cf47de8dcf149a80cccf6be175e38fab0 SHA1 9d4e92ef2a34db1e42d4b77a8c7ebfd58baf96e5 SHA256 76480781f95dd4698d323c4f6cc50ea009fade22f150f122748666921ad20ff1
-MISC metadata.xml 425 RMD160 b81f7b8eb1619ae13cf065b5bf3a29f0b96de480 SHA1 0a82e2b9cd12632b75d7a5f55769837afe91cf13 SHA256 1c78b5e78d8d15023abe80d8eb4fec792723c5b7c1845abdb03fb20259ece4d4
+EBUILD rhythmbox-0.13.3.ebuild 5125 RMD160 896be48595a18fa09ca38f428b81aa98633f4d69 SHA1 3ec5165cde1f6e53e38fb87c10a344f49f441800 SHA256 d0fb577ca30857ff568b49791bf116b1c07691d963cc5bd0c24fe6c9ead60d2c
+MISC ChangeLog 30977 RMD160 3b9106411883da742b9bd261b373a027d1dc3591 SHA1 e74e1ba85a64339fe16f0d72786d04e578b7feac SHA256 1b7bef616654c967495ad9360d92714875d2a5a5f174d0934bd26b4b71ad4a8b
+MISC metadata.xml 493 RMD160 99d7c84f2cb44d34d07dbdbc9666531ca7d081ef SHA1 e014344c61ed45fd609943fec4097f3861bcebec SHA256 1fece30d8969d46bfa5a547efda6d08b53017ad2475729fc8e7b8ee25621dc0f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2Ke+sACgkQ1fmVwcYIWAYIEACeOLmi/K3B2hPLO7vDTnv+RM6K
+wEEAoOkZLAb9hOy5QWMhD+bsr2QSyn+8
+=CL+P
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index 90289f7d742d..637b5c91fefc 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -5,6 +5,7 @@
   <herd>gstreamer</herd>
   <use>
   	<flag name="daap">Enable support for local network music sharing via daap</flag>
+  	<flag name="lastfm">Enable support for Last.fm scrobbling</flag>
 	<flag name="upnp">Enable support for local network music sharing via upnp</flag>
 	<flag name="webkit">Enable context panel plugin.</flag>
   </use>
diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
new file mode 100644
index 000000000000..391bdf9a32a9
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.1 2011/03/23 23:01:56 eva Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.4"
+
+inherit eutils gnome2 python multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdr daap doc gnome-keyring hal ipod +lastfm libnotify lirc musicbrainz mtp nsplugin python test udev upnp webkit"
+
+# FIXME: double check what to do with fm-radio plugin
+# TODO: watchout for udev use flag changes
+COMMON_DEPEND=">=dev-libs/glib-2.26:2
+	dev-libs/libxml2
+	>=x11-libs/gtk+-2.20:2
+	>=dev-libs/dbus-glib-0.71
+	>=dev-libs/totem-pl-parser-2.32.1
+	>=gnome-base/gconf-2
+	>=gnome-extra/gnome-media-2.14
+	>=net-libs/libsoup-2.26:2.4
+	>=net-libs/libsoup-gnome-2.26:2.4
+
+	>=media-libs/gst-plugins-base-0.10.20
+	|| (
+		>=media-libs/gst-plugins-base-0.10.24
+		>=media-libs/gst-plugins-bad-0.10.6 )
+
+	app-misc/media-player-info
+
+	cdr? ( >=app-cdr/brasero-0.9.1 )
+	daap? (
+		>=net-libs/libdmapsharing-2.1.6:2.2
+		>=net-dns/avahi-0.6 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
+	udev? (
+		ipod? ( >=media-libs/libgpod-0.7.92 )
+		mtp? ( >=media-libs/libmtp-0.3 )
+		>=sys-fs/udev-145[extras] )
+	hal? (
+		ipod? ( >=media-libs/libgpod-0.6 )
+		mtp? ( >=media-libs/libmtp-0.3 )
+		>=sys-apps/hal-0.5 )
+	lastfm? ( dev-libs/json-glib )
+	libnotify? ( >=x11-libs/libnotify-0.4.1 )
+	lirc? ( app-misc/lirc )
+	musicbrainz? ( media-libs/musicbrainz:3 )
+	python? (
+		|| (
+			>=dev-lang/python-2.5
+			dev-python/celementtree )
+		>=dev-python/pygtk-2.8:2
+		>=dev-python/pygobject-2.15.4:2
+		>=dev-python/gconf-python-2.22
+		>=dev-python/libgnome-python-2.22
+		>=dev-python/gnome-keyring-python-2.22
+		>=dev-python/gst-python-0.10.8
+		webkit? (
+			dev-python/mako
+			dev-python/pywebkitgtk )
+		upnp? ( media-video/coherence )
+	)
+	webkit? ( >=net-libs/webkit-gtk-1.1.7:2 )
+"
+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 )
+"
+# gtk-doc-am needed for eautoreconf
+#	dev-util/gtk-doc-am
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.40
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.9.1
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	test? ( dev-libs/check )"
+
+DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+pkg_setup() {
+	python_set_active_version 2
+	G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
+
+	if ! use hal && ! use udev; then
+		if use ipod; then
+			ewarn "ipod support requires hal or udev support.  Please"
+			ewarn "re-emerge with USE=udev to enable ipod support"
+			G2CONF="${G2CONF} --without-ipod"
+		fi
+
+		if use mtp; then
+			ewarn "MTP support requires hal or udev support.  Please"
+			ewarn "re-emerge with USE=udev to enable MTP support"
+			G2CONF="${G2CONF} --without-mtp"
+		fi
+	else
+		G2CONF="${G2CONF} $(use_with ipod) $(use_with mtp)"
+	fi
+
+	if use hal && use udev; then
+		einfo "udev support replaces hal support completely. You can disable"
+		einfo "hal on this package via /etc/portage/package.use."
+	fi
+
+	if ! use cdr ; then
+		ewarn "You have cdr USE flag disabled."
+		ewarn "You will not be able to burn CDs."
+	else
+		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
+	fi
+
+	if ! use python; then
+		if use upnp; then
+			ewarn "You need python support in addition to upnp"
+		fi
+	fi
+
+	G2CONF="${G2CONF}
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
+		GST_INSPECT=$(type -P true)
+		$(use_with gnome-keyring)
+		$(use_with udev gudev)
+		$(use_with hal)
+		$(use_enable lastfm)
+		$(use_enable libnotify)
+		$(use_enable lirc)
+		$(use_enable musicbrainz)
+		$(use_enable nsplugin browser-plugin)
+		$(use_enable python)
+		$(use_enable daap)
+		$(use_with daap mdns avahi)
+		$(use_with webkit)
+		--enable-mmkeys
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--disable-static
+		--disable-vala
+		--disable-more-warnings"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+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"
+}
+
+src_install() {
+	gnome2_src_install
+
+	find "${ED}/usr/$(get_libdir)/rhythmbox/plugins" -name "*.la" -delete \
+		|| die "failed to remove *.la files"
+}
+
+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
+}