Fix metadata not being written to disk. http://bugzilla.gnome.org/563283. Author is thansen@freenode.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc6 x86_64

4 files changed, 152 insertions, 2 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 44e3f8f4e7c4..27b0b7425181 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.73 2008/11/23 16:03:12 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.74 2008/12/05 23:26:40 loki_val Exp $
+
+*banshee-1.4.1-r1 (05 Dec 2008)
+
+  05 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/banshee-1.4.1-metadata-writefail.patch, +banshee-1.4.1-r1.ebuild:
+  Fix metadata not being written to disk. http://bugzilla.gnome.org/563283.
+  Author is thansen@freenode.
 
   23 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> banshee-1.4.1.ebuild:
   Add notice about a theme having to be selected for the user running
diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest
index 8bcaa61b67ba..5a17729861e1 100644
--- a/media-sound/banshee/Manifest
+++ b/media-sound/banshee/Manifest
@@ -1,6 +1,7 @@
 AUX banshee-1.0.0-notification-icon.patch 1388 RMD160 dccac57924fad30d2b02ff4ce80b39754c77b900 SHA1 8c3d2bed53a0bc9b586dc5b0cd7b1913ccfda99d SHA256 48b9bc53bc33c0e582bd2f93d88d09bf79ffbef18d27870d08a733cf45429a08
 AUX banshee-1.2.1-libmtp-0.3.0-API.patch 4166 RMD160 349747a7780fa23d8dd5ae8bc7ea77935664a49c SHA1 4f7475bef777a1f49c6d5840f9e31f9711ed03ac SHA256 d54d2ece34c72f0a3ed178c819b5f95df37b9e248fd4f384b9f769095d407a7a
 AUX banshee-1.2.1-notification-crash.patch 1096 RMD160 fa6debffc2aafcc58ddfc5ce5497ac40e04e9f13 SHA1 667e6cd02d556ac320785420cdc4482d6c57b2da SHA256 38d22284dc037138839991d46bf565591f8de05e3cbc6f5dd820d42e60ebef43
+AUX banshee-1.4.1-metadata-writefail.patch 2185 RMD160 095f861804367ee1d073c75c77b85e604db71a15 SHA1 83db1dbea10ad6021ed7cdbcc8f9773bf548ed0e SHA256 88336cff6bc4da3b0661af4f519a9b4ebaf691b57adeeb4fc8d2c9034d13eed8
 DIST banshee-0.12.1.tar.gz 3081707 RMD160 87b826cb306e57e08adf35d37fab5b3196d85686 SHA1 578077486d23368998f1e31a237db427f0968d37 SHA256 1d858b3c83d233790f62bc35440e900bcebf40964ad1aba9eae4cc017da74ed7
 DIST banshee-0.13.1.tar.gz 2999635 RMD160 fdefaeeb3e66bf6073e081e364270dcf912ebf6c SHA1 e39358c04ea38505ec626c4fef66312edd176c6a SHA256 ea095023f8c3f731aef3f96653e53c9dad6622f1113a2347aa10ebb269351a19
 DIST banshee-1-1.0.0.tar.bz2 1993777 RMD160 8148af02fc421b4d9f6716f96f65f10c4346876b SHA1 8467e114d6857cc1f37b3364cbde9618a2067e30 SHA256 0df0d12187752a27fa64037595491710e26be17e9ea87a73f751b8b686394012
@@ -11,6 +12,7 @@ EBUILD banshee-0.13.1.ebuild 2995 RMD160 ea90307f7745259bdb12b22dae8d428de7cba7b
 EBUILD banshee-1.0.0-r1.ebuild 2202 RMD160 fcaaa6d71fd03c43569c1cb2953836d9b444da5f SHA1 05b90c39aabc619e7b9833fc018d9b724a951db0 SHA256 69ccfb5570b7200dd7bd08a24efee1b91920ba4a71910356b1a6d257e77ffc86
 EBUILD banshee-1.2.1-r2.ebuild 2335 RMD160 8667fba2eecedcc96ab6c266ad74f9e2751ccda5 SHA1 39451794dc0bb1de88b28d8767bbe1dba26c9df5 SHA256 f00da028931c3156b395efc087a490f2abdea1a32f753d5ff477356a0705fb0a
 EBUILD banshee-1.2.1.ebuild 2210 RMD160 34b20e9e66f736db60934a712545ee9bba3203da SHA1 100317bfad927a9279a5da868923f0c196669889 SHA256 8a13cc436483124f120fe137b2fd2107521e466189340f3ea3cfa66cc106b591
