Fix security problem, bug #372983 by Tim Sammut. Remove old.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

14 files changed, 62 insertions, 873 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 0f17d148aac2..701e7f1ff1aa 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-lang/mono
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.222 2011/06/30 14:16:12 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.223 2011/07/04 11:27:20 pacho Exp $
+
+*mono-2.10.2-r1 (04 Jul 2011)
+
+  04 Jul 2011; Pacho Ramos <pacho@gentoo.org> -files/mono-2.2-libdir126.patch,
+  -files/mono-2.2-ppc-threading.patch, -files/mono-2.2-uselibdir.patch,
+  -files/mono-2.6.4-require-glib.patch, -mono-2.6.7.ebuild,
+  -files/mono-2.8.1-radegast-crash.patch, -mono-2.8.2-r1.ebuild,
+  -files/mono-2.8-libdir.patch, -mono-2.10.1-r1.ebuild,
+  -files/mono-2.10.1-libdir.patch, +mono-2.10.2-r1.ebuild,
+  +files/mono-2.10.2-threads-access.patch:
+  Fix security problem, bug #372983 by Tim Sammut. Remove old.
 
   30 Jun 2011; Christoph Mende <angelos@gentoo.org> mono-2.10.2.ebuild:
   Stable on amd64 wrt bug #371163
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 613be2df6e4b..dcc52b169d7a 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX mono-2.10.1-libdir.patch 2467 RMD160 3a6bc529fc8188405144bec106cee63c8dae5b71 SHA1 bddb8ba2eea84b5f484248477e106df36c1039cf SHA256 82898532790db535694ba1945f6ed6be1ad194e3db4bface6299988570223d8d
 AUX mono-2.10.1-ppc-len.patch 302 RMD160 61a016d2647b443b0e605df5532ba9c0b22cdb96 SHA1 e8cff140de0983f00473aff5d11aa162da22f61a SHA256 9882bc94999af095b106d45d31ed103e9902a8fa6e88e478e62bc5f7e0b4b5e2
-AUX mono-2.2-libdir126.patch 2788 RMD160 931e034c90accc2058596714d7ec07d138a77575 SHA1 7807f1d3e28c82ac0292cec2f49e063898a5d0cb SHA256 2d3de73c7aa6fdc90ddec67fc814910f40d6d8ed52ec918397ca9f5ac219c6a1
-AUX mono-2.2-ppc-threading.patch 563 RMD160 2ed9822034a966e31cc90312c09e4fec70951d38 SHA1 3dda8a39085fddec0b0e25e31743d49762575605 SHA256 b2a708fc4ec8b886bf095c0d5eacbfdb8c08e1bc58442cfb6fd116f93de466a7
-AUX mono-2.2-uselibdir.patch 714 RMD160 fb0478a9923c5de30b6f71fa1c1cad9703e3dc8c SHA1 790e357aaccb87cb76f08a1c12e16a8804e23b58 SHA256 0d97639d48e9a40847f1053799d00827323df0af615fdf26254a03f069123b03
-AUX mono-2.6.4-require-glib.patch 458 RMD160 312ffe40e55ae726ab2bdb8b323cfb110abf804a SHA1 4c1979a940bf550fcafbaa29a11470fa7e55eac1 SHA256 fc27512f901920a72c5e7744ecef134ed9081d2f2ff689e1af2f48f6fe9a6028
-AUX mono-2.8-libdir.patch 2721 RMD160 9a694e1a373fb3f18c79a75e76aaa4abbfbc283f SHA1 4ca811b882b2f9a6045cfe516cace7badb419c2d SHA256 58424336e2ff348fe9ad6f279936cd90e8ad918196382654bfb7fd60b7c928fc
-AUX mono-2.8.1-radegast-crash.patch 554 RMD160 178225b9a8afe118a478752a2d2ce3a358212381 SHA1 34e80ec5691d1f4f481a2c070de2e8f364bdf506 SHA256 6cf9a2adb3e6e1f6daf2a8c578a060e7a1598967116ad72af877d3a693b3c527
+AUX mono-2.10.2-threads-access.patch 1156 RMD160 46d2de409d374502f614c048ced9c37547e07b95 SHA1 f913bcafefa8043d6dcd41a25f547a647514c8e8 SHA256 3f2f91068abb16edc655006262cc19156a28594111aef97f5ff4d98125a1b87d
 DIST mono-2.10.1.tar.bz2 33483937 RMD160 3c9acc54d1df0f63ee546bf47bed3ca53b3f679e SHA1 234ee4eca6c80dda9d8fe955f3aafa25530921a7 SHA256 31a573b114bfb85a4283a7d6252addef5ae9d9431134a623723272b247d3cc76
 DIST mono-2.10.2.tar.bz2 33737282 RMD160 bac1ecb7e94c77341ae5f15f8d59141f9eb4aa38 SHA1 7b673255c6b17c5a41c15059e5f068d6a970d2ea SHA256 9614472aa131e61bcdbf2fc48ab7a123ea57a10e736def5136a478465afa06b4
-DIST mono-2.6.7.tar.bz2 27921963 RMD160 5825ad284e4123e4ddb8933637a3dbf5f57f7f5a SHA1 6528c009d344a21eb0898876369222a7fff76838 SHA256 ae21a997d72e2fb8ea88644c87ab52471e9c97117b937e205ea1835b5a028ce4
-DIST mono-2.8.2.tar.bz2 31292886 RMD160 8536c1c9a481ece2ba254a7c943353f9ade66a84 SHA1 4223a40706b422c44be5eb1c89b4f316026a02a5 SHA256 e33409ea5e8d581b60a2b73587d9d94a283b39c6406f9d348badcbdb253381bb
-EBUILD mono-2.10.1-r1.ebuild 7771 RMD160 9d6122e6006f4b081c649734b32be47184e3accb SHA1 cd1d510d98476f7359187dce36275e61d3b92ed3 SHA256 efff5f91bc571b30494de35a03625c3a6b8d9bb98792272728f2a4f053f30da6
 EBUILD mono-2.10.1-r2.ebuild 7509 RMD160 80472b5bfca202cb7bdb39ea53f1b33eae0e9250 SHA1 4049a425055d7c90d64e1830d215e7cb17aea539 SHA256 d8d12ed9cbce8e760a129007cb201cf18f493502c1a114118057c1427d41e7a1
