Bump for mono-2, remove crufty slag.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64

19 files changed, 141 insertions, 1629 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 5e42466ad119..17add4eaa77d 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.144 2008/11/17 20:54:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.145 2008/11/19 22:34:44 loki_val Exp $
+
+*mono-2.0.1 (19 Nov 2008)
+
+  19 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/mono-1.1.13-pathfix.diff, -files/mono-1.2.4-make-check.patch,
+  -files/mono-1.2.5-make-check.patch, -files/mono-1.2.5-remoting.patch,
+  +files/mono-2.0.1-fix-wsdl-troubles-with-muine.patch,
+  +files/mono-2.0-mimeicon.patch, +files/mono-2.0-ppc-threading.patch,
+  -mono-1.1.16.1.ebuild, -mono-1.2.2.1.ebuild, -mono-1.2.3.1.ebuild,
+  -mono-1.2.4.ebuild, -mono-1.2.5.ebuild, -mono-1.2.5.1.ebuild,
+  -mono-1.2.6.ebuild, -mono-1.2.6-r1.ebuild, -mono-1.2.6-r2.ebuild,
+  -mono-1.9.ebuild, +mono-2.0.1.ebuild:
+  Bump for mono-2, remove crufty slag.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/mono-1.2.5-make-check.patch:
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 770d27d7dd88..bf08b97ca96f 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,43 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX mono-1.1.13-pathfix.diff 658 RMD160 855a6fc37cce70874024703061015f96654f0d0a SHA1 5b3d72d452d046f36c8c6921afc397945d86f5e3 SHA256 b185fb90134584a8f4be4f8180ae395ac74b73ff71cba7c76ddebdfd81254376
-AUX mono-1.2.4-make-check.patch 8184 RMD160 0480ab3ec8bf7f63ac33088f2d2a450a5d3eaa64 SHA1 f924390552cb1d9cb2e12e6e887c2a5915eac2f0 SHA256 5ea1c78fa43c1b3d41e98c7842b4c201f38dcc1c9a69ff5f2a295444550e6a02
 AUX mono-1.2.4-pic.patch 515 RMD160 7e6b6bf1bf4279881f5b03135d22f1bf488bed61 SHA1 fa8b18dde84c4305341fafafc88cda725dded3b1 SHA256 daab8ca27e5530d688ba611870c62d558be122781776aed8c0ecd97a56465a63
-AUX mono-1.2.5-make-check.patch 7074 RMD160 840c71ea50e3c8759a8b91c651ea5a554a580ecc SHA1 232e7613f94f8b7e49cac111d67096d81ee553af SHA256 9405a14744d24dc5d05b7ec1eedc12013afb5e534fb2084752965352a8c1c5f7
-AUX mono-1.2.5-remoting.patch 1798 RMD160 17f42b6d663ee80d86e71e3facc9630f36f4d4c6 SHA1 3fe189495abcac107318f08ee1e4c4a7ee8c6cc1 SHA256 42d29fa86fe92edb8cc24f4dc62f77d5f20075ecf97c211fc63a02ed91f5da8c
 AUX mono-1.2.6-bug-347359.patch 468 RMD160 9057edfe349ae587cc73d2a07011faf64e092095 SHA1 26e350f31c54f29d8e407cb4ea3d31333bafb83e SHA256 3ce69a3b5129bc0715eaa46213e28436acfeabdb11e35818a8a3be9ea7fd06c9
 AUX mono-1.2.6-threads-types-private-prototypes.patch 1341 RMD160 a0febde503971203d1ebf7f1274e42f95a5ed3b6 SHA1 b61bf000d7064cb76787954941696c17fa55c8d1 SHA256 0f5ac74f73817749de78c0d9435294bf148c11faef8c67729ce409493a7ee0ff
 AUX mono-1.9.1-glibc-2.8-deprecated-arg-max.patch 644 RMD160 e708d40581b1c354208dea3acafa749c1e3a0b58 SHA1 da9063b7444f29aff2387964d98724b085db3ffb SHA256 53bd15e556f5e41c029614fcba3be863c5c047a9d70bef6e6e3103ec5980cbae
