Revbump with patch for libmtp-0.3.0 API change

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

5 files changed, 170 insertions, 15 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 71695bad30fa..a1a813cbdc0c 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.126 2008/05/29 17:20:54 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.127 2008/07/06 20:10:00 loki_val Exp $
+
+*rhythmbox-0.11.5-r1 (06 Jul 2008)
+
+  06 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/rhythmbox-0.11.5-libmtp-0.3.0-API.patch, rhythmbox-0.11.5.ebuild,
+  +rhythmbox-0.11.5-r1.ebuild:
+  Revbump with patch for libmtp-0.3.0 API change
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> rhythmbox-0.11.5.ebuild:
   python_mod_optimize is ROOT aware.
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 41e16bcf5439..dfeac25cf797 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rhythmbox-0.11.5-fix_gtk_doc.patch 1830 RMD160 361075ddba57bc39929ab872413c28a05204a486 SHA1 2387f4b566c4d4a45bab6c7b1b411e2505bbdd4c SHA256 ba65b57f0fcaade2d98411f86a43f94c4d4180499397bb04fa61a257542dcab1
+AUX rhythmbox-0.11.5-libmtp-0.3.0-API.patch 426 RMD160 f48440d266ba4209e5025c2e1525c606516db49e SHA1 9d4822b237d0434376e3f3c072ee8fb52ee11386 SHA256 3de9f0ecfbfac969a93a199da576cff4fd3d9f411ae5d2d71dfb6112f63a36b8
 DIST rhythmbox-0.10.1.tar.bz2 3408309 RMD160 b2fdfc48aba957623ca141d45e8e1291a556bbf7 SHA1 ed20d528c24c1447a2f4597f334cd74466139d2e SHA256 a303076477a9a7b6a226613a6f3b43f4641ce977357c9aa9652932dc0b9bbd16
 DIST rhythmbox-0.11.2.tar.bz2 3536270 RMD160 8fb9c756b7b36c947cde32e3a38c85cecea73a96 SHA1 139bd8dcc046533670d1c8d167d921f9c06ae7a3 SHA256 f3dbc104831688ea6dfbf3ac807200a5c4f094d13a861f932e488992a8c89ae5
 DIST rhythmbox-0.11.5.tar.bz2 4485762 RMD160 5dfbf52d26c93f990a02aa7698340a91f9234552 SHA1 ccec2523f3a6f3746bf1091558819b602f74114f SHA256 26e9fd040bcd04cf9d98bccfd43fdd4438cad9a1cbc478bdb83dd7b3c3654f35
 EBUILD rhythmbox-0.10.1-r1.ebuild 3150 RMD160 feb84a680bc82a9d36e254e1f4cba68bfd281307 SHA1 8ba1b11a4b80704cb19ca126c3d61805fec14f66 SHA256 47af87c8aaf7b5aa2a7a6570b603b0ade9846f8c4f544162650177a8b77dda49
 EBUILD rhythmbox-0.11.2-r1.ebuild 3527 RMD160 2e026c9c03bd94b28dfecce49f8d472eb84b585c SHA1 618bc799d094fcacc41500ed0d4d8ab4d79ae2b6 SHA256 cd00e0a88a0cc86100c95df398c5cadf217ff5b1588cd684ad78fe92f09b60b1
