Add evo-sharp patch from redhat for bug #224621

Package-Manager: portage-2.1.4.4

4 files changed, 129 insertions, 4 deletions

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 4f2f978ae690..296fa1fd85f3 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.77 2008/05/30 20:01:33 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.78 2008/06/07 14:40:09 cedk Exp $
+
+*beagle-0.3.7-r1 (07 Jun 2008)
+
+  07 Jun 2008; Cédric Krier <cedk@gentoo.org>
+  +files/beagle-0.3.7-evo-sharp.patch, -beagle-0.3.7.ebuild,
+  +beagle-0.3.7-r1.ebuild:
+  Add evo-sharp patch from redhat for bug #224621
 
 *beagle-0.3.7 (28 May 2008)
 
diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index 3c28fdffbc05..774cab2b72bc 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,4 +1,5 @@
 AUX beagle-0.2.7-crawltweek.patch 1206 RMD160 73925987e7ced184351fed4dcded49671d062a5c SHA1 76e325807be790e1d75e8212ade97ee74f5be987 SHA256 3d5b8b0b87d46b9bba4af6b08c09a769a62ff608e4fc1a4257342b40f659096d
+AUX beagle-0.3.7-evo-sharp.patch 4796 RMD160 32388714ef8efc445541cdcddb81cdcb6625523c SHA1 aad4c8b8eff698176a31b96eb96a4ad6262a087e SHA256 df9c3f03130da9a93ee95d481a59b0c83f291f2cb4a4d8289c7fa081737e52a0
 AUX beagle-log-level-warn.patch 2014 RMD160 444a772662d0cf1e2b32865c87ad8308c36537c2 SHA1 7b4abc9699922c3d681b3283ca9dc2dfe0710e88 SHA256 1f8664518210dfd54ea0e229cff30cc7e41dd0651ad5ed5f608afecb49afc48e
 AUX crawl-portage 295 RMD160 979f70ae6172ffbbba21fcf8ab22964d10bf6b1a SHA1 6c8da69912829a6dd8f1bdcacc3d59acb31a9f63 SHA256 14b8423c0590ce9bc8b43ee75b7c51c02ec46031d89baeee8c0100bdc6adb31b
 DIST beagle-0.2.18.tar.bz2 1591664 RMD160 02e7fddbc2dd79eb7172ece55481541b888380e2 SHA1 02b37003e3fc223f074b0b27cc1351f9f1964ff4 SHA256 62e62b0a90f49660a6414b2fe69affee0a0bb1b1cd40ec1ccaf005e2a7f6c57b
@@ -6,6 +7,6 @@ DIST beagle-0.3.6.tar.bz2 1776852 RMD160 c113744e24c999ddebf3c1aab6a84631694dbf3
 DIST beagle-0.3.7.tar.bz2 1927176 RMD160 765dda197292c48aebf49fdc72d48358614429f0 SHA1 5c845bc3fc98f63a28ea9a53ee10d40f95c802de SHA256 75e9545a463e04fa2cd5354e57083fa646fe701bc8e3a0bfaa8d4cca628fe4ae
 EBUILD beagle-0.2.18.ebuild 3339 RMD160 a25499ea353f0c6879cbacb09ce64161ccbb49ef SHA1 725f78a9cc74943a84e39e4fe229f1ee95a3385f SHA256 7d14fd57ad79934b11bd9b3a88f3961a152e9e11467116cf8dd104351d016134
 EBUILD beagle-0.3.6.ebuild 5658 RMD160 fe578c0d7c5a6dffd18307c23e41fe9f8e7003b7 SHA1 963a2af6064ca0ab12377d23233c53c033ea7382 SHA256 6a076d3056111e81c4cff87c90ea4ee9b4af7cb94c8bd68997011463409cfae5