+AUX mono-2.0-mimeicon.patch 2186 RMD160 11ab8a2cefb4fe408c95c43ca5656294e797c985 SHA1 5a11bc3367c1a32a76c853309cc429ba79f37502 SHA256 531365bf3033fe22b139239be9cb4f46ab2a84970f53bb2f13eaf4e23030625f
+AUX mono-2.0-ppc-threading.patch 498 RMD160 f1d72e8ac6549ef0cbddbb256b2323fbe2ee7695 SHA1 55a2b6b1aa729a5ebcae31bb822548c9ed59bf3b SHA256 f3b7a7c1435b0aa3a8f3216cfbf0b7ad18ff565b324f41492c6ae8412be313bd
+AUX mono-2.0.1-fix-wsdl-troubles-with-muine.patch 552 RMD160 2d0c75c9c26a997ead5bfbfa412447bfd16a1d1e SHA1 eec25804a179da8c7d38ee5a2783223d28033c79 SHA256 d38683b4037fb3cda08daec0840d0b0b617efd6f82e8bb9f468e744254d293e3
 AUX mono-biginteger_overflow.diff 848 RMD160 1f2cb38e577102943399459e2ef0f511dcad5209 SHA1 15203be56015aed4a9b63ca3ade01d3a22f4bae3 SHA256 adc10b8a97cbcb6b4758f7de041eee757259d55e1e2cbaf84a89e5ef83e46806
-DIST mono-1.1.16.1.tar.gz 19115095 RMD160 3ccf59d5e8f3e7ce74bccd495d7a8413a0fdce9c SHA1 fd68988e2d6002f4b631edfb8dee372bc9d979b3 SHA256 6404bd0b34c642bb159328486949424d7d51f444cfbed5c83ee5f4ee3ad34b0f
-DIST mono-1.2.2.1.tar.gz 19979026 RMD160 d55d5627bb3fe4b8c4e4640aecca32713cba3e7f SHA1 d956f293d297d4ee550c6877b6b468259dac126f SHA256 d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5
-DIST mono-1.2.3.1.tar.gz 20694945 RMD160 0dd046f12041553bc943269ef4e0a93f145c57ca SHA1 9de19e0a29ea47857090d9d2c19168f67152da41 SHA256 b177ced4e3ec0c2efc6a4e17f1f87f6e852f319332d4f138d25d4a68ffba2c78
-DIST mono-1.2.4.tar.bz2 17146737 RMD160 f8886b7690dde27c433484fcfaff1913c60a874a SHA1 b09aaf583f203cd6aaf511fb1f17ed356dbaa586 SHA256 780987a48256e6aff4206364a59f131a9aafbd5e3aa36694380d27b1d955176c
 DIST mono-1.2.5.1.tar.bz2 17492757 RMD160 8000374d9aaa3149599ba83079959303a6bae014 SHA1 c5f843cfdbb1d0114059c7d2d9ba2477529d22a8 SHA256 434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96
-DIST mono-1.2.5.tar.bz2 17503807 RMD160 aaef7d2d8940b917369eabe205c118d887e7ae32 SHA1 2ca60493d048b9fbef551e26ff00e9dbd4c80b96 SHA256 2eedf307600e057776cfc2801ac54cded4d5d595d32b549f3b781cc762ade1c6
 DIST mono-1.2.6.tar.bz2 18163130 RMD160 c6536b008cb73845943956c9ab365589a28c013c SHA1 f51f2e14d05313dba4b2d3fd5a47a9a3361ebeae SHA256 24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
 DIST mono-1.9.1.tar.bz2 18429855 RMD160 32659841ef5de912b8064f7b1f0452304ffd35d0 SHA1 a6229bb625dcdbcc992aef3f8049bf1b27205db7 SHA256 990af2fa20ad4e99ae5000df1afdb2e3b70400ba22d62e8917123d6a9d966397