+EBUILD mono-2.10.2-r1.ebuild 7525 RMD160 697fbb39929323b542a593796f40a6d1bb0c6f7f SHA1 5b5ed49076610f53cfe9e75b961a4b71dfb01069 SHA256 502168787ec5743b6ba5f54276c5c0096a2831f129f627253124c65fc58b144a
 EBUILD mono-2.10.2.ebuild 7461 RMD160 3115fa667c967b0b85c5ba90ff2650b67168c8d3 SHA1 a7b3f9f99b3d536c27f4d6c8e7643855a60fde00 SHA256 82a59f131abcebba4032749255be766885d4c933496105ceee935f47103e6444
-EBUILD mono-2.6.7.ebuild 7564 RMD160 e83f25ce2d6bb38ecba81d86e96958a5ea7567d7 SHA1 a12f62b9decdc1c6ed93b6c6fbe4659d16e8074f SHA256 e8cbfd812e094cdd45149873461e5618be424219b5a6b7251e6f1d4371a09fed
-EBUILD mono-2.8.2-r1.ebuild 8187 RMD160 39bceb17278f67ebeb4f7b20e4597436c54e1936 SHA1 f43b70a840f2c7addfb87fe405bbb924c722ac5e SHA256 85452792f1fdd0813153c53a85be0a60074fb850e2f9539d0bc51e0ed96e9333
-MISC ChangeLog 46456 RMD160 d31f7040550d67d92e8bfb574830df238d72afb6 SHA1 782f46708e4a7767218cd9228c2b1761e721d9a2 SHA256 e6573dcde8f1f25508fd33ca5e3020425ad22ca5293cf701ba2a380149f6c83d
-MISC metadata.xml 484 RMD160 862882f919ccc94b3fbdcdb6d6218b0969fec187 SHA1 42a61b9a60f03068d6601262f26e5a6fde463022 SHA256 2953e2de5e3ec6d0a69e9b8e145e0b27fb43dc7e3d59ef6a546c15fbc960631d
+MISC ChangeLog 46983 RMD160 a15fbdda636efe215e504f0fae592e07aa50f049 SHA1 eb42bf79d4865d20e156e2a430e57e787e009daa SHA256 06e83ca3c517126e2734fbf7705503430006cd84caadf606c73f6fb4a3b35d8f
+MISC metadata.xml 310 RMD160 590f8d057a532f9fdb31d9aa99cf78bc5525f42b SHA1 0d5324433bbfa0be649100139a3bd63507d34d83 SHA256 e393ea4330ca0007ea9612933a869a7df743b15df3f4223b94d38348ac274805
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4MhTEACgkQmWq1bYTyC0OLwAEApDJsP0Jigc/HX0MCeOzEHBQy
-l/4mQwoFtQH03Dbfc0QA/Rz/Qw0F9HuDsaKJ3jevlPgODlVJSccjBAyd5joJ0T74
-=7DGB
+iEYEARECAAYFAk4Ro54ACgkQCaWpQKGI+9QKrgCcCVnFC5lZqftIztqa25EWXVUL
+eNYAnjZrf0U9Bu7tCm3hAyL7In8du5Mq
+=BPlN
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mono/files/mono-2.10.1-libdir.patch b/dev-lang/mono/files/mono-2.10.1-libdir.patch
deleted file mode 100644
index 8d6dd8197702..000000000000
--- a/dev-lang/mono/files/mono-2.10.1-libdir.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- mcs/tools/gacutil/driver.cs~	2011-02-23 20:21:01.000000000 +0100
-+++ mcs/tools/gacutil/driver.cs	2011-02-27 11:46:39.000000000 +0100
-@@ -808,7 +808,7 @@
- 		private static string EnsureLib (string dir)
- 		{
- 			DirectoryInfo d = new DirectoryInfo (dir);
--			if (d.Name == "lib")
-+			if (d.Name == "lib" || d.Name == "@MONOLIBDIR@")
- 				return dir;
- 			return Path.Combine (dir, "lib");
- 		}
---- mono/metadata/assembly.c~	2011-02-23 20:21:01.000000000 +0100
-+++ mono/metadata/assembly.c	2011-02-27 11:49:38.000000000 +0100
-@@ -597,7 +597,7 @@
- 	}
- 
- 	config = g_build_filename (base, "etc", NULL);
--	lib = g_build_filename (base, "lib", NULL);
-+	lib = g_build_filename (base, "@MONOLIBDIR@", NULL);
- 	mono = g_build_filename (lib, "mono/2.0", NULL);
- 	if (stat (mono, &buf) == -1)
- 		fallback ();
-@@ -652,7 +652,7 @@
- 
- 	bindir = g_path_get_dirname (resolvedname);
- 	installdir = g_path_get_dirname (bindir);
--	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL);
-+	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "@MONOLIBDIR@", NULL);
- 
- 	config = g_build_filename (root, "..", "etc", NULL);
- #ifdef HOST_WIN32
-@@ -2155,7 +2155,7 @@
- 	if (extra_gac_paths) {
- 		paths = extra_gac_paths;
- 		while (!res && *paths) {
--			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
-+			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL);
- 			res = probe_for_partial_name (gacpath, fullname, aname, status);
- 			g_free (gacpath);
- 			paths++;
-@@ -2206,7 +2206,7 @@
- 		if (*gp != G_DIR_SEPARATOR)
- 			continue;
- 		gp++;
--		if (strncmp (gp, "lib", 3))
-+		if (strncmp (gp, "@MONOLIBDIR@", 3))
- 			continue;
- 		gp += 3;
- 		if (*gp != G_DIR_SEPARATOR)
-@@ -2285,7 +2285,7 @@
- 		paths = extra_gac_paths;
- 		while (!image && *paths) {
- 			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
--					"lib", "mono", "gac", subpath, NULL);
-+					"@MONOLIBDIR@", "mono", "gac", subpath, NULL);
- 			image = mono_image_open (fullpath, NULL);
- 			g_free (fullpath);
- 			paths++;
-@@ -2591,7 +2591,7 @@
- 	if (extra_gac_paths) {
- 		paths = extra_gac_paths;
- 		while (!result && *paths) {
--			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
-+			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL);
- 			result = mono_assembly_open_full (fullpath, status, refonly);
- 			g_free (fullpath);
- 			paths++;
diff --git a/dev-lang/mono/files/mono-2.10.2-threads-access.patch b/dev-lang/mono/files/mono-2.10.2-threads-access.patch
new file mode 100644
index 000000000000..d677b0113e2d
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.10.2-threads-access.patch
@@ -0,0 +1,40 @@
+From 722f9890f09aadfc37ae479e7d946d5fc5ef7b91 Mon Sep 17 00:00:00 2001
+From: Sebastien Pouliot <sebastien@ximian.com>
+Date: Wed, 6 Apr 2011 13:24:31 -0400
+Subject: [PATCH] Fix access to freed members of a dead thread
+
+* threads.c: Fix access to freed members of a dead thread. Found
+and fixed by Rodrigo Kumpera <rkumpera@novell.com>
+Ref: CVE-2011-0992
+---
+ mono/metadata/threads.c |   11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
+index 3fe4e93..a7a721d 100644
+--- a/mono/metadata/threads.c
++++ b/mono/metadata/threads.c
+@@ -1036,12 +1036,17 @@ void ves_icall_System_Threading_InternalThread_Thread_free_internal (MonoInterna
+ 		CloseHandle (thread);
+ 
+ 	if (this->synch_cs) {
+-		DeleteCriticalSection (this->synch_cs);
+-		g_free (this->synch_cs);
++		CRITICAL_SECTION *synch_cs = this->synch_cs;
+ 		this->synch_cs = NULL;
++		DeleteCriticalSection (synch_cs);
++		g_free (synch_cs);
+ 	}
+ 
+-	g_free (this->name);
++	if (this->name) {
++		void *name = this->name;
++		this->name = NULL;
++		g_free (name);
++	}
+ }
+ 
+ static void mono_thread_start (MonoThread *thread)
+-- 
+1.7.5.4
+
diff --git a/dev-lang/mono/files/mono-2.2-libdir126.patch b/dev-lang/mono/files/mono-2.2-libdir126.patch
deleted file mode 100644
index ef0772552378..000000000000
--- a/dev-lang/mono/files/mono-2.2-libdir126.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-# Allows us to use lib64/lib32 as path for GAC. Snatched from Fedora,
-# altered to be easily sedded.
-# Sed this file to have the proper libdir:
-# sed -i -e "s:@MONOLIBDIR@:$(get_libdir):" FILENAME 
-# http://cvs.fedoraproject.org/viewvc/rpms/mono/devel/mono-libdir-126.patch?view=log
-
-Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
-===================================================================
---- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile
-+++ mono-1.1.16/mcs/tools/cilc/res-Makefile
-@@ -2,7 +2,7 @@ include defs.mk
- 
- LIBNAME = $(shell echo $(basename $(SONAME)) | sed -e 's/^lib//')
- HTARGET = $(prefix)/include/$(LIBNAME)/
--LIBTARGET = $(prefix)/lib/
-+LIBTARGET = $(libdir)
- 
- CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
- 
---- mono-1.1.16.1/mono/metadata/assembly.c.libdir	2006-08-17 17:52:42.000000000 +0200
-+++ mono-1.1.16.1/mono/metadata/assembly.c	2006-08-17 17:56:21.000000000 +0200
-@@ -521,7 +521,7 @@
- 	}
- 
- 	config = g_build_filename (base, "etc", NULL);
--	lib = g_build_filename (base, "lib", NULL);
-+	lib = g_build_filename (base, "@MONOLIBDIR@", NULL);
- 	mono = g_build_filename (lib, "mono/1.0", NULL);
- 	if (stat (mono, &buf) == -1)
- 		fallback ();
-@@ -1844,7 +1844,7 @@
- 	if (extra_gac_paths) {
- 		paths = extra_gac_paths;
- 		while (!res && *paths) {
--			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
-+			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL);
- 			res = probe_for_partial_name (gacpath, fullname, aname, status);
- 			g_free (gacpath);
- 			paths++;
-@@ -1908,7 +1908,7 @@
- 		paths = extra_gac_paths;
- 		while (!image && *paths) {
- 			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
--					"lib", "mono", "gac", subpath, NULL);
-+					"@MONOLIBDIR@", "mono", "gac", subpath, NULL);
- 			image = mono_image_open (fullpath, NULL);
- 			g_free (fullpath);
- 			paths++;
-@@ -2058,7 +2058,7 @@
- 	if (extra_gac_paths) {
- 		paths = extra_gac_paths;
- 		while (!result && *paths) {
--			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
-+			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL);
- 			result = mono_assembly_open_full (fullpath, status, refonly);
- 			g_free (fullpath);
- 			paths++;
---- mono-1.1.16.1/mcs/tools/gacutil/driver.cs.libdir	2006-08-17 15:40:14.000000000 +0200
-+++ mono-1.1.16.1/mcs/tools/gacutil/driver.cs	2006-08-17 15:40:19.000000000 +0200
-@@ -667,7 +667,7 @@
- 		private static string EnsureLib (string dir)
- 		{
- 			DirectoryInfo d = new DirectoryInfo (dir);
--			if (d.Name == "lib")
-+			if (d.Name == "lib" || d.Name == "@MONOLIBDIR@")
- 				return dir;
- 			return Path.Combine (dir, "lib");
- 		}
diff --git a/dev-lang/mono/files/mono-2.2-ppc-threading.patch b/dev-lang/mono/files/mono-2.2-ppc-threading.patch
deleted file mode 100644
index ca999f675f17..000000000000
--- a/dev-lang/mono/files/mono-2.2-ppc-threading.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#Binds ppc to use only one core to workaround threading problems for ppc.
-http://cvs.fedoraproject.org/viewvc/rpms/mono/devel/mono-2.2-ppc-threading.patch?view=log
-
---- mono-2.2/mono/mini/main.c	2008-11-18 19:00:26.000000000 +0000
-+++ mono-2.2/mono/mini/main-new.c	2008-11-18 19:16:11.000000000 +0000
-@@ -26,10 +26,14 @@
- }
- 
- #else
--
-+#include <sched.h>
- int
- main (int argc, char* argv[])
- {
-+#ifdef __powerpc__
-+  unsigned long mask = 1;
-+  sched_setaffinity(0, sizeof(mask), &mask);
-+#endif
- 	mono_build_date = build_date;
- 	return mono_main (argc, argv);
- }
diff --git a/dev-lang/mono/files/mono-2.2-uselibdir.patch b/dev-lang/mono/files/mono-2.2-uselibdir.patch
deleted file mode 100644
index f6d9615a1fc5..000000000000
--- a/dev-lang/mono/files/mono-2.2-uselibdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#Fixes problem with monodoc and libdir
-http://cvs.fedoraproject.org/viewvc/rpms/mono/devel/mono-2.2-uselibdir.patch?view=log
-
---- mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs	2008-08-03 07:58:47.000000000 +0100
-+++ mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper-new.cs	2008-08-03 08:06:47.000000000 +0100
-@@ -53,10 +53,10 @@
- 			//xbuildDir = Path.Combine (t2.FullName, "xbuild");
- 			// /usr/local/lib
- 			t3 = t2.Parent;
-+			libDir = t3.FullName;
- 			// /usr/local
- 			t4 = t3.Parent;
- 			binDir = Path.Combine (t4.FullName, "bin");
--			libDir = Path.Combine (t4.FullName, "lib");
- 		}
- 	
- 		internal static string GetBinDir ()
-
diff --git a/dev-lang/mono/files/mono-2.6.4-require-glib.patch b/dev-lang/mono/files/mono-2.6.4-require-glib.patch
deleted file mode 100644
index abd703cb2ae9..000000000000
--- a/dev-lang/mono/files/mono-2.6.4-require-glib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- data/mono.pc.in	2010-04-22 09:37:47.000000000 -0600
-+++ data/mono.pc.in	2010-05-10 09:30:04.000000000 -0600
-@@ -7,8 +7,6 @@
- Name: Mono
- Description: Mono Runtime
- Version: @VERSION@
--## Commented out because SLE hides devel files in the SLE SDK,
--## which not all customers will have.
--#Requires: glib-2.0 gthread-2.0
-+Requires: glib-2.0 gthread-2.0
- Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@
- Cflags: -I${includedir} @libmono_cflags@
diff --git a/dev-lang/mono/files/mono-2.8-libdir.patch b/dev-lang/mono/files/mono-2.8-libdir.patch
deleted file mode 100644
index 6dd6bb51437b..000000000000
--- a/dev-lang/mono/files/mono-2.8-libdir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur mono-9999.bak/mono/mcs/tools/gacutil/driver.cs mono-9999/mono/mcs/tools/gacutil/driver.cs
---- mono-9999.bak/mono/mcs/tools/gacutil/driver.cs	2010-07-03 04:58:15.000000000 +1200
-+++ mono-9999/mono/mcs/tools/gacutil/driver.cs	2010-07-03 05:13:01.000000000 +1200
-@@ -808,7 +808,7 @@
- 		private static string EnsureLib (string dir)
- 		{
- 			DirectoryInfo d = new DirectoryInfo (dir);
--			if (d.Name == "lib")
-+			if (d.Name == "lib" || d.Name == "@MONOLIBDIR@")
- 				return dir;
- 			return Path.Combine (dir, "lib");
- 		}
-diff -Naur mono-9999.bak/mono/mono/metadata/assembly.c mono-9999/mono/mono/metadata/assembly.c
---- mono-9999.bak/mono/mono/metadata/assembly.c	2010-07-03 04:58:14.000000000 +1200
-+++ mono-9999/mono/mono/metadata/assembly.c	2010-07-03 05:11:47.000000000 +1200
-@@ -542,7 +542,7 @@
- 	}
- 
- 	config = g_build_filename (base, "etc", NULL);
--	lib = g_build_filename (base, "lib", NULL);
-+	lib = g_build_filename (base, "@MONOLIBDIR@", NULL);
- 	mono = g_build_filename (lib, "mono/1.0", NULL);
- 	if (stat (mono, &buf) == -1)
- 		fallback ();
-@@ -595,7 +595,7 @@
- 
- 	bindir = g_path_get_dirname (name);
- 	installdir = g_path_get_dirname (bindir);
--	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL);
-+	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "@MONOLIBDIR@", NULL);
- 
- 	config = g_build_filename (root, "..", "etc", NULL);
- #ifdef HOST_WIN32
-@@ -2066,7 +2066,7 @@
- 	if (extra_gac_paths) {
- 		paths = extra_gac_paths;
- 		while (!res && *paths) {
--			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
-+			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL);
- 			res = probe_for_partial_name (gacpath, fullname, aname, status);
- 			g_free (gacpath);
- 			paths++;
-@@ -2117,7 +2117,7 @@
- 		if (*gp != G_DIR_SEPARATOR)
- 			continue;
- 		gp++;
--		if (strncmp (gp, "lib", 3))
-+		if (strncmp (gp, "@MONOLIBDIR@", 3))
- 			continue;
- 		gp += 3;
- 		if (*gp != G_DIR_SEPARATOR)
-@@ -2196,7 +2196,7 @@
- 		paths = extra_gac_paths;
- 		while (!image && *paths) {
- 			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
--					"lib", "mono", "gac", subpath, NULL);
-+					"@MONOLIBDIR@", "mono", "gac", subpath, NULL);
- 			image = mono_image_open (fullpath, NULL);
- 			g_free (fullpath);
- 			paths++;
-@@ -2488,7 +2488,7 @@
- 	if (extra_gac_paths) {
- 		paths = extra_gac_paths;
- 		while (!result && *paths) {
--			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
-+			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL);
- 			result = mono_assembly_open_full (fullpath, status, refonly);
- 			g_free (fullpath);
- 			paths++;
diff --git a/dev-lang/mono/files/mono-2.8.1-radegast-crash.patch b/dev-lang/mono/files/mono-2.8.1-radegast-crash.patch
deleted file mode 100644
index 9260273d0d2a..000000000000
--- a/dev-lang/mono/files/mono-2.8.1-radegast-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /home/pacho/mono-2.8.1/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs.orig	2010-11-27 15:46:31.000000000 +0100
-+++ /home/pacho/mono-2.8.1/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs	2010-11-27 15:47:02.000000000 +0100
-@@ -667,9 +667,10 @@
- 				} else {
- 					document.Empty();
- 
--					document.SetSelectionToCaret (true);
--					if (IsHandleCreated)
-+					if (IsHandleCreated) {
-+						document.SetSelectionToCaret (true);
- 						CalculateDocument ();
-+					}
- 				}
- 
- 				OnTextChanged(EventArgs.Empty);
diff --git a/dev-lang/mono/metadata.xml b/dev-lang/mono/metadata.xml
index c2e0dd03b2b8..2b22d1154cbb 100644
--- a/dev-lang/mono/metadata.xml
+++ b/dev-lang/mono/metadata.xml
@@ -3,9 +3,6 @@
 <pkgmetadata>
 <herd>dotnet</herd>
 	<use>
