Bump to 2.97. Last.fm plugin is now always built because the dependency is not optional any more.

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

3 files changed, 18 insertions, 33 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 678ad9a8cfa3..aef545bd520f 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,13 @@
 # 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.219 2012/06/04 06:23:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.220 2012/07/02 00:39:39 nirbheek Exp $
+
+*rhythmbox-2.97 (02 Jul 2012)
+
+  02 Jul 2012; Nirbheek Chauhan <nirbheek@gentoo.org> +rhythmbox-2.97.ebuild,
+  -rhythmbox-2.95.ebuild:
+  Bump to 2.97. Last.fm plugin is now always built because the dependency is not
+  optional any more.
 
   04 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   rhythmbox-2.95.ebuild, rhythmbox-2.96.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 6394f0ab5a0e..6f3b897304de 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,6 +1,3 @@
------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
@@ -9,22 +6,11 @@ AUX rhythmbox-2.95-port-im-status-plugin.patch 9115 RMD160 44f2a3b175ca5628ab2ad
 AUX rhythmbox-2.95-port-rb-set-rating-py-example.patch 1462 RMD160 34c384869d478efca80c9e8c8b6ff3be704c3e48 SHA1 9a630bd8bf047a14d61f08f9884ee6fa01a7a2c4 SHA256 044727d28e8552e019be9fa9fa11462a833dd2cd4485e7319cc4afbd9dbe902f
 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
+DIST rhythmbox-2.97.tar.xz 6027128 RMD160 e99da13b0ffd51805ce33d8638177e820323e16a SHA1 307d038795f296fd97aac9579ee0f9d1362f0a27 SHA256 b52567cf45bf13c0452593da7f907920bd4cf31916ca8dcd15d555336b4947e4
 EBUILD rhythmbox-0.12.8-r1.ebuild 5173 RMD160 cc8569a89ae6ea8cb75daaf9af2ee8b66b56ea33 SHA1 f031d4773eb952b45583b43d4c3762c21446ba76 SHA256 126e513bf9247aab4d26254b13613a0aaf2be0dd3a4a5b964c752f9465b2a766
 EBUILD rhythmbox-0.13.3.ebuild 4911 RMD160 c36b3cc841b770b3c9415ff07923e5365e840bc2 SHA1 13de11d5f35e7991269c759fadbe7422a9ec6c68 SHA256 b36f54c2cbbfab032a6442cb997e8d47884168d3c7bce3c458dfd966c83eb89a
-EBUILD rhythmbox-2.95.ebuild 5004 RMD160 49e44a26f77a4c87afcdf1cfd46c4b521e96347d SHA1 8fb8399cd64b86aa2e4ca616c863a155adbbdcd5 SHA256 69299651fbb9c95a5484950ed42d63a4b7b1c859727ccc4f46a42c9f768eacdd
 EBUILD rhythmbox-2.96.ebuild 4720 RMD160 2fbf5e4892d91ccf411b29fe2202266def39fcb0 SHA1 0dccdfae20b490a336906e3632ee299b91531f0a SHA256 1441a0274aaa69a0ddeb4f1b193b27b90d171619b8dc7920126c78bb4602e958
-MISC ChangeLog 34285 RMD160 7f4384fc09e739a91a4843a8bf192850fd1395b8 SHA1 e0f5d74125f75323e7a47335b401ecf5d65fe5e5 SHA256 f0efd1a14a041088da6aa0963ce4abc6e330a249c34272f81ddd359c41997aba
+EBUILD rhythmbox-2.97.ebuild 4739 RMD160 9d5a661cf6047bb5d70e971abbe60874187e9fe6 SHA1 9befddad2a718550862ee48834ad5f3573844796 SHA256 9536b05517a120c0b1c04b64a23d3a57e1d831bde93de4f9a26af1c5d200a5f7
+MISC ChangeLog 34522 RMD160 9352dedc6f2dd3c0d1bf183220c8f2f8e30ea35b SHA1 be1d3c39c170baefbae65fd48cbca63c32ac5810 SHA256 85b8560b77b38010dc6d532463828e8bf589e8b2f9ee879c39cb6173ad353ba5
 MISC metadata.xml 1324 RMD160 7396d8076536fd1a70efc960fc39bc8eb0741f5f SHA1 1cf2d5f99db2afce99403aafece0be98084b2319 SHA256 06afed13c619ece978a8bafb5b9b9e9aec24afd49f1d1ae7b92bdcfaa2d931a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPzFRhAAoJEJ0WA1zPCt1hLRcH/RUX/U7R5/WFCaXBNq7xb4xS