-DIST mono-1.9.tar.bz2 18416956 RMD160 abc62137b738d9e84b8564018ffaa85cb76f45c3 SHA1 1008f1bacb04de9ff9f5d87808ab0c5fba577a9d SHA256 3fbd27d1ecd6c7202403fd765b56ef48202a572b549aa71ace1f351ad4182d6b
-EBUILD mono-1.1.16.1.ebuild 2839 RMD160 7185e23322d99e533cb264e94f04a8e8413d1715 SHA1 c451968dff5f63ac44fc01d6aff46ea5a7b1208a SHA256 cb1465b677c4c63b294fefa7b2afbf4860c0bde081b071202df0d23ab176dd28
-EBUILD mono-1.2.2.1.ebuild 3136 RMD160 6959854dfa8d354f2f2528da9e4e9e87f4f3f9a8 SHA1 8dddbd8cf81fde077c3a0900f328a4430d96801f SHA256 be7f4c984a6a5ec99ce467c575476057ba54a9ca5a4b4f220471c101c3a9c95f
-EBUILD mono-1.2.3.1.ebuild 3157 RMD160 736eb357a4beb1e9aff8ee874d2c572cab866e78 SHA1 c3150d876b3a9e97a748bb4f66463dda650cf5cd SHA256 91929b5ce18a0969ec657fc85527edf8c660418280cfc97fa3ae9a3f8a821108
-EBUILD mono-1.2.4.ebuild 3641 RMD160 77f25e5a0c7547b71323ce3ea3508fc1c0280dd7 SHA1 6f33e95456339c9fa08515a853d40fea26fe925a SHA256 80588a0f8fdad384f316bd549c44924984e8f211b348f79bcedd120596fff2c8
+DIST mono-2.0.1.tar.bz2 19385815 RMD160 ecada26dc398f0ea4cc4cae62885f4d1438bd540 SHA1 1c06d614b9b83ca0c8cff98d06136fd5a17344e2 SHA256 7089e8591ce793940d8a30f3ff5414437c32fc346fa918ec7f186516dab3e212
 EBUILD mono-1.2.5.1-r1.ebuild 3636 RMD160 329054cd7c5f9ac414229c479670eedc65542d5b SHA1 f248f71b77f1582a7a1e58c316cb2039595927b1 SHA256 85bdc359b2997ef55a9741e92a3423ccea7236befa88b34a7dd2cedab7811d3f
-EBUILD mono-1.2.5.1.ebuild 3583 RMD160 9069e018edd18945cc961dd0adf99e3e66de266a SHA1 dbdfdd3088f6e6cdfc87ef0b0d1c02d9fde85c7d SHA256 516d17a3440898ea3413683eb3ca447c998b22aadb5078de866c0e433efca64c
-EBUILD mono-1.2.5.ebuild 3647 RMD160 cbe5ec8265f34589122f08b9a33665760a6e7344 SHA1 92c2e032eafcc01d3bc36012a2d3cc13e121c87b SHA256 0bfd7f811b94c1daa9597e4f9a25e683a91a4f7f10beeb305a71acd9f21218ee
-EBUILD mono-1.2.6-r1.ebuild 3720 RMD160 28a317b87f35738fc075246923ceca6dd6f9e14f SHA1 75d41791ed72f049be44a964de68cdcefa173280 SHA256 3a9cfbf979e4b322c18568540cd2bcd58a0870047f17eb2260e1f41de5c768ad
-EBUILD mono-1.2.6-r2.ebuild 3842 RMD160 9fe9f573186c7251496986722191791dbf258cdc SHA1 d2cfb9ee32c862b395e9e2fe74a2e1cb75938323 SHA256 8eacf7d7e853051ca4ee277c774fa6dead0969d90f13993e76e8a2c6e09b4fa2
 EBUILD mono-1.2.6-r3.ebuild 3917 RMD160 6c680c414a4741fbfe2e20dd5b6120561de8c46d SHA1 8b32f6ca403becc675713fe84fad202255988e24 SHA256 915c05b51344c249c821191adb48568d4516689eff4937e4b4992088f8dfc0eb
-EBUILD mono-1.2.6.ebuild 3570 RMD160 f8bb1f38515d8a48ba0a1c1498cfe9dcd0a48968 SHA1 d6983276047fc1bd6515926ed373af67b2087bd2 SHA256 362b9c4c5efeab2430086cd874d9bb99be3f37d59918f81565eaf3a0a3ba3635
 EBUILD mono-1.9.1.ebuild 3667 RMD160 ea021f9d0d82c06e1284e839d71278a8d75d277e SHA1 6d0f9b58ab233bb77cc0478e6f88977ad46e8932 SHA256 4f2912b09f00d0ab408300eb9c26333f07d8804de9eaac8de19fd4bf1ea2e40f