-EBUILD rhythmbox-0.11.5.ebuild 3995 RMD160 df9395a93b12cbb8df0aabcfafa1026f8116d6de SHA1 090285839648365af9faa27e086af87b3c051b5b SHA256 ca9c7f2291d9003e31acd45e179269c06d291949deef000dfe115e386cdffa98
-MISC ChangeLog 17938 RMD160 21638c5c977b82f4fb6c0798f8affa62c885e859 SHA1 89e6d4c91c4ff9b5d626dbc1de74d361b86dfcd2 SHA256 e7fc4b5b4955e48c83f5c93a05cc0ecce4c4045a90587a46cfb930d0a25a4f11
+EBUILD rhythmbox-0.11.5-r1.ebuild 4091 RMD160 0cc3adfe94a5fbb16266af50b01cba4eb7849d04 SHA1 42fc2d90405efd2c787f3222eb6bc1a6599430aa SHA256 7a396e659248e21ac4c61300f08cad0cf0b05f89b8f88472ac64ab16226f5436
+EBUILD rhythmbox-0.11.5.ebuild 4003 RMD160 830075f52ab9bd1d82962f6a7c5261b81bd8d36e SHA1 f2be5657aad88ef3dfd7f56300314fe9906d193b SHA256 3a6f2270f60984e640c03915bc706e81ca64da661a4b1ea347fa19c331b8de99
+MISC ChangeLog 18184 RMD160 659dbb1e58dcb87d05d42520812098fec7a6a102 SHA1 ccf109a5c184e4ff51430b7122a4fec08cf0e745 SHA256 e10a11f3756aacbd1bf3808b629daa25c3d2e992af0fe2b71ad86cf610478860
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg+5fcACgkQQU4yORhF8iBSlwCgypNy4BtArx/dFNjqXP1bw+bG
-F6EAnRDdH0u9cG5OS3tp+T89snaq33in
-=IyXz
------END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.11.5-libmtp-0.3.0-API.patch b/media-sound/rhythmbox/files/rhythmbox-0.11.5-libmtp-0.3.0-API.patch
new file mode 100644
index 000000000000..523c9c2e21a0
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.11.5-libmtp-0.3.0-API.patch
@@ -0,0 +1,11 @@
+--- plugins/mtpdevice/rb-mtp-source.c
++++ plugins/mtpdevice/rb-mtp-source.c
+@@ -681,7 +681,7 @@
+ 		trackmeta->filetype = mimetype_to_filetype (mimetype);
+ 	}
+ 
+-	if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL, 0) != 0) {
++	if (LIBMTP_Send_Track_From_File (device, filename, trackmeta, NULL, NULL) != 0) {
+ 		LIBMTP_destroy_track_t (trackmeta);
+ 		rb_debug ("Tracktransfer failed\n");
+ 		return NULL;
diff --git a/media-sound/rhythmbox/rhythmbox-0.11.5-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.11.5-r1.ebuild
new file mode 100644
index 000000000000..a97816b6c2a5
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.11.5-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.5-r1.ebuild,v 1.1 2008/07/06 20:10:00 loki_val Exp $
+
+EAPI="1"
+
+inherit gnome2 eutils python autotools
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="daap dbus doc hal ipod gnome-keyring libnotify lirc musicbrainz mtp python tagwriting"
+
+# I want tagwriting to be on by default in the future. It is just a local flag
+# now because it is still considered experimental by upstream and doesn't work
+# well with all formats due to gstreamer limitation.
+
+# FIXME: double check what to do with fm-radio plugin an itunes browser
+
+SLOT="0"
+
+RDEPEND=">=x11-libs/gtk+-2.8
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-vfs-2.8
+	>=dev-libs/totem-pl-parser-2.21.4
+	>=gnome-extra/nautilus-cd-burner-2.13
+	>=x11-libs/libsexy-0.1.5
+	>=gnome-extra/gnome-media-2.14.0
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
+	musicbrainz? ( >=media-libs/musicbrainz-2.1:1 )
+	>=net-libs/libsoup-2.4:2.4
+	lirc? ( app-misc/lirc )
+	hal? (
+		ipod? ( >=media-libs/libgpod-0.4 )
+		mtp? ( >=media-libs/libmtp-0.3.0 )
+		>=sys-apps/hal-0.5
+	)
+	daap? ( >=net-dns/avahi-0.6 )
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	>=media-libs/gst-plugins-base-0.10.12
+	>=media-plugins/gst-plugins-gnomevfs-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
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	tagwriting? ( >=media-plugins/gst-plugins-taglib-0.10.6 )
+	python? (
+		>=dev-lang/python-2.4.2
+		>=dev-python/pygtk-2.8
+		>=dev-python/gnome-python-2.12
+		>=dev-python/gst-python-0.10.8
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+	  MAINTAINERS NEWS README README.iPod THANKS TODO"
+
+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 daap ; then
+		G2CONF="${G2CONF} --enable-daap --with-mdns=avahi"
+	else
+		G2CONF="${G2CONF} --disable-daap"
+	fi
+
+	G2CONF="${G2CONF}
+		$(use_enable tagwriting tag-writing)
+		$(use_with ipod)
+		$(use_enable ipod ipod-writing)
+		$(use_enable musicbrainz)
+		$(use_with dbus)
+		$(use_enable python)
+		$(use_enable libnotify)
+		$(use_enable lirc)
+		$(use_with gnome-keyring)
+		--with-playback=gstreamer-0-10
+		--with-cd-burning
+		--enable-mmkeys
+		--enable-audioscrobbler
+		--enable-track-transfer
+		--with-metadata-helper
+		--disable-scrollkeeper
+		--disable-schemas-install"
+
+	export GST_INSPECT=/bin/true
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# backport from svn HEAD, 0.11.6 shouldn't need it
+	epatch "${FILESDIR}/${PN}-0.11.5-fix_gtk_doc.patch"
+	#Fix for libmtp-0.3.0 API change
+	epatch "${FILESDIR}/${P}-libmtp-0.3.0-API.patch"
+	eautomake
+
+	# 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
+}
+
+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
+
+	elog "The aac flag has been removed from rhythmbox."
+	elog "This is due to stabilization issues with any gst-bad plugins."
+	elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files"
+	elog "See bug #159538 for more information"
+}
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
+}
diff --git a/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild b/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild
index 202e41c87b03..798d8c765cf0 100644
--- a/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild,v 1.8 2008/05/29 17:20:54 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild,v 1.9 2008/07/06 20:10:00 loki_val Exp $
 
 EAPI="1"
 
@@ -34,7 +34,7 @@ RDEPEND=">=x11-libs/gtk+-2.8
 	lirc? ( app-misc/lirc )
 	hal? (
 		ipod? ( >=media-libs/libgpod-0.4 )
-		mtp? ( media-libs/libmtp )
+		mtp? ( <media-libs/libmtp-0.3.0 )
 		>=sys-apps/hal-0.5
 	)
 	daap? ( >=net-dns/avahi-0.6 )