-EBUILD beagle-0.3.7.ebuild 5660 RMD160 054f80eb8bf572cdc84df5d55e72a1548b892518 SHA1 d1a5c91f6004e19694b76acbcb475d2ab89624d0 SHA256 ba8e4f366e053c85beba409d8607bf35a0792ce7e85aec70e66df15ece743234
-MISC ChangeLog 12928 RMD160 7b9dfcf9a9ac836f787b6b341c8fcc9a95c27f82 SHA1 d8f1ae7687b2386c85ef633b42d4e7e4fd3ff7dd SHA256 86a0fb6cf376a4e173f63205808458b263ddf056186ae7d4bf1cff7e410a92a0
+EBUILD beagle-0.3.7-r1.ebuild 5706 RMD160 39bcee03c0099c42ec5c6ab0cf166604b5fa01ff SHA1 7c54ce53226ce37e205785ea548a4f287114ec53 SHA256 963fe958f41538682c342123a6b250079292b108c96711ea45de7c19c0c70ad0
+MISC ChangeLog 13146 RMD160 a1f50cb8add556cb02fee9d676acd8e9bfab2925 SHA1 f8c9aa182a900a9d1e35c6639852e18e7769c0f7 SHA256 1714e0f777a2916128de2207a635de4602c999d3f7b1066ecbedb482ad904914
 MISC metadata.xml 2570 RMD160 e9333423eaf9da861d11e72dbb1cb23d19de3f2d SHA1 c2ccb7d5146b1f55f57dd1112a2e443139c9591a SHA256 cee899bd0d159c75c5f6c8e3c62aa156ce7acc077bb6aafe1f91210987364fd2
diff --git a/app-misc/beagle/beagle-0.3.7.ebuild b/app-misc/beagle/beagle-0.3.7-r1.ebuild
index c6d3c9536573..d374bdc6ba21 100644
--- a/app-misc/beagle/beagle-0.3.7.ebuild
+++ b/app-misc/beagle/beagle-0.3.7-r1.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/app-misc/beagle/beagle-0.3.7.ebuild,v 1.1 2008/05/30 20:01:33 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.7-r1.ebuild,v 1.1 2008/06/07 14:40:09 cedk Exp $
 
 EAPI=1
 
@@ -90,6 +90,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-evo-sharp.patch
 	# Multilib fix
 	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
 		configure.in || die "sed failed"
