Bump to 2.96, remove old later

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

3 files changed, 197 insertions, 7 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 2d403fcc4f4f..fea4b55d25a2 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.215 2012/02/14 04:31:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.216 2012/03/29 21:21:22 nirbheek Exp $
+
+*rhythmbox-2.96 (29 Mar 2012)
+
+  29 Mar 2012; Nirbheek Chauhan <nirbheek@gentoo.org> +rhythmbox-2.96.ebuild:
+  Bump to 2.96, remove old later
 
   14 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   rhythmbox-2.95.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 0f406f53fec4..0f21a21d8e6c 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
@@ -10,15 +10,27 @@ AUX rhythmbox-2.95-port-rb-set-rating-py-example.patch 1462 RMD160 34c384869d478
 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
 DIST rhythmbox-2.95.tar.xz 5942124 RMD160 aeaba12c053ec10dd2247704df4badc2a67d9fc5 SHA1 2730e58c970ed9dae8806243ce6a1a1b3651750b SHA256 12cab95c89514b5c01a2daf9d6bdf74c8652b35e49625e2906d51b487bc68c06
+DIST rhythmbox-2.96.tar.xz 5984192 RMD160 d20be5971759b85f8e178ebd707a38b350cf1b0e SHA1 24a5b52693aa29e1e375d039f086a37352f46648 SHA256 3f93c74b2f7f8d7e1002e288db9abf8f182684277dec0a106d5e38415084b2b6
 EBUILD rhythmbox-0.12.8-r1.ebuild 5207 RMD160 9b1cf39c9791295d135d94d16bf3cae958ba4b59 SHA1 d0600c5bb814e39607b994f27af6782bc9757337 SHA256 80a7bc71e8ee746b7eaa4e8ff1b8ba49c1ae9e50330eb73b53cb78e37176846d
 EBUILD rhythmbox-0.13.3.ebuild 4947 RMD160 26f74f4654fa4e7728a7fc88babc914d41b91a4b SHA1 0fdfe5f3b93cc7b3c41a370719878507c5a5003d SHA256 6b2ef443536e6dc9fa05022498cd33ea630f0f597c7b16d88779119235c25fc4
 EBUILD rhythmbox-2.95.ebuild 4990 RMD160 5461aaeec29427a7b5dce70503ecda2fb3738766 SHA1 bdc98b1aa284a1b12a7a8684f8bf8351359e8227 SHA256 0f94f25204f329776585933120de4ffc6227c34e69ccd54b6ce85b1fc4842e6f
-MISC ChangeLog 33478 RMD160 8558bdf53b40ae4e608b9cafecec6b943eb9d3db SHA1 fe6d8c19c520942486953ebf8b3285a039033def SHA256 0190d4bb39f57d20c9fe404129653d00c5555281e6420c1fa775d121e0bbf408
+EBUILD rhythmbox-2.96.ebuild 4705 RMD160 fcd5b17d3f67bf6cb8f4d9c0752c5a151ab10d2f SHA1 0b8630f1def09d0c9584e70069d4e21a444e813b SHA256 5a4cc3c519d93171d2424c6eda76ac854306907bdfc12e0022bbbb6b98a527fe
+MISC ChangeLog 33620 RMD160 9b35cf0f18344205741699dda1a34259d8c69426 SHA1 b7ccf0359e7ce039fe2247812c7d3c68f110427f SHA256 89e4e83921b03e679d8893723d4f873cdf37d0f3ed77a2a2200c368908be870f
 MISC metadata.xml 1324 RMD160 7396d8076536fd1a70efc960fc39bc8eb0741f5f SHA1 1cf2d5f99db2afce99403aafece0be98084b2319 SHA256 06afed13c619ece978a8bafb5b9b9e9aec24afd49f1d1ae7b92bdcfaa2d931a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8546cACgkQdjK8w9WeBnAdQQD/W/0I0KyTxOw2y2hx9ixHqPI/