-		<flag name='moonlight'>Generate Moonlight 2.1 assemblies</flag>
-		<flag name='profile4'>Include partial support for C# 4.0 and
-		some of the upcoming .NET 4.0 APIs.</flag>
 		<flag name='xen'>Make mono generate code that is
 		considerably faster on xen VMs but slightly slower on for
 		normal systems.</flag>
diff --git a/dev-lang/mono/mono-2.10.1-r1.ebuild b/dev-lang/mono/mono-2.10.2-r1.ebuild
index a34addab659a..a3227af3eeb6 100644
--- a/dev-lang/mono/mono-2.10.1-r1.ebuild
+++ b/dev-lang/mono/mono-2.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.10.1-r1.ebuild,v 1.4 2011/03/20 19:01:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.10.2-r1.ebuild,v 1.1 2011/07/04 11:27:20 pacho Exp $
 
 EAPI="2"
 
@@ -32,12 +32,6 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 RESTRICT="test"
 
-PATCHES=(
-	"${WORKDIR}/${PN}-2.10.1-libdir.patch"
-	"${FILESDIR}/${PN}-2.2-ppc-threading.patch"
-	"${FILESDIR}/${PN}-2.2-uselibdir.patch"
-)
-
 pkg_setup() {
 	if use kernel_linux
 	then
@@ -58,13 +52,10 @@ pkg_setup() {
 			ewarn "See http://bugs.gentoo.org/261869 for more info."
 		fi
 	fi
+	PATCHES=( "${FILESDIR}/${PN}-2.10.2-threads-access.patch" )
 }
 
 src_prepare() {
-	sed -e "s:@MONOLIBDIR@:$(get_libdir):" \
-		< "${FILESDIR}"/${PN}-2.10.1-libdir.patch \
-		> "${WORKDIR}"/${PN}-2.10.1-libdir.patch ||
-		die "Sedding patch file failed"
 	go-mono_src_prepare
 
 	# we need to sed in the paxctl -mr in the runtime/mono-wrapper.in so it don't
diff --git a/dev-lang/mono/mono-2.6.7.ebuild b/dev-lang/mono/mono-2.6.7.ebuild
deleted file mode 100644
index 3d6ef27ea5f9..000000000000
--- a/dev-lang/mono/mono-2.6.7.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.6.7.ebuild,v 1.5 2010/09/23 22:14:59 hwoarang Exp $
-
-EAPI=2
-
-inherit linux-info mono eutils flag-o-matic multilib go-mono pax-utils
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-
-LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="hardened minimal moonlight profile4 xen"
-
-#Bash requirement is for += operator
-COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
-	!dev-util/monodoc
-	>=dev-libs/glib-2.4:2
-	!minimal? ( =dev-dotnet/libgdiplus-${GO_MONO_REL_PV}* )
-	ia64? (	sys-libs/libunwind )"
-RDEPEND="${COMMONDEPEND}
-	|| ( www-client/links www-client/lynx )"
-
-DEPEND="${COMMONDEPEND}
-	sys-devel/bc
-	>=app-shells/bash-3.2
-	hardened? ( sys-apps/paxctl )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/mono-2.2-libdir126.patch"
-	"${FILESDIR}/mono-2.2-ppc-threading.patch"
-	"${FILESDIR}/mono-2.2-uselibdir.patch"
-	"${FILESDIR}/mono-2.6.4-require-glib.patch"
-)
-
-pkg_setup() {
-	if use kernel_linux
-	then
-		get_version
-		if linux_config_exists
-		then
-			if linux_chkconfig_present SYSVIPC
-			then
-				einfo "CONFIG_SYSVIPC is set, looking good."
-			else
-				eerror "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-				eerror "See http://bugs.gentoo.org/261869 for more info."
-				die "Please set CONFIG_SYSVIPC in your kernel .config"
-			fi
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-			ewarn "See http://bugs.gentoo.org/261869 for more info."
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e "s:@MONOLIBDIR@:$(get_libdir):" \
-		< "${FILESDIR}"/mono-2.2-libdir126.patch \
-		> "${WORKDIR}"/mono-2.2-libdir126.patch ||
-		die "Sedding patch file failed"
-	go-mono_src_prepare
-
-	# we need to sed in the paxctl -m in the runtime/mono-wrapper.in so it don't
-	# get killed in the build proces when MPROTEC is enable. #286280
-	if use hardened ; then
-		ewarn "We are disabling MPROTECT on the mono binary."
-		sed '/exec/ i\paxctl -m "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
-	fi
-}
-
-src_configure() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	#Remove this at your own peril. Mono will barf in unexpected ways.
-	append-flags -fno-strict-aliasing
-
-	#NOTE: We need the static libs for now so mono-debugger works.
-	#See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
-	go-mono_src_configure \
-		--enable-static \
-		--disable-quiet-build \
-		--with-preview \
-		--with-glib=system \
-		$(use_with moonlight) \
-		--with-libgdiplus=$(use minimal && printf "no" || printf "installed" ) \
-		$(use_with xen xen_opt) \
-		--without-ikvm-native \
-		--with-jit \
-		--disable-dtrace \
-		$(use_with profile4)
-}
-
-src_test() {
-	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	export MONO_REGISTRY_PATH="${T}/registry"
-	export XDG_DATA_HOME="${T}/data"
-	export MONO_SHARED_DIR="${T}/shared"
-	export XDG_CONFIG_HOME="${T}/config"
-	export HOME="${T}/home"
-
-	emake -j1 check
-}
-
-src_install() {
-	go-mono_src_install
-
-	#Bug 255610
-	sed -i -e "s:mono/2.0/mod.exe:mono/1.0/mod.exe:" \
-		"${D}"/usr/bin/mod || die "Failed to fix mod."
-
-	find "${D}"/usr/ -name '*nunit-docs*' -exec rm -rf '{}' '+' || die "Removing nunit .docs failed"
-
-	# Remove Jay to avoid colliding with dev-util/jay, the internal
-	# version is only used to build mcs.
-	rm -r "${D}"/usr/share/jay "${D}"/usr/bin/jay "${D}"/usr/share/man/man1/jay.1*
-}
-
-#THINK!!!! Before touching postrm and postinst
-#Reference phase order:
-#pkg_preinst
-#pkg_prerm
-#pkg_postrm
-#pkg_postinst
-
-pkg_preinst() {
-	local symlink
-	local NUNIT_DIR="/usr/$(get_libdir)/mono/nunit"
-	local pv_atom
-	if  [[ "$(readlink "${ROOT}"/${NUNIT_DIR})" == *"mono-nunit"* ]]
-	then
-		for pv_atom in 2.2{,-r1,-r2,-r3,-r4} '2.4_pre*' '2.4_rc*' 2.4
-		do
-			if has_version "=dev-lang/mono-${pv_atom}"
-			then
-				einfo "If you just received a file collision warning message,"
-				einfo "be advised that this is a known problem, which will now be fixed:"
-				ebegin "Found broken symlinks created by $(best_version dev-lang/mono), fixing"
-				for symlink in						\
-					"${ROOT}/${NUNIT_DIR}"				\
-					"${ROOT}/usr/$(get_libdir)/pkgconfig/nunit.pc"	\
-					"${ROOT}/usr/bin/nunit-console"			\
-					"${ROOT}/usr/bin/nunit-console2"
-				do
-					if [[ -L "${symlink}" ]]
-					then
-						rm -f "${symlink}" &> /dev/null
-					fi
-				done
-				eend 0
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "PLEASE TAKE NOTE!"
-	elog ""
-	elog "Some of the namespaces supported by Mono require extra packages to be installed."
-	elog "Below is a list of namespaces and the corresponding package you must install:"
-	elog ""
-	elog ">=x11-libs/cairo-1.6.4"
-	elog "	Mono.Cairo"
-	elog "Also read:"
-	elog "http://www.mono-project.com/Mono.Cairo"
-	elog ""
-	elog ">=dev-db/firebird-2.0.4.13130.1"
-	elog "	FirebirdSql.Data.Firebird"
-	elog "Also read:"
-	elog "http://www.mono-project.com/Firebird_Interbase"
-	elog ""
-	elog "=dev-dotnet/gluezilla-${GO_MONO_REL_PV}*"
-	elog "	Mono.Mozilla"
-	elog "	Mono.Mozilla.WebBrowser"
-	elog "	Mono.Mozilla.Widget"
-	elog "	Interop.SHDocVw"
-	elog "	AxInterop.SHDocVw"
-	elog "	Interop.mshtml.dll"
-	elog "	System.Windows.Forms.WebBrowser"
-	elog "	Microsoft.IE"
-	elog "Also read:"
-	elog "http://www.mono-project.com/WebBrowser"
-	elog ""
-	elog "dev-db/sqlite:3"
-	elog "	Mono.Data.Sqlite"
-	elog "	Mono.Data.SqliteClient"
-	elog "Also read:"
-	elog "http://www.mono-project.com/SQLite"
-	elog ""
-	elog ">=dev-db/oracle-instantclient-basic-10.2"
-	elog "	System.Data.OracleClient"
-	elog "Also read:"
-	elog "http://www.mono-project.com/Oracle"
-	elog ""
-	elog "Mono also has support for packages that are not included in portage:"
-	elog ""
-	elog "No ebuild available:"
-	elog "	IBM.Data.DB2"
-	elog "Also read: http://www.mono-project.com/IBM_DB2"
-	elog ""
-	elog "No ebuild needed:"
-	elog "	Mono.Data.SybaseClient"
-	elog "Also read: http://www.mono-project.com/Sybase"
-}
-
-# NOTICE: THE COPYRIGHT FILES IN THE TARBALL ARE UNCLEAR!
-# WHENEVER YOU THINK SOMETHING IS GPL-2+, IT'S ONLY GPL-2
-# UNLESS MIGUEL DE ICAZA HIMSELF SAYS OTHERWISE.
-
-# mono
-# The code we use is LGPL, but contributions must be made under the MIT/X11
-# license, so Novell can serve its paying customers. Exception is mono/man.
-# LICENSE="LGPL-2.1"
-
-	# mono/man
-	# LICENSE="MIT"
-
-# mcs/mcs
-# mcs/gmcs
-# LICENSE="GPL-2 MIT"
-
-# tests
-# LICENSE="MIT"
-
-# mcs/class
-# Except the listed exceptions:
-# LICENSE="MIT"
-
-	# mcs/class/ByteFX.Data
-	# mcs/class/Npgsql
-	# LICENSE="LGPL-2.1"
-
-	# mcs/class/FirebirdSql.Data.Firebird
-	# LICENSE="IDPL"
-
-	# mcs/class/ICSharpCode.SharpZipLib
-	# LICENSE="GPL-2-with-linking-exception"
-
-	# mcs/class/MicrosoftAjaxLibrary
-	# LICENSE="Ms-Pl"
-
-	# mcs/class/Microsoft.JScript/Microsoft.JScript/TokenStream.cs
-	# mcs/class/Microsoft.JScript/Microsoft.JScript/Token.cs
-	# mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
-	# mcs/class/Microsoft.JScript/Microsoft.JScript/Decompiler.cs
-	# LICENSE="|| ( NPL-1.1 GPL-2 )"
-
-# mcs/jay
-# LICENSE="BSD-4"
-
-# mcs/tools
-# Except the listed exceptions:
-# LICENSE="MIT"
-
-	# mcs/tools/mdoc/Mono.Documentation/monodocs2html.cs
-	# LICENSE="GPL-2"
-
-	# mcs/tools/sqlsharp/SqlSharpCli.cs
-	# LICENSE="GPL-2"
-
-	# mcs/tools/csharp/repl.cs
-	# LICENSE="|| ( MIT GPL-2 )"
-
-	# mcs/tools/mono-win32-setup.nsi
-	# LICENSE="GPL-2"
-
-# samples
-# LICENSE="MIT"
diff --git a/dev-lang/mono/mono-2.8.2-r1.ebuild b/dev-lang/mono/mono-2.8.2-r1.ebuild
deleted file mode 100644
index 756879fd6088..000000000000
--- a/dev-lang/mono/mono-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.8.2-r1.ebuild,v 1.5 2011/03/05 16:35:18 pacho Exp $
-
-EAPI="2"
-
-inherit linux-info mono eutils flag-o-matic multilib go-mono pax-utils
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com"
-
-LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="hardened minimal xen"
-
-#Bash requirement is for += operator
-COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
-	!dev-util/monodoc
-	!minimal? ( =dev-dotnet/libgdiplus-${GO_MONO_REL_PV}* )
-	ia64? (	sys-libs/libunwind )"
-RDEPEND="${COMMONDEPEND}
-	|| ( www-client/links www-client/lynx )"
-
-DEPEND="${COMMONDEPEND}
-	sys-devel/bc
-	>=app-shells/bash-3.2
-	hardened? ( sys-apps/paxctl )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-2.8-libdir.patch"
-	"${FILESDIR}/${PN}-2.2-ppc-threading.patch"
-	"${FILESDIR}/${PN}-2.2-uselibdir.patch"
-	"${FILESDIR}/${PN}-2.8.1-radegast-crash.patch"
-)
-
-pkg_setup() {
-	if use kernel_linux
-	then
-		get_version
-		if linux_config_exists
-		then
-			if linux_chkconfig_present SYSVIPC
-			then
-				einfo "CONFIG_SYSVIPC is set, looking good."
-			else
-				eerror "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-				eerror "See http://bugs.gentoo.org/261869 for more info."
-				die "Please set CONFIG_SYSVIPC in your kernel .config"
-			fi
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
-			ewarn "See http://bugs.gentoo.org/261869 for more info."
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e "s:@MONOLIBDIR@:$(get_libdir):" \
-		< "${FILESDIR}"/${PN}-2.8-libdir.patch \
-		> "${WORKDIR}"/${PN}-2.8-libdir.patch ||
-		die "Sedding patch file failed"
-	go-mono_src_prepare
-
-	# we need to sed in the paxctl -mr in the runtime/mono-wrapper.in so it don't
-	# get killed in the build proces when MPROTEC is enable. #286280
-	# RANDMMAP kill the build proces to #347365
-	if use hardened ; then
-		ewarn "We are disabling MPROTECT on the mono binary."
-		sed '/exec/ i\paxctl -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
-	fi
-}
-
-src_configure() {
-	# mono's build system is finiky, strip the flags
-	strip-flags
-
-	#Remove this at your own peril. Mono will barf in unexpected ways.
-	append-flags -fno-strict-aliasing
-
-	# NOTE: We need the static libs for now so mono-debugger works.
-	# See http://bugs.gentoo.org/show_bug.cgi?id=256264 for details
-	#
-	# --without-moonlight since www-plugins/moonlight is not the only one
-	# using mono: https://bugzilla.novell.com/show_bug.cgi?id=641005#c3
-	#
-	# --with-profile4 needs to be always enabled since it's used by default
-	# and, otherwise, problems like bug #340641 appear.
-
-	go-mono_src_configure \
-		--enable-static \
-		--disable-quiet-build \
-		--without-moonlight \
-		--with-libgdiplus=$(use minimal && printf "no" || printf "installed" ) \
-		$(use_with xen xen_opt) \
-		--without-ikvm-native \
-		--with-jit \
-		--disable-dtrace \
-		--with-profile4
-}
-
-src_test() {
-	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
-	export MONO_REGISTRY_PATH="${T}/registry"
-	export XDG_DATA_HOME="${T}/data"
-	export MONO_SHARED_DIR="${T}/shared"
-	export XDG_CONFIG_HOME="${T}/config"
-	export HOME="${T}/home"
-
-	emake -j1 check
-}
-
-src_install() {
-	go-mono_src_install
-
-	#Bug 255610
-	sed -i -e "s:mono/2.0/mod.exe:mono/1.0/mod.exe:" \
-		"${D}"/usr/bin/mod || die "Failed to fix mod."
-
-	find "${D}"/usr/ -name '*nunit-docs*' -exec rm -rf '{}' '+' || die "Removing nunit .docs failed"
-
-	# Remove Jay to avoid colliding with dev-util/jay, the internal
-	# version is only used to build mcs.
-	rm -r "${D}"/usr/share/jay "${D}"/usr/bin/jay "${D}"/usr/share/man/man1/jay.1*
-
-	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
-	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
-	# for reference.
-	rm -f "${D}"/usr/$(get_libdir)/mono/4.0/mscorlib.dll.so
-	rm -f "${D}"/usr/$(get_libdir)/mono/4.0/dmcs.exe.so
-	rm -f "${D}"/usr/$(get_libdir)/mono/2.0/mscorlib.dll.so
-	rm -f "${D}"/usr/$(get_libdir)/mono/2.0/gmcs.exe.so
-}
-
-#THINK!!!! Before touching postrm and postinst
-#Reference phase order:
-#pkg_preinst
-#pkg_prerm
-#pkg_postrm
-#pkg_postinst
-
-pkg_preinst() {
-	local symlink
-	local NUNIT_DIR="/usr/$(get_libdir)/mono/nunit"
-	local pv_atom
-	if  [[ "$(readlink "${ROOT}"/${NUNIT_DIR})" == *"mono-nunit"* ]]
-	then
-		for pv_atom in 2.2{,-r1,-r2,-r3,-r4} '2.4_pre*' '2.4_rc*' 2.4
-		do
-			if has_version "=dev-lang/mono-${pv_atom}"
-			then
-				einfo "If you just received a file collision warning message,"
-				einfo "be advised that this is a known problem, which will now be fixed:"
-				ebegin "Found broken symlinks created by $(best_version dev-lang/mono), fixing"
-				for symlink in						\
-					"${ROOT}/${NUNIT_DIR}"				\
-					"${ROOT}/usr/$(get_libdir)/pkgconfig/nunit.pc"	\
-					"${ROOT}/usr/bin/nunit-console"			\
-					"${ROOT}/usr/bin/nunit-console2"
-				do
-					if [[ -L "${symlink}" ]]
-					then
-						rm -f "${symlink}" &> /dev/null
-					fi
-				done
-				eend 0
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "PLEASE TAKE NOTE!"
-	elog ""
-	elog "Some of the namespaces supported by Mono require extra packages to be installed."
-	elog "Below is a list of namespaces and the corresponding package you must install:"
-	elog ""
-	elog ">=x11-libs/cairo-1.6.4"
-	elog "	Mono.Cairo"
-	elog "Also read:"
-	elog "http://www.mono-project.com/Mono.Cairo"
-	elog ""
-	elog ">=dev-db/firebird-2.0.4.13130.1"
-	elog "	FirebirdSql.Data.Firebird"
-	elog "Also read:"
-	elog "http://www.mono-project.com/Firebird_Interbase"
-	elog ""
-	elog "=dev-dotnet/gluezilla-${GO_MONO_REL_PV}*"
-	elog "	Mono.Mozilla"
-	elog "	Mono.Mozilla.WebBrowser"
-	elog "	Mono.Mozilla.Widget"
-	elog "	Interop.SHDocVw"
-	elog "	AxInterop.SHDocVw"
-	elog "	Interop.mshtml.dll"
-	elog "	System.Windows.Forms.WebBrowser"
-	elog "	Microsoft.IE"
-	elog "Also read:"
-	elog "http://www.mono-project.com/WebBrowser"
-	elog ""
-	elog "dev-db/sqlite:3"
-	elog "	Mono.Data.Sqlite"
-	elog "Also read:"
-	elog "http://www.mono-project.com/SQLite"
-	elog ""
-	elog ">=dev-db/oracle-instantclient-basic-10.2"
-	elog "	System.Data.OracleClient"
-	elog "Also read:"
-	elog "http://www.mono-project.com/Oracle"
-	elog ""
-	elog "Mono also has support for packages that are not included in portage:"
-	elog ""
-	elog "No ebuild available:"
-	elog "	IBM.Data.DB2"
-	elog "Also read: http://www.mono-project.com/IBM_DB2"
-	elog ""
-	elog "No ebuild needed:"
-	elog "	Mono.Data.SybaseClient"
-	elog "Also read: http://www.mono-project.com/Sybase"
-}
-
-# NOTICE: THE COPYRIGHT FILES IN THE TARBALL ARE UNCLEAR!
-# WHENEVER YOU THINK SOMETHING IS GPL-2+, IT'S ONLY GPL-2
-# UNLESS MIGUEL DE ICAZA HIMSELF SAYS OTHERWISE.
-
-# mono
-# The code we use is LGPL, but contributions must be made under the MIT/X11
-# license, so Novell can serve its paying customers. Exception is mono/man.
-# LICENSE="LGPL-2.1"
-
-	# mono/man
-	# LICENSE="MIT"
-
-# mcs/mcs
-# mcs/gmcs
-# LICENSE="GPL-2 MIT"
-
-# tests
-# LICENSE="MIT"
-
-# mcs/class
-# Except the listed exceptions:
-# LICENSE="MIT"
-
-	# mcs/class/ByteFX.Data
-	# mcs/class/Npgsql
-	# LICENSE="LGPL-2.1"
-
-	# mcs/class/FirebirdSql.Data.Firebird
-	# LICENSE="IDPL"
-
-	# mcs/class/ICSharpCode.SharpZipLib
-	# LICENSE="GPL-2-with-linking-exception"
-
-	# mcs/class/MicrosoftAjaxLibrary
-	# LICENSE="Ms-Pl"
-
-	# mcs/class/Microsoft.JScript/Microsoft.JScript/TokenStream.cs
-	# mcs/class/Microsoft.JScript/Microsoft.JScript/Token.cs
-	# mcs/class/Microsoft.JScript/Microsoft.JScript/Parser.cs
-	# mcs/class/Microsoft.JScript/Microsoft.JScript/Decompiler.cs
-	# LICENSE="|| ( NPL-1.1 GPL-2 )"
-
-# mcs/jay
-# LICENSE="BSD-4"
-
-# mcs/tools
-# Except the listed exceptions:
-# LICENSE="MIT"
-
-	# mcs/tools/mdoc/Mono.Documentation/monodocs2html.cs
-	# LICENSE="GPL-2"
-
-	# mcs/tools/sqlsharp/SqlSharpCli.cs
-	# LICENSE="GPL-2"
-
-	# mcs/tools/csharp/repl.cs
-	# LICENSE="|| ( MIT GPL-2 )"
-
-	# mcs/tools/mono-win32-setup.nsi
-	# LICENSE="GPL-2"
-
-# samples
-# LICENSE="MIT"