-3/sR+rnOOVCC84W4BZQSMUkMpQl2vuVfRiGx9/splwep9ApNeb8ensS3K9yWMl0g
-x7ontQvPgX8Qr0XeMPVsMZFgQcks6H7Hu0kCCanIQZxasfeLHhow1WfpxgcLlTNu
-6WOyNZ4uoQs5tWJuewvB1j4AXA5yhvrioaBfIFsFGGkwxcCYFH0ss43Y8WPzjX0S
-yxV0arMd6oA55U7ysA7i2RFud8a+iJYsA2AbQ3RYtBxeDXdyptKLdj3FyrMYkR8D
-rA+lpODhp3Fmoar84Z/ki0iApO0RUBiS5iCGs7iI4xJCSlHCsd38tzWy+rKpkrk=
-=PXpb
------END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/rhythmbox-2.95.ebuild b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
index 56e4951569af..b21ff784b33f 100644
--- a/media-sound/rhythmbox/rhythmbox-2.95.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
@@ -1,6 +1,6 @@
 # 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.95.ebuild,v 1.6 2012/06/04 06:23:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.1 2012/07/02 00:39:39 nirbheek Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.rhythmbox.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cdr clutter daap dbus doc gnome-keyring html ipod +lastfm libnotify lirc
+IUSE="cdr clutter daap dbus doc gnome-keyring html ipod libnotify lirc
 musicbrainz mtp nsplugin +python test +udev upnp webkit zeitgeist"
 # vala
 KEYWORDS="~amd64 ~x86"
@@ -29,8 +29,8 @@ REQUIRED_USE="
 
 # 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
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
+	>=dev-libs/libxml2-2.7.8:2
 	>=x11-libs/gtk+-3.2:3[introspection]
 	>=x11-libs/gdk-pixbuf-2.18.0:2
 	>=dev-libs/gobject-introspection-0.10.0
@@ -41,6 +41,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection]
 	>=media-libs/gstreamer-0.10.32:0.10[introspection]
 	>=sys-libs/tdb-1.2.6
+	dev-libs/json-glib
 
 	clutter? (
 		>=media-libs/clutter-1.2:1.0
@@ -53,11 +54,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 		>=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
+		|| ( >=media-libs/musicbrainz-4.0.0:4
+		     >=media-libs/musicbrainz-3.0.2:3 )
 		gnome-base/gconf:2 )
 	python? ( dev-python/pygobject:3 )
 	udev? (
@@ -125,7 +126,6 @@ pkg_setup() {
 		--without-hal
 		$(use_enable clutter visualizer)
 		$(use_enable daap)
-		$(use_enable lastfm)
 		$(use_enable libnotify)
 		$(use_enable lirc)
 		$(use_enable musicbrainz)
@@ -145,14 +145,6 @@ pkg_setup() {
 
 src_prepare() {
 	gnome2_src_prepare
-
-	# Not needed for next release
-	# https://bugzilla.gnome.org/show_bug.cgi?id=667980
-	epatch "${FILESDIR}/${P}-port-im-status-plugin.patch"
-	epatch "${FILESDIR}/${P}-port-rb-set-rating-py-example.patch"
-	epatch "${FILESDIR}/${P}-fix-db-dbus-interface.patch"
-
-	# Disable pyc compiling
 	echo > py-compile
 }