Bump for mono-2, remove crufty slag.

(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64)

7 files changed, 85 insertions, 482 deletions

diff --git a/dev-lang/mono/files/mono-1.1.13-pathfix.diff b/dev-lang/mono/files/mono-1.1.13-pathfix.diff
deleted file mode 100644
index f4296381bfd5..000000000000
--- a/dev-lang/mono/files/mono-1.1.13-pathfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur mono-1.1.13-orig/mcs/class/corlib/System.IO/Path.cs mono-1.1.13/mcs/class/corlib/System.IO/Path.cs
---- mono-1.1.13-orig/mcs/class/corlib/System.IO/Path.cs	2005-12-21 17:54:10.000000000 -0800
-+++ mono-1.1.13/mcs/class/corlib/System.IO/Path.cs	2006-01-10 21:31:05.000000000 -0800
-@@ -519,7 +519,7 @@
- 			//if (root == path) return path;
- 
- 			// STEP 3: split the directories, this gets rid of consecutative "/"'s
--			string[] dirs = path.Split (Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
-+			string[] dirs = path.Split (Path.DirectorySeparatorChar);
- 			// STEP 4: Get rid of directories containing . and ..
- 			int target = 0;
- 
diff --git a/dev-lang/mono/files/mono-1.2.4-make-check.patch b/dev-lang/mono/files/mono-1.2.4-make-check.patch
deleted file mode 100644
index fb94ff21f6f7..000000000000
--- a/dev-lang/mono/files/mono-1.2.4-make-check.patch
+++ /dev/null
@@ -1,222 +0,0 @@
---- mono-1.2.4-old/mcs/class/corlib/Test/System.Text/EncoderReplacementFallbackTest.cs	2007-06-26 16:46:35.000000000 +0200
-+++ mono-1.2.4/mcs/class/corlib/Test/System.Text/EncoderReplacementFallbackTest.cs	2007-06-26 16:47:14.000000000 +0200
-@@ -56,7 +56,7 @@
- 		}
- 
- 		[Test]
--		[ExpectedException (typeof (NotSupportedException))]
-+		[ExpectedException (typeof (InvalidOperationException))]
- 		public void DontChangeReadOnlyCodePageEncoderFallback ()
- 		{
- 			Encoding.GetEncoding (932).EncoderFallback =
---- mono-1.2.4-old/mcs/class/corlib/Test/System.Text/DecoderReplacementFallbackTest.cs	2007-06-26 16:46:19.000000000 +0200
-+++ mono-1.2.4/mcs/class/corlib/Test/System.Text/DecoderReplacementFallbackTest.cs	2007-06-26 16:46:56.000000000 +0200
-@@ -56,7 +56,7 @@
- 		}
- 
- 		[Test]
--		[ExpectedException (typeof (NotSupportedException))]
-+		[ExpectedException (typeof (InvalidOperationException))]
- 		public void DontChangeReadOnlyCodePageDecoderFallback ()
- 		{
- 			Encoding.GetEncoding (932).DecoderFallback =
-diff -uar /home/koxta/mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/DeflateStreamCas.cs mono-1.2.4/mcs/class/System/Test/System.IO.Compression/DeflateStreamCas.cs
---- mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/DeflateStreamCas.cs	2007-04-25 20:49:34.000000000 +0200
-+++ mono-1.2.4/mcs/class/System/Test/System.IO.Compression/DeflateStreamCas.cs	2007-06-26 20:26:20.000000000 +0200
-@@ -43,6 +43,7 @@
- 	[Category ("CAS")]
- 	public class DeflateStreamCas {
- 
-+		/* Fails due to zlib corruption
- 		private const int timeout = 30000;
- 		private string message;
- 
-@@ -135,7 +136,7 @@
- 			Assert.IsNull (message, message);
- // the Close is currently buggy in Mono
- //			cs.Close ();
--		}
-+		}*/
- 	}
- }
- 
-diff -uar /home/koxta/mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs mono-1.2.4/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs
---- mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs	2007-04-25 20:49:34.000000000 +0200
-+++ mono-1.2.4/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs	2007-06-26 20:17:27.000000000 +0200
-@@ -20,6 +20,7 @@
- 	[TestFixture]
- 	public class DeflateStreamTest : Assertion
- 	{
-+		/* Fails due to zlib corruption *
- 		private static void CopyStream (Stream src, Stream dest)
- 		{
- 			byte[] array = new byte[1024];
-@@ -213,7 +214,7 @@
- 			MemoryStream backing = new MemoryStream (data);
- 			DeflateStream decompressing = new DeflateStream (backing, CompressionMode.Decompress);
- 			long position = decompressing.Position;
--		}
-+		}*/
- 	}
- }
- 
-diff -uar /home/koxta/mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/GZipStreamCas.cs mono-1.2.4/mcs/class/System/Test/System.IO.Compression/GZipStreamCas.cs
---- mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/GZipStreamCas.cs	2007-04-25 20:49:34.000000000 +0200
-+++ mono-1.2.4/mcs/class/System/Test/System.IO.Compression/GZipStreamCas.cs	2007-06-26 20:25:44.000000000 +0200
-@@ -42,7 +42,8 @@
- 	[TestFixture]
- 	[Category ("CAS")]
- 	public class GZipStreamCas {
--
-+		
-+		/* Fails due to zlib corruption *
- 		private const int timeout = 30000;
- 		private string message;
- 
-@@ -136,6 +137,7 @@
- // the Close is currently buggy in Mono
- //			cs.Close ();
- 		}
-+		*/
- 	}
- }
- 
-diff -uar /home/koxta/mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs mono-1.2.4/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs
---- mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs	2007-04-25 20:49:34.000000000 +0200
-+++ mono-1.2.4/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs	2007-06-26 20:26:04.000000000 +0200
-@@ -20,6 +20,7 @@
- 	[TestFixture]
- 	public class GZipStreamTest : Assertion
- 	{
-+		/* Fails due to zlib corruption *
- 		private static void CopyStream (Stream src, Stream dest)
- 		{
- 			byte[] array = new byte[1024];
-@@ -214,6 +215,7 @@
- 			GZipStream decompressing = new GZipStream (backing, CompressionMode.Decompress);
- 			long position = decompressing.Position;
- 		}
-+		*/
- 	}
- }
- 
-diff -uar /home/koxta/mono-1.2.4-old/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs mono-1.2.4/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
---- mono-1.2.4-old/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs	2007-04-25 20:49:44.000000000 +0200
-+++ mono-1.2.4/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs	2007-06-26 20:09:40.000000000 +0200
-@@ -22,6 +22,8 @@
- 	[TestFixture]
- 	public class RegistryKeyTest
- 	{
-+		/* Registry related tests fail because of unauthorized
-+		 * access to /root/.config
- 		private const string mimeroot = @"MIME\Database\Content Type";
- 		[Test]
- 		[Category("NotWorking")]
-@@ -1126,13 +1128,13 @@
- 					Assert.IsNotNull (names [0], "#A3");
- 					/*
- 					Assert.AreEqual ("name1", names [0], "#A4");
--					*/
-+					*
- 					Assert.IsNotNull (createdKey.GetValue ("name1"), "#A5");
- 					Assert.AreEqual ("value1", createdKey.GetValue ("name1"), "#A6");
- 					Assert.IsNotNull (names [1], "#A7");
- 					/*
- 					Assert.AreEqual (string.Empty, names [1], "#A8");
--					*/
-+					*
- 					Assert.IsNotNull (createdKey.GetValue (string.Empty), "#A9");
- 					Assert.AreEqual ("value2", createdKey.GetValue (string.Empty), "#A10");
- 
-@@ -1204,13 +1206,13 @@
- 					Assert.IsNotNull (names [0], "#A3");
- 					/*
- 					Assert.AreEqual ("name1", names [0], "#A4");
--					*/
-+					*
- 					Assert.IsNotNull (createdKey.GetValue ("name1"), "#A5");
- 					Assert.AreEqual ("value1", createdKey.GetValue ("name1"), "#A6");
- 					Assert.IsNotNull (names [1], "#A7");
- 					/*
- 					Assert.AreEqual (string.Empty, names [1], "#A8");
--					*/
-+					*
- 					Assert.IsNotNull (createdKey.GetValue (null), "#A9");
- 					Assert.AreEqual ("value2", createdKey.GetValue (null), "#A10");
- 
-@@ -2450,7 +2452,7 @@
- 				}
- 			}
- 		}
--
-+/*
- 		[Test]
- 		public void bugnew4 () // Key cannot be flushed once it has been closed
- 		{
-@@ -2485,6 +2487,6 @@
- 				return ((p == 4) || (p == 128));
- #endif
- 			}
--		}
-+		}*/
- 	}
- }
-diff -uar /home/koxta/mono-1.2.4-old/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs mono-1.2.4/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs
---- mono-1.2.4-old/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs	2007-04-25 20:49:40.000000000 +0200
-+++ mono-1.2.4/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs	2007-06-26 23:45:58.000000000 +0200
-@@ -24,6 +24,7 @@
- 	[TestFixture, Category ("NotDotNet")]
- 	public class UnixGroupTest
- 	{
-+		/* Fails due to incorrect handling of setgrent and endgrent
- 		[Test]
- 		public void ListAllGroups_ToString ()
- 		{
-@@ -141,7 +142,7 @@
- 
- 			mod.gr_name = "another name";
- 			Assert.IsFalse (orig.Equals (mod), "#TE: changes should be reflected");
--		}
-+		}*/
- 	}
- }
- 
-diff -uar /home/koxta/mono-1.2.4-old/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs mono-1.2.4/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs
---- mono-1.2.4-old/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs	2007-04-25 20:49:40.000000000 +0200
-+++ mono-1.2.4/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs	2007-06-26 23:46:13.000000000 +0200
-@@ -25,6 +25,7 @@
- 	[TestFixture, Category ("NotDotNet")]
- 	public class UnixUserTest
- 	{
-+		/* Fails due to incorrect handling of setpwent and endpwent
- 		[Test]
- 		public void ListAllUsers_ToString ()
- 		{
-@@ -172,7 +173,7 @@
- 
- 			mod.pw_name = "another name";
- 			Assert.IsFalse (orig.Equals (mod), "#TE: changes should be reflected");
--		}
-+		}*/
- 	}
- }
- 
-diff -uar /home/koxta/mono-1.2.4-old/mcs/class/Mono.Security/Test/Mono.Security/ASN1ConvertTest.cs mono-1.2.4/mcs/class/Mono.Security/Test/Mono.Security/ASN1ConvertTest.cs
---- mono-1.2.4-old/mcs/class/Mono.Security/Test/Mono.Security/ASN1ConvertTest.cs	2007-04-25 20:50:15.000000000 +0200
-+++ mono-1.2.4/mcs/class/Mono.Security/Test/Mono.Security/ASN1ConvertTest.cs	2007-06-27 00:28:43.000000000 +0200
-@@ -32,6 +32,7 @@
- 			}
- 		}
- 
-+		/* Might fail due to timezone issues
- 		[Test]
- 		public void ConvertDateTimeBefore2000 () 
- 		{
-@@ -70,6 +71,7 @@
- #endif
- 			AssertDate (expected, actual, "DateTime");
- 		}
-+		*/
- 
- 		[Test]
- 		public void ConvertDateTimeInvalidButExistingFormat () 
diff --git a/dev-lang/mono/files/mono-1.2.5-make-check.patch b/dev-lang/mono/files/mono-1.2.5-make-check.patch
deleted file mode 100644
index 262f6cdc8107..000000000000
--- a/dev-lang/mono/files/mono-1.2.5-make-check.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -uar mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/DeflateStreamCas.cs mono-1.2.4/mcs/class/System/Test/System.IO.Compression/DeflateStreamCas.cs
---- mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/DeflateStreamCas.cs	2007-04-25 20:49:34.000000000 +0200
-+++ mono-1.2.4/mcs/class/System/Test/System.IO.Compression/DeflateStreamCas.cs	2007-06-26 20:26:20.000000000 +0200
-@@ -43,6 +43,7 @@
- 	[Category ("CAS")]
- 	public class DeflateStreamCas {
- 
-+		/* Fails due to zlib corruption
- 		private const int timeout = 30000;
- 		private string message;
- 
-@@ -135,7 +136,7 @@
- 			Assert.IsNull (message, message);
- // the Close is currently buggy in Mono
- //			cs.Close ();
--		}
-+		}*/
- 	}
- }
- 
-diff -uar mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs mono-1.2.4/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs
---- mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs	2007-04-25 20:49:34.000000000 +0200
-+++ mono-1.2.4/mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs	2007-06-26 20:17:27.000000000 +0200
-@@ -20,6 +20,7 @@
- 	[TestFixture]
- 	public class DeflateStreamTest : Assertion
- 	{
-+		/* Fails due to zlib corruption *
- 		private static void CopyStream (Stream src, Stream dest)
- 		{
- 			byte[] array = new byte[1024];
-@@ -213,7 +214,7 @@
- 			MemoryStream backing = new MemoryStream (data);
- 			DeflateStream decompressing = new DeflateStream (backing, CompressionMode.Decompress);
- 			long position = decompressing.Position;
--		}
-+		}*/
- 	}
- }
- 
-diff -uar mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/GZipStreamCas.cs mono-1.2.4/mcs/class/System/Test/System.IO.Compression/GZipStreamCas.cs
---- mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/GZipStreamCas.cs	2007-04-25 20:49:34.000000000 +0200
-+++ mono-1.2.4/mcs/class/System/Test/System.IO.Compression/GZipStreamCas.cs	2007-06-26 20:25:44.000000000 +0200
-@@ -42,7 +42,8 @@
- 	[TestFixture]
- 	[Category ("CAS")]
- 	public class GZipStreamCas {
--
-+		
-+		/* Fails due to zlib corruption *
- 		private const int timeout = 30000;
- 		private string message;
- 
-@@ -136,6 +137,7 @@
- // the Close is currently buggy in Mono
- //			cs.Close ();
- 		}
-+		*/
- 	}
- }
- 
-diff -uar mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs mono-1.2.4/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs
---- mono-1.2.4-old/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs	2007-04-25 20:49:34.000000000 +0200
-+++ mono-1.2.4/mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs	2007-06-26 20:26:04.000000000 +0200
-@@ -20,6 +20,7 @@
- 	[TestFixture]
- 	public class GZipStreamTest : Assertion
- 	{
-+		/* Fails due to zlib corruption *
- 		private static void CopyStream (Stream src, Stream dest)
- 		{
- 			byte[] array = new byte[1024];
-@@ -214,6 +215,7 @@
- 			GZipStream decompressing = new GZipStream (backing, CompressionMode.Decompress);
- 			long position = decompressing.Position;
- 		}
-+		*/
- 	}
- }
- 
-diff -uar mono-1.2.4-old/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs mono-1.2.4/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
---- mono-1.2.4-old/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs	2007-04-25 20:49:44.000000000 +0200
-+++ mono-1.2.4/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs	2007-06-26 20:09:40.000000000 +0200
-@@ -22,6 +22,8 @@
- 	[TestFixture]
- 	public class RegistryKeyTest
- 	{
-+		/* Registry related tests fail because of unauthorized
-+		 * access to /root/.config
- 		private const string mimeroot = @"MIME\Database\Content Type";
- 		[Test]
- 		[Category("NotWorking")]
-@@ -1126,13 +1128,13 @@
- 					Assert.IsNotNull (names [0], "#A3");
- 					/*
- 					Assert.AreEqual ("name1", names [0], "#A4");
--					*/
-+					*
- 					Assert.IsNotNull (createdKey.GetValue ("name1"), "#A5");
- 					Assert.AreEqual ("value1", createdKey.GetValue ("name1"), "#A6");
- 					Assert.IsNotNull (names [1], "#A7");
- 					/*
- 					Assert.AreEqual (string.Empty, names [1], "#A8");
--					*/
-+					*
- 					Assert.IsNotNull (createdKey.GetValue (string.Empty), "#A9");
- 					Assert.AreEqual ("value2", createdKey.GetValue (string.Empty), "#A10");
- 
-@@ -1204,13 +1206,13 @@
- 					Assert.IsNotNull (names [0], "#A3");
- 					/*
- 					Assert.AreEqual ("name1", names [0], "#A4");
--					*/
-+					*
- 					Assert.IsNotNull (createdKey.GetValue ("name1"), "#A5");
- 					Assert.AreEqual ("value1", createdKey.GetValue ("name1"), "#A6");
- 					Assert.IsNotNull (names [1], "#A7");
- 					/*
- 					Assert.AreEqual (string.Empty, names [1], "#A8");
--					*/
-+					*
- 					Assert.IsNotNull (createdKey.GetValue (null), "#A9");
- 					Assert.AreEqual ("value2", createdKey.GetValue (null), "#A10");
- 
-@@ -2450,7 +2452,7 @@
- 				}
- 			}
- 		}
--
-+/*
- 		[Test]
- 		public void bugnew4 () // Key cannot be flushed once it has been closed
- 		{
-@@ -2485,6 +2487,6 @@
- 				return ((p == 4) || (p == 128));
- #endif
- 			}
--		}
-+		}*/
- 	}
- }
-diff -uar mono-1.2.4-old/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs mono-1.2.4/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs
---- mono-1.2.4-old/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs	2007-04-25 20:49:40.000000000 +0200
-+++ mono-1.2.4/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs	2007-06-26 23:45:58.000000000 +0200
-@@ -24,6 +24,7 @@
- 	[TestFixture, Category ("NotDotNet")]
- 	public class UnixGroupTest
- 	{
-+		/* Fails due to incorrect handling of setgrent and endgrent
- 		[Test]
- 		public void ListAllGroups_ToString ()
- 		{
-@@ -141,7 +142,7 @@
- 
- 			mod.gr_name = "another name";
- 			Assert.IsFalse (orig.Equals (mod), "#TE: changes should be reflected");
--		}
-+		}*/
- 	}
- }
- 
-diff -uar mono-1.2.4-old/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs mono-1.2.4/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs
---- mono-1.2.4-old/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs	2007-04-25 20:49:40.000000000 +0200
-+++ mono-1.2.4/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs	2007-06-26 23:46:13.000000000 +0200
-@@ -25,6 +25,7 @@
- 	[TestFixture, Category ("NotDotNet")]
- 	public class UnixUserTest
- 	{
-+		/* Fails due to incorrect handling of setpwent and endpwent
- 		[Test]
- 		public void ListAllUsers_ToString ()
- 		{
-@@ -172,7 +173,7 @@
- 
- 			mod.pw_name = "another name";
- 			Assert.IsFalse (orig.Equals (mod), "#TE: changes should be reflected");
--		}
-+		}*/
- 	}
- }
- 
-diff -uar mono-1.2.4-old/mcs/class/Mono.Security/Test/Mono.Security/ASN1ConvertTest.cs mono-1.2.4/mcs/class/Mono.Security/Test/Mono.Security/ASN1ConvertTest.cs
---- mono-1.2.4-old/mcs/class/Mono.Security/Test/Mono.Security/ASN1ConvertTest.cs	2007-04-25 20:50:15.000000000 +0200
-+++ mono-1.2.4/mcs/class/Mono.Security/Test/Mono.Security/ASN1ConvertTest.cs	2007-06-27 00:28:43.000000000 +0200
-@@ -32,6 +32,7 @@
- 			}
- 		}
- 
-+		/* Might fail due to timezone issues
- 		[Test]
- 		public void ConvertDateTimeBefore2000 () 
- 		{
-@@ -70,6 +71,7 @@
- #endif
- 			AssertDate (expected, actual, "DateTime");
- 		}
-+		*/
- 
- 		[Test]
- 		public void ConvertDateTimeInvalidButExistingFormat () 
diff --git a/dev-lang/mono/files/mono-1.2.5-remoting.patch b/dev-lang/mono/files/mono-1.2.5-remoting.patch
deleted file mode 100644
index 6dce6e6d8baf..000000000000
--- a/dev-lang/mono/files/mono-1.2.5-remoting.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- trunk/mono/mono/metadata/object.c	2007/08/28 12:48:36	84948
-+++ trunk/mono/mono/metadata/object.c	2007/09/08 22:36:32	85526
-@@ -1560,7 +1560,8 @@
- 		MonoMethod *cm;
- 		    
- 		if ((cm = class->vtable [i]))
--			pvt->vtable [i] = arch_create_remoting_trampoline (cm, target_type);
-+			pvt->vtable [i] = mono_method_signature (cm)->generic_param_count
-+				? cm : arch_create_remoting_trampoline (cm, target_type);
- 	}
- 
- 	if (class->flags & TYPE_ATTRIBUTE_ABSTRACT) {
-@@ -1570,7 +1571,7 @@
- 			gpointer iter = NULL;
- 			while ((m = mono_class_get_methods (k, &iter)))
- 				if (!pvt->vtable [m->slot])
--					pvt->vtable [m->slot] = arch_create_remoting_trampoline (m, target_type);
-+					pvt->vtable [m->slot] = mono_method_signature (m)->generic_param_count ? m : arch_create_remoting_trampoline (m, target_type);
- 		}
- 	}
- 
-@@ -1609,7 +1610,7 @@
- 			iter = NULL;
- 			j = 0;
- 			while ((cm = mono_class_get_methods (interf, &iter)))
--				pvt->vtable [slot + j++] = arch_create_remoting_trampoline (cm, target_type);
-+				pvt->vtable [slot + j++] = mono_method_signature (cm)->generic_param_count ? cm : arch_create_remoting_trampoline (cm, target_type);
- 			
- 			slot += mono_class_num_methods (interf);
- 		}
-@@ -1933,8 +1934,15 @@
- 	}
- 
- 	if (is_proxy) {
--		if (!res) res = method;   /* It may be an interface or abstract class method */
--		res = mono_marshal_get_remoting_invoke (res);
-+		/* It may be an interface, abstract class method or generic method */
-+		if (!res || mono_method_signature (res)->generic_param_count)
-+			res = method;
-+
-+		/* generic methods demand invoke_with_check */
-+		if (mono_method_signature (res)->generic_param_count)
-+			res = mono_marshal_get_remoting_invoke_with_check (res);
-+		else
-+			res = mono_marshal_get_remoting_invoke (res);
- 	}
- 
- 	g_assert (res);
diff --git a/dev-lang/mono/files/mono-2.0-mimeicon.patch b/dev-lang/mono/files/mono-2.0-mimeicon.patch
new file mode 100644
index 000000000000..26ade3ade16a
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.0-mimeicon.patch
@@ -0,0 +1,54 @@
+--- mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs	2008-09-02 16:46:50.000000000 +0100
++++ mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon-new.cs	2008-09-18 23:29:05.000000000 +0100
+@@ -358,11 +358,12 @@
+ 				if (internal_mime_type == "harddisk/harddisk" || internal_mime_type == "cdrom/cdrom" || internal_mime_type == "removable/removable")
+ 					image = ResourceImageLoader.Get ("text-x-generic.png");
+ 			}
+-			
+-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+-			
+-			MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index);
++
++			if (image != null) {
++				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
++				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
++				MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index);
++			}
+ 		}
+ 		
+ 		public override object AddAndGetIconIndex (string filename, string mime_type)
+@@ -370,11 +371,11 @@
+ 			int index = -1;
+ 			
+ 			Image image = GnomeUtil.GetIcon (filename, mime_type, 48);
+-			
+-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+-			
+-			MimeIconEngine.MimeIconIndex.Add (mime_type, index);
++			if (image != null) {
++				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
++				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
++				MimeIconEngine.MimeIconIndex.Add (mime_type, index);
++			}
+ 			
+ 			return index;
+ 		}
+@@ -384,11 +385,11 @@
+ 			int index = -1;
+ 			
+ 			Image image = GnomeUtil.GetIcon (mime_type, 48);
+-			
+-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+-			
+-			MimeIconEngine.MimeIconIndex.Add (mime_type, index);
++			if (image != null) {
++				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
++				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
++				MimeIconEngine.MimeIconIndex.Add (mime_type, index);
++			}
+ 			
+ 			return index;
+ 		}
diff --git a/dev-lang/mono/files/mono-2.0-ppc-threading.patch b/dev-lang/mono/files/mono-2.0-ppc-threading.patch
new file mode 100644
index 000000000000..d28ecf2763af
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.0-ppc-threading.patch
@@ -0,0 +1,20 @@
+--- mono-2.0/mono/mini/main.c	2008-08-03 07:49:23.000000000 +0100
++++ mono-2.0/mono/mini/main-new.c	2008-08-03 07:55:10.000000000 +0100
+@@ -23,10 +23,16 @@
+ }
+ 
+ #else
+-
++#include <sched.h>
+ int
+ main (int argc, char* argv[])
+ {
++    /* On PowerPC call sched_setaffinity to bind to one CPU only
++     * to work around parallelism bug on G5 SMP */
++    #ifdef __powerpc__
++    unsigned long mask = 1;
++    sched_setaffinity(0, sizeof(mask), &mask);
++    #endif
+ 	return mono_main (argc, argv);
+ }
+ 
diff --git a/dev-lang/mono/files/mono-2.0.1-fix-wsdl-troubles-with-muine.patch b/dev-lang/mono/files/mono-2.0.1-fix-wsdl-troubles-with-muine.patch
new file mode 100644
index 000000000000..2001f717fb0c
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.0.1-fix-wsdl-troubles-with-muine.patch
@@ -0,0 +1,11 @@
+--- mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/10/28 09:09:03	117242
++++ mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/10/28 09:32:46	117243
+@@ -177,7 +177,7 @@
+ 				foreach (OperationMessage om in op.Messages) {
+ 					Message msg = ctx.Services.GetMessage (om.Message);
+ 					foreach (MessagePart part in msg.Parts)
+-						parts.Add (part,part);
++						parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
+ 				}
+ 			}
+