-EBUILD mono-1.9.ebuild 3593 RMD160 9118083db80635819bd163053364dc0081d17733 SHA1 27052b56bd4506950a61e5ab3a7dd86570cec946 SHA256 a27845fcfa90fe413dd57a404f20b3cd87216c9444e7dadb5a5c29576c7f3cf5
-MISC ChangeLog 31225 RMD160 db4234a47d259db06bcb5d6dd35f7e1cda5d8be5 SHA1 086026c0a07336d69df9897aad46e4925bc871b5 SHA256 1a63a7bb4f42701fb5cd99ae978206a0c034236aa848bd1a8c46c208e19fe745
+EBUILD mono-2.0.1.ebuild 3364 RMD160 17c9e0e70f56874585902832630acadb956557fa SHA1 9c44ce31d145250bab0e8ac1ab5606a3f1efa4bd SHA256 0c0ff9d6e397a2b48654f0aba87121d5b1821d2965610096cd9a022ed1980e69
+MISC ChangeLog 31855 RMD160 de1149c526b3282bca152e9de2e7deb9656afcb7 SHA1 c69333f47a9bc1bbef46d5e0ce4f153974f24358 SHA256 4c46d1bd2d127e1b3e58ff355f492f2d57c09563d237774a0b932056d4e49377
 MISC metadata.xml 222 RMD160 cbf2224a6d16a37b2f8c4eff9ea28cd7e28fd84b SHA1 20ea003ff61f1c1570c4f7d38b539c05d8e27018 SHA256 6dbd789b6ca1020dbe527c49482c43505c294843e3e6aaf150165bc8d59b9189
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh2iAACgkQAiZjviIA2Xi7PwCfVhmgSRP0WKLM7NgfU6m9JbiG
-KiMAn0AVVu6MRW+0AOdP3Akjc/We5r9j
-=d6O2
------END PGP SIGNATURE-----
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.
+ 				}
+ 			}
+ 			
diff --git a/dev-lang/mono/mono-1.1.16.1.ebuild b/dev-lang/mono/mono-1.1.16.1.ebuild
deleted file mode 100644
index dbd02690be69..000000000000
--- a/dev-lang/mono/mono-1.1.16.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.16.1.ebuild,v 1.9 2008/05/19 09:48:24 drac Exp $
-
-inherit eutils mono flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com/"
-SRC_URI="http://www.go-mono.com/sources/mono-${PV:0:3}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nptl X"
-
-RDEPEND=">=dev-libs/glib-2
-	dev-libs/libxml2
-	X? ( >=dev-dotnet/libgdiplus-1.1.16 )
-	sys-devel/bc
-	!<dev-dotnet/pnet-0.6.12
-	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-	ppc? (
-		>=sys-devel/gcc-3.2.3-r4
-		>=sys-libs/glibc-2.3.3_pre20040420
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix munging of Unix paths
-	epatch "${FILESDIR}/${PN}-1.1.13-pathfix.diff"
-
-	# Install all our .dlls under $(libdir), not $(prefix)/lib
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:$(prefix)/lib:$(libdir):' \
-			-e 's:$(exec_prefix)/lib:$(libdir):' \
-			-e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-			"${S}"/{scripts,mono/metadata}/Makefile.am \
-			"${S}"/configure.in || die "sed failed"
-		sed -i -e 's:^libdir.*:libdir=@libdir@:' \
-			-e 's:${prefix}/lib/:${libdir}/:g' \
-			"${S}"/{scripts,}/*.pc.in || die "sed failed"
-	fi
-
-	# Remove the dummy ltconfig and leave to libtoolize handling it
-	rm -f "${S}/libgc/ltconfig"
-
-	eautoreconf
-}
-
-src_compile() {
-	strip-flags
-
-	local myconf="--with-preview=yes"
-
-	# Force __thread on amd64. See bug #83770
-	if use amd64
-	then
-		myconf="${myconf} --with-tls=__thread"
-	else
-		if use nptl
-		then
-			myconf="${myconf} --with-tls=__thread"
-		else
-			myconf="${myconf} --with-tls=pthread"
-		fi
-	fi
-
-	# Force the use of the monolite mcs, to prevent us from trying to build
-	# with old buggy classlibs/mcs versions. See bug #118062
-	touch "${S}/mcs/build/deps/use-monolite"
-
-	econf ${myconf} || die
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-	docinto docs
-	dodoc docs/*
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "This version of mono has changed the assembly version for"
-	ewarn "ICSharpCode.SharpZipLib, which may break some installed"
-	ewarn "applications such as monodoc. Please re-emerge monodoc and any"
-	ewarn "other packages you have which may make use of this library."
-}
diff --git a/dev-lang/mono/mono-1.2.2.1.ebuild b/dev-lang/mono/mono-1.2.2.1.ebuild
deleted file mode 100644
index febca844ae25..000000000000
--- a/dev-lang/mono/mono-1.2.2.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.2.1.ebuild,v 1.11 2008/03/02 19:34:27 compnerd Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X nptl"
-
-RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.2.2 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-PDEPEND="dev-dotnet/pe-format"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}/configure.in"        \
-	|| die "sed failed"
-
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                             \
-	|| die "sed failed"
-
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}/libgc/ltconfig"
-
-	einfo "Regenerating the build files, this will take some time..."
-	eautoreconf
-}
-
-src_compile() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		if use nptl ; then
-			myconf="${myconf} --with-tls=__thread"
-		else
-			myconf="${myconf} --with-tls=pthread"
-		fi
-	fi
-
-	# Enable large heaps if memory is more than >=3GB
-	if [[ $(get-memory-total) -ge 3145728 ]] ; then
-		myconf="${myconf} --with-large-heap=yes"
-	fi
-
-	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
-	touch "${S}/mcs/build/deps/use-monolite"
-
-	econf ${myconf} || die "configure failed"
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.2.3.1.ebuild b/dev-lang/mono/mono-1.2.3.1.ebuild
deleted file mode 100644
index d0781cf041ea..000000000000
--- a/dev-lang/mono/mono-1.2.3.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.3.1.ebuild,v 1.8 2008/03/02 19:34:27 compnerd Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X nptl"
-
-RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.2.3 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-PDEPEND="dev-dotnet/pe-format"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}/configure.in"        \
-	|| die "sed failed"
-
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                               \
-	|| die "sed failed"
-
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}/libgc/ltconfig"
-
-	einfo "Regenerating the build files, this will take some time..."
-	eautoreconf
-}
-
-src_compile() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		if use nptl ; then
-			myconf="${myconf} --with-tls=__thread"
-		else
-			myconf="${myconf} --with-tls=pthread"
-		fi
-	fi
-
-	# Enable large heaps if memory is more than >=3GB
-	if [[ $(get-memory-total) -ge 3145728 ]] ; then
-		myconf="${myconf} --with-large-heap=yes"
-	fi
-
-	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
-	touch "${S}/mcs/build/deps/use-monolite"
-
-	econf ${myconf} || die "configure failed"
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.2.4.ebuild b/dev-lang/mono/mono-1.2.4.ebuild
deleted file mode 100644
index b508e971caf7..000000000000
--- a/dev-lang/mono/mono-1.2.4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.4.ebuild,v 1.13 2008/03/02 19:34:27 compnerd Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86 ~x86-fbsd"
-IUSE="X nptl"
-
-RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.2.4 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-PDEPEND="dev-dotnet/pe-format"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}/configure.in"        \
-	|| die "sed failed"
-
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                               \
-	|| die "sed failed"
-
-	epatch "${FILESDIR}/${P}-make-check.patch" || die "patch failed"
-	epatch "${FILESDIR}/${P}-pic.patch" || die "patch failed"
-
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}/libgc/ltconfig"
-
-	einfo "Regenerating the build files, this will take some time..."
-	eautoreconf
-}
-
-src_compile() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 || use nptl ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	fi
-
-	# Enable large heaps if memory is more than >=3GB
-	if [[ $(get-memory-total) -ge 3145728 ]] ; then
-		myconf="${myconf} --with-large-heap=yes"
-	fi
-
-	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
-	touch "${S}/mcs/build/deps/use-monolite"
-
-	econf ${myconf} || die "configure failed"
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_test() {
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	mkdir -p "${T}/home/mono" || die "mkdir home failed"
-
-	export HOME="${T}/home/mono"
-	export XDG_CONFIG_HOME="${T}/home/mono"
-	export XDG_DATA_HOME="${T}/home/mono"
-
-	if ! LC_ALL=C emake -j1 check; then
-		hasq test $FEATURES && die "Make check failed. See above for details."
-		hasq test $FEATURES || eerror "Make check failed. See above for details."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.2.5.1.ebuild b/dev-lang/mono/mono-1.2.5.1.ebuild
deleted file mode 100644
index aa8ae21677c0..000000000000
--- a/dev-lang/mono/mono-1.2.5.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.5.1.ebuild,v 1.2 2008/03/02 19:34:27 compnerd Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X nptl"
-
-RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.2.4 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-PDEPEND="dev-dotnet/pe-format"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}/configure.in"        \
-	|| die "sed failed"
-
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                             \
-	|| die "sed failed"
-
-	epatch "${FILESDIR}/${PN}-1.2.4-pic.patch" || die "patch failed"
-
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}/libgc/ltconfig"
-
-	einfo "Regenerating the build files, this will take some time..."
-	eautoreconf
-}
-
-src_compile() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 || use nptl ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	fi
-
-	# Enable large heaps if memory is more than >=3GB
-	if [[ $(get-memory-total) -ge 3145728 ]] ; then
-		myconf="${myconf} --with-large-heap=yes"
-	fi
-
-	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
-	touch "${S}/mcs/build/deps/use-monolite"
-
-	econf ${myconf} || die "configure failed"
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_test() {
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	mkdir -p "${T}/home/mono" || die "mkdir home failed"
-
-	export HOME="${T}/home/mono"
-	export XDG_CONFIG_HOME="${T}/home/mono"
-	export XDG_DATA_HOME="${T}/home/mono"
-
-	if ! LC_ALL=C emake -j1 check; then
-		hasq test $FEATURES && die "Make check failed. See above for details."
-		hasq test $FEATURES || eerror "Make check failed. See above for details."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.2.5.ebuild b/dev-lang/mono/mono-1.2.5.ebuild
deleted file mode 100644
index 69126844ed6f..000000000000
--- a/dev-lang/mono/mono-1.2.5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.5.ebuild,v 1.3 2008/03/02 19:34:27 compnerd Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X nptl"
-
-RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.2.4 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-PDEPEND="dev-dotnet/pe-format"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}/configure.in"        \
-	|| die "sed failed"
-
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                             \
-	|| die "sed failed"
-
-	epatch "${FILESDIR}/${P}-make-check.patch" || die "patch failed"
-	epatch "${FILESDIR}/${PN}-1.2.4-pic.patch" || die "patch failed"
-
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}/libgc/ltconfig"
-
-	einfo "Regenerating the build files, this will take some time..."
-	eautoreconf
-}
-
-src_compile() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 || use nptl ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	fi
-
-	# Enable large heaps if memory is more than >=3GB
-	if [[ $(get-memory-total) -ge 3145728 ]] ; then
-		myconf="${myconf} --with-large-heap=yes"
-	fi
-
-	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
-	touch "${S}/mcs/build/deps/use-monolite"
-
-	econf ${myconf} || die "configure failed"
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_test() {
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	mkdir -p "${T}/home/mono" || die "mkdir home failed"
-
-	export HOME="${T}/home/mono"
-	export XDG_CONFIG_HOME="${T}/home/mono"
-	export XDG_DATA_HOME="${T}/home/mono"
-
-	if ! LC_ALL=C emake -j1 check; then
-		hasq test $FEATURES && die "Make check failed. See above for details."
-		hasq test $FEATURES || eerror "Make check failed. See above for details."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.2.6-r1.ebuild b/dev-lang/mono/mono-1.2.6-r1.ebuild
deleted file mode 100644
index 1a0be5959a62..000000000000
--- a/dev-lang/mono/mono-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.6-r1.ebuild,v 1.1 2008/01/02 06:13:22 jurek Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X nptl"
-
-RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.2.4 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-PDEPEND="dev-dotnet/pe-format"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}"/configure.in            \
-	|| die "sed failed"
-
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                               \
-	|| die "sed failed"
-
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}"/libgc/ltconfig
-
-	epatch "${FILESDIR}"/mono-biginteger_overflow.diff
-
-	# Fixes bug #202358, see
-	# https://bugzilla.novell.com/show_bug.cgi?id=349952
-	epatch "${FILESDIR}"/${P}-threads-types-private-prototypes.patch
-
-	einfo "Regenerating the build files, this will take some time..."
-	eautoreconf
-}
-
-src_compile() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 || use nptl ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	fi
-
-	# Enable large heaps if memory is more than >=3GB
-	if [[ $(get-memory-total) -ge 3145728 ]] ; then
-		myconf="${myconf} --with-large-heap=yes"
-	fi
-
-	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
-	touch "${S}"/mcs/build/deps/use-monolite
-
-	econf ${myconf} || die "configure failed"
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_test() {
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	mkdir -p "${T}/home/mono" || die "mkdir home failed"
-
-	export HOME="${T}/home/mono"
-	export XDG_CONFIG_HOME="${T}/home/mono"
-	export XDG_DATA_HOME="${T}/home/mono"
-
-	if ! LC_ALL=C emake -j1 check; then
-		hasq test $FEATURES && die "Make check failed. See above for details."
-		hasq test $FEATURES || eerror "Make check failed. See above for details."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.2.6-r2.ebuild b/dev-lang/mono/mono-1.2.6-r2.ebuild
deleted file mode 100644
index fd24aa8610d2..000000000000
--- a/dev-lang/mono/mono-1.2.6-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.6-r2.ebuild,v 1.2 2008/03/02 19:19:49 compnerd Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X nptl"
-
-RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.2.4 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-PDEPEND="dev-dotnet/pe-format"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}"/configure.in        \
-	|| die "sed failed"
-
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                             \
-	|| die "sed failed"
-
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}"/libgc/ltconfig
-
-	epatch "${FILESDIR}"/mono-biginteger_overflow.diff
-
-	# Fixes bug #202358, see
-	# https://bugzilla.novell.com/show_bug.cgi?id=349952
-	epatch "${FILESDIR}"/${P}-threads-types-private-prototypes.patch
-
-	# Fixes bug #210429, see
-	# https://bugzilla.novell.com/show_bug.cgi?id=347359
-	epatch "${FILESDIR}/${P}-bug-347359.patch"
-
-	einfo "Regenerating the build files, this will take some time..."
-	eautoreconf
-}
-
-src_compile() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 || use nptl ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	fi
-
-	# Enable large heaps if memory is more than >=3GB
-	if [[ $(get-memory-total) -ge 3145728 ]] ; then
-		myconf="${myconf} --with-large-heap=yes"
-	fi
-
-	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
-	touch "${S}"/mcs/build/deps/use-monolite
-
-	econf ${myconf} || die "configure failed"
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_test() {
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	mkdir -p "${T}/home/mono" || die "mkdir home failed"
-
-	export HOME="${T}/home/mono"
-	export XDG_CONFIG_HOME="${T}/home/mono"
-	export XDG_DATA_HOME="${T}/home/mono"
-
-	if ! LC_ALL=C emake -j1 check; then
-		hasq test $FEATURES && die "Make check failed. See above for details."
-		hasq test $FEATURES || eerror "Make check failed. See above for details."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.2.6.ebuild b/dev-lang/mono/mono-1.2.6.ebuild
deleted file mode 100644
index 5686cd3937cc..000000000000
--- a/dev-lang/mono/mono-1.2.6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.6.ebuild,v 1.1 2007/12/14 19:59:25 jurek Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X nptl"
-
-RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.2.4 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-PDEPEND="dev-dotnet/pe-format"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}"/configure.in            \
-	|| die "sed failed"
-
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                               \
-	|| die "sed failed"
-
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}"/libgc/ltconfig
-
-	epatch "${FILESDIR}"/mono-biginteger_overflow.diff
-
-	einfo "Regenerating the build files, this will take some time..."
-	eautoreconf
-}
-
-src_compile() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 || use nptl ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	fi
-
-	# Enable large heaps if memory is more than >=3GB
-	if [[ $(get-memory-total) -ge 3145728 ]] ; then
-		myconf="${myconf} --with-large-heap=yes"
-	fi
-
-	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
-	touch "${S}"/mcs/build/deps/use-monolite
-
-	econf ${myconf} || die "configure failed"
-	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
-
-	if [[ "$?" -ne "0" ]]; then
-		ewarn "If you are using any hardening features such as"
-		ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason"
-		ewarn "why build has failed. In this case turn any active security"
-		ewarn "enhancements off and try emerging the package again"
-		die
-	fi
-}
-
-src_test() {
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	mkdir -p "${T}/home/mono" || die "mkdir home failed"
-
-	export HOME="${T}/home/mono"
-	export XDG_CONFIG_HOME="${T}/home/mono"
-	export XDG_DATA_HOME="${T}/home/mono"
-
-	if ! LC_ALL=C emake -j1 check; then
-		hasq test $FEATURES && die "Make check failed. See above for details."
-		hasq test $FEATURES || eerror "Make check failed. See above for details."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.9.ebuild b/dev-lang/mono/mono-2.0.1.ebuild
index b7424a6b9e8b..aa6721bcff33 100644
--- a/dev-lang/mono/mono-1.9.ebuild
+++ b/dev-lang/mono/mono-2.0.1.ebuild
@@ -1,60 +1,58 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.9.ebuild,v 1.2 2008/05/31 12:31:14 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.0.1.ebuild,v 1.1 2008/11/19 22:34:44 loki_val Exp $
 
-inherit eutils flag-o-matic multilib autotools
+inherit base eutils flag-o-matic multilib autotools
 
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com"
-SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2"
+SRC_URI="ftp://ftp.novell.com/pub/mono/sources/mono/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 LGPL-2 X11 )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="X nptl moonlight"
+IUSE=""
 
 RDEPEND="!<dev-dotnet/pnet-0.6.12
-		 >=dev-libs/glib-2.6
-		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-		 ppc?	(
-					>=sys-devel/gcc-3.2.3-r4
-					>=sys-libs/glibc-2.3.3_pre20040420
-				)
-		 X? ( >=dev-dotnet/libgdiplus-1.9 )"
+		>=dev-libs/glib-2.6
+		=dev-dotnet/libgdiplus-${PV%%.*}*"
 DEPEND="${RDEPEND}
-		  sys-devel/bc
+		sys-devel/bc
 		>=dev-util/pkgconfig-0.19"
 PDEPEND="dev-dotnet/pe-format"
 
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
 RESTRICT="test"
 
+#Threading and mimeicon patches from Fedora CVS. Muine patch from Novell.
+
+PATCHES=(	"${FILESDIR}/${PN}-biginteger_overflow.diff"
+		"${FILESDIR}/${PN}-2.0-ppc-threading.patch"
+		"${FILESDIR}/${PN}-2.0-mimeicon.patch"
+		"${FILESDIR}/${P}-fix-wsdl-troubles-with-muine.patch" )
+
+
 function get-memory-total() {
 	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
 }
 
 src_unpack() {
-	unpack ${A}
+	base_src_unpack
 	cd "${S}"
 
 	# Fix the install path, install into $(libdir)
-	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
-		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
-		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}"/configure.in        \
+	sed -i	-e 's:$(prefix)/lib:$(libdir):'						\
+		-e 's:$(exec_prefix)/lib:$(libdir):'					\
+		-e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":"	\
+		"${S}"/{scripts,mono/metadata}/Makefile.am "${S}"/configure.in		\
 	|| die "sed failed"
 
-	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
-		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
-		"${S}"/{scripts,}/*.pc.in                                             \
+	sed -i	-e 's:^libdir.*:libdir=@libdir@:'					\
+		-e 's:${prefix}/lib/:${libdir}/:g'					\
+		"${S}"/{scripts,}/*.pc.in						\
 	|| die "sed failed"
 
-	# Remove dummy ltconfig and let libtool handle it
-	rm -f "${S}"/libgc/ltconfig
-
-	epatch "${FILESDIR}/${PN}-biginteger_overflow.diff"
+	#For libtool-1 compat
+	rm -f lt*.m4 libtool.m4
 
 	einfo "Regenerating the build files, this will take some time..."
 	eautoreconf
@@ -64,16 +62,8 @@ src_compile() {
 	# mono's build system is finiky, strip the flags
 	strip-flags
 
-	# Enable the 2.0 FX, use the system glib and the gc
-	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
-
-	# Threading support
-	if use amd64 || use nptl ; then
-		# force __thread on amd64 (bug #83770)
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	fi
+	#Remove this at your own peril. Mono will barf in unexpected ways.
+	append-flags -fno-strict-aliasing
 
 	# Enable large heaps if memory is more than >=3GB
 	if [[ $(get-memory-total) -ge 3145728 ]] ; then
@@ -83,7 +73,15 @@ src_compile() {
 	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
 	touch "${S}"/mcs/build/deps/use-monolite
 
-	econf ${myconf} $(use_with moonlight) || die "configure failed"
+	econf	${myconf} \
+		--with-moonlight \
+		--with-preview=yes \
+		--with-glib=system \
+		--with-gc=included \
+		--with-libgdiplus=installed \
+		--with-tls=__thread \
+		--with-ikvm=yes \
+		--with-jit=yes
 	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
 
 	if [[ "$?" -ne "0" ]]; then