+EBUILD banshee-1.4.1-r1.ebuild 2521 RMD160 73647c4057e55b4241df5042a1db502a21ca92d4 SHA1 5774a46de7857dc611a4b10800c85cf5187633a7 SHA256 4496fa1402643edae06c2c4af833655c447c0a791c864949cac06bed044a99b7
 EBUILD banshee-1.4.1.ebuild 2410 RMD160 216f150f3cb87c8171e01d4122a85ca490038f47 SHA1 19b024a1aede02fc7b15f5419290e3086764afe8 SHA256 08ae650be4b5a029a8e0e0cf22b1a0af763f65d05292d088187c145f60f42a45
-MISC ChangeLog 13403 RMD160 8272dfccebf66f3a03b6a8aba3bfcaaec78a4dd4 SHA1 c848aabeb6839d09df0c0a0e513cfc3bb7362139 SHA256 81d84c19dc34c2dfb325337a86229206f3d388246a34f508dc1cb0ab168249d0
+MISC ChangeLog 13671 RMD160 d5d8e55235fb9735288ad86dbbc5e876dd234291 SHA1 2f4bfeeb91b3921e2dd2ad361a32bb4361ccc1f6 SHA256 dffd3299d1bc1b2f48e2a279b094391c8f2f02ea914276b8b42c5114a7e38587
 MISC metadata.xml 499 RMD160 58c90a5fa64f948def14ea188bd7815294e36f35 SHA1 5d463e6bbad5600e2fb46e20dd35be871bcb48a8 SHA256 77f493966e62f6e00073371783c5234cee51f5a4462571c8214c6e301860cd5a