diff --git a/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch b/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch
new file mode 100644
index 000000000000..db5c87aada3e
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch
@@ -0,0 +1,116 @@
+diff -ru beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs
+--- beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs	2008-06-07 16:23:11.000000000 +0200
++++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs	2008-06-07 16:28:57.000000000 +0200
+@@ -36,7 +36,7 @@
+ using Beagle.Util;
+ using Beagle.Daemon;
+ 
+-using Camel = Beagle.Util.Camel;
++using B_U_Camel = Beagle.Util.Camel;
+ 
+ namespace Beagle.Daemon.EvolutionMailQueryable {
+ 
+@@ -309,7 +309,7 @@
+ 			}
+ 		}
+ 
+-		private static bool CheckFlags (uint flags, Camel.CamelFlags test)
++		private static bool CheckFlags (uint flags, B_U_Camel.CamelFlags test)
+ 		{
+ 			return (flags & (uint) test) == (uint) test;
+ 		}
+@@ -317,7 +317,7 @@
+ 		private Indexable GMimeMessageToIndexable (string uid, GMime.Message message, uint flags)
+ 		{
+ 			// Don't index messages flagged as junk
+-			if (CheckFlags (flags, Camel.CamelFlags.Junk))
++			if (CheckFlags (flags, B_U_Camel.CamelFlags.Junk))
+ 				return null;
+ 
+ 			System.Uri uri = EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, uid);
+@@ -362,22 +362,22 @@
+ 			flag_prop.IsMutable = true;
+ 			indexable.AddProperty (flag_prop);
+ 
+-			if (CheckFlags (flags, Camel.CamelFlags.Answered))
++			if (CheckFlags (flags, B_U_Camel.CamelFlags.Answered))
+ 				indexable.AddProperty (Property.NewFlag ("fixme:isAnswered"));
+ 
+-			if (CheckFlags (flags, Camel.CamelFlags.Deleted))
++			if (CheckFlags (flags, B_U_Camel.CamelFlags.Deleted))
+ 				indexable.AddProperty (Property.NewFlag ("fixme:isDeleted"));
+ 
+-			if (CheckFlags (flags, Camel.CamelFlags.Draft))
++			if (CheckFlags (flags, B_U_Camel.CamelFlags.Draft))
+ 				indexable.AddProperty (Property.NewFlag ("fixme:isDraft"));
+ 
+-			if (CheckFlags (flags, Camel.CamelFlags.Flagged))
++			if (CheckFlags (flags, B_U_Camel.CamelFlags.Flagged))
+ 				indexable.AddProperty (Property.NewFlag ("fixme:isFlagged"));
+ 
+-			if (CheckFlags (flags, Camel.CamelFlags.Seen))
++			if (CheckFlags (flags, B_U_Camel.CamelFlags.Seen))
+ 				indexable.AddProperty (Property.NewFlag ("fixme:isSeen"));
+ 
+-			if (CheckFlags (flags, Camel.CamelFlags.AnsweredAll))
++			if (CheckFlags (flags, B_U_Camel.CamelFlags.AnsweredAll))
+ 				indexable.AddProperty (Property.NewFlag ("fixme:isAnsweredAll"));
+ 
+ 			indexable.SetBinaryStream (message.Stream);
+@@ -427,7 +427,7 @@
+ 		private FileInfo summary_info;
+ 		private string imap_name;
+ 		private ImapBackendType backend_type;
+-		private Camel.Summary summary;
++		private B_U_Camel.Summary summary;
+ 		private IEnumerator summary_enumerator;
+ 		private EvolutionSummaryTracker tracker;
+ 		private DateTime start_crawl_time;
+@@ -593,9 +593,9 @@
+ 			if (this.summary == null) {
+ 				try {
+ 					if (this.backend_type == ImapBackendType.Imap)
+-						this.summary = Camel.Summary.LoadImapSummary (this.summary_info.FullName);
++						this.summary = B_U_Camel.Summary.LoadImapSummary (this.summary_info.FullName);
+ 					else
+-						this.summary = Camel.Summary.LoadImap4Summary (this.summary_info.FullName);
++						this.summary = B_U_Camel.Summary.LoadImap4Summary (this.summary_info.FullName);
+ 				} catch (Exception e) {
+ 					Logger.Log.Warn (e, "Unable to index {0}:", this.folder_name);
+ 					this.queryable.RemoveGenerator (this);
+@@ -660,7 +660,7 @@
+ 				return indexable;
+ 			}
+ 
+-			Camel.MessageInfo mi = (Camel.MessageInfo) this.summary_enumerator.Current;
++			B_U_Camel.MessageInfo mi = (B_U_Camel.MessageInfo) this.summary_enumerator.Current;
+ 
+ 			++this.count;
+ 
+@@ -717,12 +717,12 @@
+ 			return indexable;
+ 		}
+ 
+-		private Uri CamelMessageUri (Camel.MessageInfo message_info)
++		private Uri CamelMessageUri (B_U_Camel.MessageInfo message_info)
+ 		{
+ 			return EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, message_info.uid);
+ 		}
+ 
+-		private Indexable CamelMessageToIndexable (Camel.MessageInfo messageInfo, string msg_file)
++		private Indexable CamelMessageToIndexable (B_U_Camel.MessageInfo messageInfo, string msg_file)
+ 		{
+ 			// Don't index messages flagged as junk
+ 			if (messageInfo.IsJunk)
+Only in beagle-0.3.7/beagled/EvolutionMailQueryable: EvolutionMailIndexableGenerator.cs.orig
+diff -ru beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs
+--- beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs	2008-06-07 16:23:11.000000000 +0200
++++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs	2008-06-07 16:25:36.000000000 +0200
+@@ -31,7 +31,6 @@
+ using System.Threading;
+ 
+ using Beagle.Util;
+-using Camel = Beagle.Util.Camel;
+ 
+ namespace Beagle.Daemon.EvolutionMailQueryable {
+