-sKJvwKWVzQtuOU2s7ZkBAKkwgCoyBuB3Mb+5YWiv8NLqLm2zP6oH0IjHXZaEnX2a
-=WRh/
+iQIcBAEBAgAGBQJPdNJcAAoJEO/kOhxWD91kTQQP/jkmxNUsndUPVTZUTC43BfsL
+Jo2II1raZSf+FtapOGbtJ/2jpFke1hPMFjGZrjjnjJRad5dw0tvQHCgYpZF6MuZ9
+/bS05xWniSxM+Kv2+FZpkyP4xzUNK0TnkSOHJfg1cav3M/UwjFV14luAnQ59QCCf
+FE1mJ44RTXkq8QjzUGYbA3DeFFI4op9gYtf2F+aPaC8NcGVw72twQEyPotcMRpmG
+13y+HP2RvQ3ouZ+W7fxHY24P/7RXMN0E0C4PCPnL2BMUC4cSdLOLHZWTsNvJ9eWq
+0/U/qleVEdq8ILna0hu/7yoxhK/XVm8QnDYljLQTu/LZVV37Dt0pzpy5c2p9qciO
+bFdtIRe99V990EZrNnbgVSWYNN6hsUUwclA7KNF66dC0Ppl38jouOvHh+EdhL7Dx
+fudoqVsOdIwK32a7eI+PRdiUUAKTw1Rb6tR29dRUybEAhhcEZfcJZqTdxT+vftNP
+TQyoefqo6AWqpy8ZdI97dIWpU9fmhceRurE7KMR9YUsT0jiw+RDuZKPW5zoWP1Is
+XmngApAoGZtIzX7OeyCJpNi3pFQn7uZ7eCqnVASigxKtd7FM7cXCsQoou5JBw22r
+m2TPcEMhM3WP15ct343K/yrJzJMNHoWlcQ48nKsR4ttP31w5iaBP1PT1TwGdLXmv
+Ku0rE86KdVwFBArZSFzU
+=orES
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/rhythmbox-2.96.ebuild b/media-sound/rhythmbox/rhythmbox-2.96.ebuild
new file mode 100644
index 000000000000..896fdb99e29a
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-2.96.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.96.ebuild,v 1.1 2012/03/29 21:21:22 nirbheek Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="python? 2:2.5"
+PYTHON_USE_WITH="xml"
+PYTHON_USE_WITH_OPT="python"
+
+inherit eutils gnome2 python multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc
+musicbrainz mtp nsplugin +python test +udev upnp webkit zeitgeist"
+# vala
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	gnome-keyring? ( python )
+	webkit? ( python )"
+
+# FIXME: double check what to do with fm-radio plugin
+# NOTE: gst-python is still needed because gstreamer introspection is incomplete
+COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
+	dev-libs/libxml2:2
+	>=x11-libs/gtk+-3.2:3[introspection]
+	>=x11-libs/gdk-pixbuf-2.18.0:2
+	>=dev-libs/gobject-introspection-0.10.0
+	>=dev-libs/libpeas-0.7.3[gtk,python?]
+	>=dev-libs/totem-pl-parser-2.32.1
+	>=net-libs/libsoup-2.26:2.4
+	>=net-libs/libsoup-gnome-2.26:2.4
+	>=media-libs/gst-plugins-base-0.10.32:0.10
+	>=media-libs/gstreamer-0.10.32:0.10[introspection]
+	>=sys-libs/tdb-1.2.6
+
+	clutter? (
+		>=media-libs/clutter-1.2:1.0
+		>=media-libs/clutter-gst-1.0:1.0
+		>=media-libs/clutter-gtk-1.0:1.0
+		>=x11-libs/mx-1.0.1:1.0 )
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.11:3.0
+		>=net-dns/avahi-0.6 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
+	html? ( >=net-libs/webkit-gtk-1.3.9:3 )
+	lastfm? ( dev-libs/json-glib )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	musicbrainz? (
+		media-libs/musicbrainz:3
+		gnome-base/gconf:2 )
+	python? ( dev-python/pygobject:3 )
+	udev? (
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 )
+		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
+	zeitgeist? ( gnome-extra/zeitgeist )
+"
+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
+	x11-themes/gnome-icon-theme-symbolic
+	upnp? (
+		>=media-libs/grilo-0.1.17
+		>=media-plugins/grilo-plugins-0.1.17[upnp] )
+	python? (
+		>=dev-python/gst-python-0.10.8
+
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( dev-python/gnome-keyring-python )
+		webkit? (
+			dev-python/mako
+			>=net-libs/webkit-gtk-1.3.9:3[introspection] ) )
+"
+# gtk-doc-am needed for eautoreconf
+#	dev-util/gtk-doc-am
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.9.1
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	test? ( dev-libs/check )"
+#	vala? ( >=dev-lang/vala-0.9.4:0.12 )
+DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+		G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
+	fi
+
+	# --enable-vala just installs the sample vala plugin, and the configure
+	# checks are broken, so don't enable it
+	G2CONF="${G2CONF}
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
+		VALAC=$(type -P valac-0.14)
+		--enable-mmkeys
+		--disable-more-warnings
+		--disable-scrollkeeper
+		--disable-schemas-compile
+		--disable-static
+		--disable-vala
+		--without-hal
+		$(use_enable clutter visualizer)
+		$(use_enable daap)
+		$(use_enable lastfm)
+		$(use_enable libnotify)
+		$(use_enable lirc)
+		$(use_enable musicbrainz)
+		$(use_enable nsplugin browser-plugin)
+		$(use_enable python)
+		$(use_enable upnp grilo)
+		$(use_with cdr brasero)
+		$(use_with daap mdns avahi)
+		$(use_with gnome-keyring)
+		$(use_with html webkit)
+		$(use_with ipod)
+		$(use_with mtp)
+		$(use_with udev gudev)"
+
+	export GST_INSPECT=/bin/true
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	echo > py-compile
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "test failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
+	fi
+
+	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
+}