diff --git a/media-sound/banshee/banshee-1.4.1-r1.ebuild b/media-sound/banshee/banshee-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..4120e63f6d8e
--- /dev/null
+++ b/media-sound/banshee/banshee-1.4.1-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-1.4.1-r1.ebuild,v 1.1 2008/12/05 23:26:40 loki_val Exp $
+
+EAPI=1
+
+inherit base gnome2 mono autotools
+
+GVER=0.10.3
+
+DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
+HOMEPAGE="http://banshee-project.org"
+SRC_URI="http://download.banshee-project.org/${PN}/${PN}-1-${PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aac +boo daap doc +encode +flac ipod +mad mtp +podcast test +vorbis"
+
+RDEPEND=">=dev-lang/mono-2
+	>=dev-dotnet/gtk-sharp-2.12
+	>=dev-dotnet/gconf-sharp-2.8
+	>=dev-dotnet/gnome-sharp-2.8
+	>=media-libs/gst-plugins-bad-${GVER}
+	>=media-libs/gst-plugins-good-${GVER}
+	>=media-libs/gst-plugins-ugly-${GVER}
+	>=media-plugins/gst-plugins-alsa-${GVER}
+	>=media-plugins/gst-plugins-gnomevfs-${GVER}
+	>=media-plugins/gst-plugins-gconf-${GVER}
+	|| (
+		>=media-plugins/gst-plugins-cdparanoia-${GVER}
+		>=media-plugins/gst-plugins-cdio-${GVER}
+	)
+	media-libs/musicbrainz:1
+	>=dev-dotnet/dbus-glib-sharp-0.3
+	>=dev-dotnet/dbus-sharp-0.5
+	>=dev-dotnet/mono-addins-0.3.1
+	>=dev-dotnet/taglib-sharp-2.0.3
+	>=dev-db/sqlite-3.4
+	aac? (
+		>=media-plugins/gst-plugins-faad-${GVER}
+	)
+	boo? (
+		>=dev-lang/boo-0.8.1
+	)
+	daap? (
+	 	>=dev-dotnet/mono-zeroconf-0.7.3
+	)
+	doc? (
+		dev-util/monodoc
+	)
+	encode? (
+		>=media-plugins/gst-plugins-lame-${GVER}
+		>=media-plugins/gst-plugins-taglib-${GVER}
+	)
+	flac? (
+		>=media-plugins/gst-plugins-flac-${GVER}
+	)
+	ipod? (
+		>=dev-dotnet/ipod-sharp-0.8.0
+	)
+	mad? (
+		>=media-plugins/gst-plugins-mad-${GVER}
+	)
+	mtp? (
+		media-libs/libmtp
+	)
+	vorbis? (
+		>=media-plugins/gst-plugins-ogg-${GVER}
+		>=media-plugins/gst-plugins-vorbis-${GVER}
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+S=${WORKDIR}/${PN}-1-${PV}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	#Upstream bug 563283
+	#Author is thansen on freenode.
+	epatch "${FILESDIR}/${P}-metadata-writefail.patch"
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable doc docs)
+		$(use_enable boo)
+		$(use_enable mtp)
+		$(use_enable daap)
+		$(use_enable ipod)
+		$(use_enable podcast)
+		$(use_enable test tests)
+		--enable-gnome
+		--enable-schemas-install
+		--with-gconf-schema-file-dir=/etc/gconf/schemas"
+
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog "If banshee segfaults not long after being started, try running gnome-appearance-properties and select a theme."
+}
diff --git a/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch b/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch
new file mode 100644
index 000000000000..b7f1c3b8eb2b
--- /dev/null
+++ b/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch
@@ -0,0 +1,35 @@
+--- src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs	2008-10-06 10:27:31.000000000 -0600
++++ src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs.new	2008-12-05 16:01:22.513964625 -0700
+@@ -130,7 +130,7 @@
+                 track.ArtistName = Choose (file.Tag.JoinedPerformers, track.ArtistName, preferTrackInfo);
+                 track.AlbumTitle = Choose (file.Tag.Album, track.AlbumTitle, preferTrackInfo);
+                 track.AlbumArtist = Choose (file.Tag.FirstAlbumArtist, track.AlbumArtist, preferTrackInfo);
+-                track.IsCompilation = IsCompilation (file.Tag);
++                track.IsCompilation = IsCompilation (file);
+                 
+                 track.TrackTitle = Choose (file.Tag.Title, track.TrackTitle, preferTrackInfo);
+                 track.Genre = Choose (file.Tag.FirstGenre, track.Genre, preferTrackInfo);
+@@ -171,18 +171,18 @@
+             // TODO these ideas could also be done in an extension that collects such hacks
+         }
+             
+-        private static bool IsCompilation (TagLib.Tag tag)
++        private static bool IsCompilation (TagLib.File file)
+         {
+-            TagLib.Id3v2.Tag id3v2_tag = tag as TagLib.Id3v2.Tag;
++            TagLib.Id3v2.Tag id3v2_tag = file.GetTag(TagLib.TagTypes.Id3v2, true) as TagLib.Id3v2.Tag;
+             if (id3v2_tag != null && id3v2_tag.IsCompilation)
+                 return true;
+ 
+-            TagLib.Mpeg4.AppleTag apple_tag = tag as TagLib.Mpeg4.AppleTag;
++            TagLib.Mpeg4.AppleTag apple_tag = file.GetTag(TagLib.TagTypes.Apple,true) as TagLib.Mpeg4.AppleTag;
+             if (apple_tag != null && apple_tag.IsCompilation)
+                 return true;
+             
+-            if (tag.Performers.Length > 0 && tag.AlbumArtists.Length > 0 &&
+-                (tag.Performers.Length != tag.AlbumArtists.Length || tag.FirstAlbumArtist != tag.FirstPerformer)) {
++            if (file.Tag.Performers.Length > 0 && file.Tag.AlbumArtists.Length > 0 &&
++                (file.Tag.Performers.Length != file.Tag.AlbumArtists.Length || file.Tag.FirstAlbumArtist != file.Tag.FirstPerformer)) {
+                 return true;
+             }
+             return false;