Punt extraneous patch file

Package-Manager: portage-2.2_rc26/cvs/Linux x86_64

3 files changed, 6 insertions, 97 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 5c2fef182255..7b57d2238197 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.86 2009/03/22 16:54:53 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.87 2009/03/23 10:12:33 loki_val Exp $
+
+  23 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -files/banshee-1.4.1-metadata-writefail.patch:
+  Punt extraneous patch file
 
   22 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
   -files/banshee-1.0.0-notification-icon.patch,
diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest
index 20da6eb22b3b..75b2fa791e2c 100644
--- a/media-sound/banshee/Manifest
+++ b/media-sound/banshee/Manifest
@@ -1,4 +1,3 @@
-AUX banshee-1.4.1-metadata-writefail.patch 4415 RMD160 031010de44c5bf9b1923a57d7fc5ee5632e4b8f6 SHA1 010e4bd359dcfba8daf24299c49610ac223a6663 SHA256 42a5ab6a2dac30a2f33a2bbe0d6aafd9ef9ddb2332c6bc3ae53dc7582a90c10d
 AUX banshee-1.4.2-metadata-writefail.patch 5654 RMD160 97ca18af74228d1d46eb0d448e682e932127ff81 SHA1 f54218e64ec6829315edc187f5177f056d421a8b SHA256 9aadd680b1a3e2c931e0734b49a5d617f24c6e3e90d7558fcc5a4404920caaa2
 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
@@ -7,5 +6,5 @@ DIST banshee-1.4.2-musicbrainz-fix.patch.bz2 14078 RMD160 185e306fe4705c2d317b6d
 EBUILD banshee-0.12.1.ebuild 3033 RMD160 7aa0c63a0c428c8d3be2594aa931bdd902cbbe99 SHA1 1a4d7c6c92cf896eb44418e9488f889c18290b63 SHA256 97bc43f8bc5e0ee9dbbcb64b54a501d36fa40499fd23effbe1064503c110fa48
 EBUILD banshee-0.13.1.ebuild 2995 RMD160 ea90307f7745259bdb12b22dae8d428de7cba7b2 SHA1 96064831a620d79e153dacf8f8645c8d58c08071 SHA256 421ce751a47477460e8463764d55bc4633aeb82d44509efc57913b3add2ce7e6
 EBUILD banshee-1.4.3.ebuild 3288 RMD160 7bf7a0991db87510cb702c63d8a6de0a5f764d94 SHA1 3e40f5dcdff1c9f4687a8b612311568e04e222b3 SHA256 37ef86843ee032f29c83e078eb0faa3516f1da6c7045d8c57ea1b8b9e4e76976
-MISC ChangeLog 16843 RMD160 b46d041aa78c225b0ae02ab506c1d7fc7d2f2eaa SHA1 b79a3c793edb18618fadf2694fe87c3cc0e73827 SHA256 3a528ebb6975cb48355d1a82c1933455fa4e7364e1ea1903226b7424a9033235
+MISC ChangeLog 16975 RMD160 1efbbda6d70374506c1d4435d1ca6f8883dcd83b SHA1 74b2d310e099ef1a7819cdf947a424a3408d4760 SHA256 fd0a1a3b1e5bf0f8dca812cd351603d0ae1b3d39c2a73875a92e51b696eb074f
 MISC metadata.xml 499 RMD160 58c90a5fa64f948def14ea188bd7815294e36f35 SHA1 5d463e6bbad5600e2fb46e20dd35be871bcb48a8 SHA256 77f493966e62f6e00073371783c5234cee51f5a4462571c8214c6e301860cd5a
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
deleted file mode 100644
index 8ac299a490fb..000000000000
--- a/media-sound/banshee/files/banshee-1.4.1-metadata-writefail.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs.orig	2008-12-10 16:03:27.913232707 -0700
-+++ src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs	2008-12-10 16:16:00.617267829 -0700
-@@ -29,6 +29,7 @@
- using System;
- using Mono.Unix;
- 
-+using Banshee.Base;
- using Banshee.Collection;
- using Banshee.Configuration.Schema;
- 
-@@ -86,24 +87,26 @@
-             file.Tag.DiscCount = (uint)track.DiscCount;
-             file.Tag.Year = (uint)track.Year;
-             file.Tag.BeatsPerMinute = (uint)track.Bpm;
--            
--            SaveIsCompilation (file.Tag, track.IsCompilation);
-+
-+            SaveIsCompilation (file, track.IsCompilation);
-             file.Save ();
-         }
-         
--        private static void SaveIsCompilation (TagLib.Tag tag, bool is_compilation)
-+        private static void SaveIsCompilation (TagLib.File file, bool is_compilation)
-         {
--            TagLib.Id3v2.Tag id3v2_tag = tag as TagLib.Id3v2.Tag;
--            if (id3v2_tag != null) {
--                id3v2_tag.IsCompilation = is_compilation;
--                return;
--            }
-+            try {
-+                 TagLib.Id3v2.Tag id3v2_tag = file.GetTag(TagLib.TagTypes.Id3v2, true) as TagLib.Id3v2.Tag;
-+                 if (id3v2_tag != null) {
-+                     id3v2_tag.IsCompilation = is_compilation;
-+                 }
-+            } catch {}
- 
--            TagLib.Mpeg4.AppleTag apple_tag = tag as TagLib.Mpeg4.AppleTag;
--            if (apple_tag != null) {
--                apple_tag.IsCompilation = is_compilation;
--                return;
--            }
-+            try {
-+                 TagLib.Mpeg4.AppleTag apple_tag = file.GetTag(TagLib.TagTypes.Apple,true) as TagLib.Mpeg4.AppleTag;
-+                 if (apple_tag != null) {
-+                     apple_tag.IsCompilation = is_compilation;
-+                 }
-+            } catch {}
-         }
-     }
- }
---- src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs.orig	2008-10-06 10:27:31.000000000 -0600
-+++ src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs	2008-12-10 16:17:49.355233640 -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,22 @@
-             // 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;
--            if (id3v2_tag != null && id3v2_tag.IsCompilation)
--                return true;
--
--            TagLib.Mpeg4.AppleTag apple_tag = tag as TagLib.Mpeg4.AppleTag;
--            if (apple_tag != null && apple_tag.IsCompilation)
--                return true;
-+            try {
-+                 TagLib.Id3v2.Tag id3v2_tag = file.GetTag(TagLib.TagTypes.Id3v2, true) as TagLib.Id3v2.Tag;
-+                 if (id3v2_tag != null && id3v2_tag.IsCompilation)
-+                      return true;
-+            } catch {}
-+            
-+            try {
-+                 TagLib.Mpeg4.AppleTag apple_tag = file.GetTag(TagLib.TagTypes.Apple,true) as TagLib.Mpeg4.AppleTag;
-+                 if (apple_tag != null && apple_tag.IsCompilation)
-+                     return true;
-+            } catch {}
-             
--            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;