long overdue cleaning of mono

(Portage version: 2.1.2-r9)

17 files changed, 10 insertions, 1024 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 6be2db27f8bf..4ae0d228e844 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.104 2007/01/14 03:00:50 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.105 2007/02/10 23:52:54 compnerd Exp $
+
+  10 Feb 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  -files/mono-1.1.13.8-dynamic-assembly-get-types.diff,
+  -files/mono-1.1.13-resource-manager.diff,
+  -files/mono-1.1.18-mcs-crasher-fix.diff,
+  -files/mono-1.2.1-zombie-processes.diff, -files/dotnet.conf,
+  -files/dotnet.init, -mono-1.1.13.8.1.ebuild, -mono-1.1.18.ebuild,
+  -mono-1.1.18-r1.ebuild, -mono-1.2.ebuild, -mono-1.2.1.ebuild:
+  Long overdue cleaning of mono ebuilds. 1.1.16.1 left for visual basic
 
   14 Jan 2007; Olivier Crête <tester@gentoo.org> mono-1.2.2.1.ebuild:
   Stable on amd64 per bug #159886
diff --git a/dev-lang/mono/files/digest-mono-1.1.13.8.1 b/dev-lang/mono/files/digest-mono-1.1.13.8.1
deleted file mode 100644
index f1224e63cdfc..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.13.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 473c24c4be17b8e71393bc96bbda4bca mono-1.1.13.8.1.tar.gz 17758715
-RMD160 a100a96b19300b253c12a2ad70caf65721418209 mono-1.1.13.8.1.tar.gz 17758715
-SHA256 841cd62de1f61fefd17190dcc744e03f49c495039cc2088627ede9d9d825e21a mono-1.1.13.8.1.tar.gz 17758715
diff --git a/dev-lang/mono/files/digest-mono-1.1.18 b/dev-lang/mono/files/digest-mono-1.1.18
deleted file mode 100644
index 62a321da8e10..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ce7c16c15b938edb2f1ea781921ef3eb mono-1.1.18.tar.gz 19457001
-RMD160 60134edff923ca2a39cb82f75f5dcc7468edb601 mono-1.1.18.tar.gz 19457001
-SHA256 8b5a62cb91b92a9b77c62595f7f081971efac66fdfebaf1de7cd5c15b425c36b mono-1.1.18.tar.gz 19457001
diff --git a/dev-lang/mono/files/digest-mono-1.1.18-r1 b/dev-lang/mono/files/digest-mono-1.1.18-r1
deleted file mode 100644
index 62a321da8e10..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.18-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ce7c16c15b938edb2f1ea781921ef3eb mono-1.1.18.tar.gz 19457001
-RMD160 60134edff923ca2a39cb82f75f5dcc7468edb601 mono-1.1.18.tar.gz 19457001
-SHA256 8b5a62cb91b92a9b77c62595f7f081971efac66fdfebaf1de7cd5c15b425c36b mono-1.1.18.tar.gz 19457001
diff --git a/dev-lang/mono/files/digest-mono-1.2 b/dev-lang/mono/files/digest-mono-1.2
deleted file mode 100644
index 872197499615..000000000000
--- a/dev-lang/mono/files/digest-mono-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb75a8b3bedbaa60ff3c3410ef4b759b mono-1.2.tar.gz 19606768
-RMD160 5143aee08d5289852166cdac1d81c6be63a1595d mono-1.2.tar.gz 19606768
-SHA256 41e1dfe6e2acfd22375f949c6f5984eacfb3b75d0b140a1062d1d78a4aabf64f mono-1.2.tar.gz 19606768
diff --git a/dev-lang/mono/files/digest-mono-1.2.1 b/dev-lang/mono/files/digest-mono-1.2.1
deleted file mode 100644
index dbe2bc9c88d5..000000000000
--- a/dev-lang/mono/files/digest-mono-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 47621f63126d6599356d28668fb5fea2 mono-1.2.1.tar.gz 19861863
-RMD160 1f363ab99cbfcb6ded9dc5b2a82cd0c2f61276be mono-1.2.1.tar.gz 19861863
-SHA256 7d37908a6841209d44380602426e5e751b987e6f32c08dd6d15bc806298358de mono-1.2.1.tar.gz 19861863
diff --git a/dev-lang/mono/files/dotnet.conf b/dev-lang/mono/files/dotnet.conf
deleted file mode 100644
index 8ffa18ebc2ed..000000000000
--- a/dev-lang/mono/files/dotnet.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2003 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/files/dotnet.conf,v 1.3 2005/03/11 03:14:01 latexer Exp $
-
-# configuration file for dotnet
-
-# Define what to register with .NET IL binaries so you can avoid
-# running them with "<runtime> program.exe"
-# NOTE: In order to get this working you need to "chmod +x" your program
-
-# Valid options are:
-# "mono" - use the mono runtime engine 'mono'
-# "ilrun" - use the DotGNU Portable .NET runtime engine 'ilrun'
-
-CLR=""
diff --git a/dev-lang/mono/files/dotnet.init b/dev-lang/mono/files/dotnet.init
deleted file mode 100644
index 172f049f78c3..000000000000
--- a/dev-lang/mono/files/dotnet.init
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/files/dotnet.init,v 1.3 2005/03/11 03:14:01 latexer Exp $
-
-start() {
-	ebegin "Registering .NET IL binaries with ${CLR}"
-
-	if [ ! -d /proc/sys/fs/binfmt_misc ]; then
-		eerror "You need support for \"misc binaries\" in your kernel!"
-		exit 1
-	fi
-
-	mount | grep -q binfmt_misc
-	if [ $? != 0 ]; then
-		mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
-		if [ $? != 0 ]; then
-			eend 1
-			exit 1
-		fi
-	fi
-
-	case "${CLR}" in
-	
-	mono )	echo ':CLR:M::MZ::/usr/bin/mono:' > /proc/sys/fs/binfmt_misc/register
-		eend 0
-		;;
-	ilrun )	echo ':CLR:M::MZ::/usr/bin/ilrun:' > /proc/sys/fs/binfmt_misc/register
-		eend 0
-		;;
-	* )	eerror 'Please enter a valid option in /etc/conf.d/dotnet'
-		eend 1
-		;;
-	esac
-}
-
-stop() {
-	ebegin "Unregistering .NET IL binaries"
-
-	if [ -f /proc/sys/fs/binfmt_misc/CLR ]; then
-		echo '-1' > /proc/sys/fs/binfmt_misc/CLR
-	fi
-	eend $?
-}
diff --git a/dev-lang/mono/files/mono-1.1.13-resource-manager.diff b/dev-lang/mono/files/mono-1.1.13-resource-manager.diff
deleted file mode 100644
index 32720825ed0f..000000000000
--- a/dev-lang/mono/files/mono-1.1.13-resource-manager.diff
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -aur mono-1.1.13-orig/mcs/class/corlib/corlib_test.dll.sources mono-1.1.13/mcs/class/corlib/corlib_test.dll.sources
---- mono-1.1.13-orig/mcs/class/corlib/corlib_test.dll.sources	2005-12-15 09:53:24.000000000 -0800
-+++ mono-1.1.13/mcs/class/corlib/corlib_test.dll.sources	2006-01-13 14:34:40.000000000 -0800
-@@ -120,6 +120,7 @@
- System.Reflection/StrongNameKeyPairTest.cs
- System/ResolveEventArgsTest.cs
- System.Resources/ResourceReaderTest.cs
-+System.Resources/ResourceManagerTest.cs
- System.Runtime.CompilerServices/RuntimeHelpersTest.cs
- System.Runtime.InteropServices/GCHandleTest.cs
- System.Runtime.InteropServices/MarshalTest.cs
-diff -aur mono-1.1.13-orig/mcs/class/corlib/System.Resources/ResourceManager.cs mono-1.1.13/mcs/class/corlib/System.Resources/ResourceManager.cs
---- mono-1.1.13-orig/mcs/class/corlib/System.Resources/ResourceManager.cs	2005-06-23 16:11:11.000000000 -0700
-+++ mono-1.1.13/mcs/class/corlib/System.Resources/ResourceManager.cs	2006-01-13 14:34:40.000000000 -0800
-@@ -9,7 +9,7 @@
- //
- 
- //
--// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-+// Copyright (C) 2004, 2005 Novell, Inc (http://www.novell.com)
- //
- // Permission is hereby granted, free of charge, to any person obtaining
- // a copy of this software and associated documentation files (the
-@@ -161,44 +161,37 @@
- 			return(GetObject(name, null));
- 		}
- 
--		public virtual object GetObject(string name, CultureInfo culture)
-+		public virtual object GetObject (string name, CultureInfo culture)
- 		{
--			if(name==null) {
--				throw new ArgumentNullException("name is null");
-+			if (name == null) {
-+				throw new ArgumentNullException("name");
- 			}
- 
--			if(culture==null) {
--				culture=CultureInfo.CurrentUICulture;
-+			if (culture == null) {
-+				culture = CultureInfo.CurrentUICulture;
- 			}
- 
--			lock(this) {
--				ResourceSet set=InternalGetResourceSet(culture, true, true);
--				object obj=null;
-+			lock (this) {
-+				while (true) {
-+
-+					ResourceSet set = InternalGetResourceSet (culture, true, true);
- 				
--				if(set != null) {
--					obj=set.GetObject(name, ignoreCase);
--					if(obj != null) {
--						return(obj);
-+					if (set != null) {
-+						object obj = set.GetObject(name, ignoreCase);
-+						if (obj != null) {
-+							return obj;
-+						}
- 					}
--				}
--				
--				/* Try parent cultures */
- 
--				do {
--					culture=culture.Parent;
-+					if (culture == neutral_culture ||
-+					    culture == CultureInfo.InvariantCulture)
-+						break;
- 
--					set=InternalGetResourceSet(culture, true, true);
--					if(set!=null) {
--						obj=set.GetObject(name, ignoreCase);
--						if(obj != null) {
--							return(obj);
--						}
--					}
--				} while(!culture.Equals(neutral_culture) &&
--					!culture.Equals(CultureInfo.InvariantCulture));
-+					culture = culture.Parent;
-+				}
- 			}
- 			
--			return(null);
-+			return null;
- 		}
- 		
- 		
-@@ -223,41 +216,33 @@
- 		public virtual string GetString (string name, CultureInfo culture)
- 		{
- 			if (name == null) {
--				throw new ArgumentNullException ("Name is null.");
-+				throw new ArgumentNullException ("name");
- 			}
- 
--			if(culture==null) {
--				culture=CultureInfo.CurrentUICulture;
-+			if(culture == null) {
-+				culture = CultureInfo.CurrentUICulture;
- 			}
- 
--			lock(this) {
--				ResourceSet set=InternalGetResourceSet(culture, true, true);
--				string str=null;
-+			lock (this) {
-+				while (true) {
-+					ResourceSet set = InternalGetResourceSet (culture, true, true);
- 
--				if(set!=null) {
--					str=set.GetString(name, ignoreCase);
--					if(str!=null) {
--						return(str);
-+					if (set != null) {
-+						string str = set.GetString (name, ignoreCase);
-+						if (str != null) {
-+							return str;
-+						}
- 					}
--				}
--
--				/* Try parent cultures */
- 
--				do {
--					culture=culture.Parent;
-+					if (culture == neutral_culture ||
-+					    culture == CultureInfo.InvariantCulture)
-+						break;
- 
--					set=InternalGetResourceSet(culture, true, true);
--					if(set!=null) {
--						str=set.GetString(name, ignoreCase);
--						if(str!=null) {
--							return(str);
--						}
--					}
--				} while(!culture.Equals(neutral_culture) &&
--					!culture.Equals(CultureInfo.InvariantCulture));
-+					culture = culture.Parent;
-+				}
- 			}
- 			
--			return(null);
-+			return null;
- 		}
- 
- 		protected virtual string GetResourceFileName (CultureInfo culture)
diff --git a/dev-lang/mono/files/mono-1.1.13.8-dynamic-assembly-get-types.diff b/dev-lang/mono/files/mono-1.1.13.8-dynamic-assembly-get-types.diff
deleted file mode 100644
index 92219041e48c..000000000000
--- a/dev-lang/mono/files/mono-1.1.13.8-dynamic-assembly-get-types.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: mono/metadata/icall.c
-===================================================================
---- mono/metadata/icall.c	(revision 62136)
-+++ mono/metadata/icall.c	(revision 62137)
-@@ -4557,11 +4557,12 @@
- 			for (i = 0; i < mono_array_length(abuilder->modules); i++) {
- 				MonoReflectionModuleBuilder *mb = mono_array_get (abuilder->modules, MonoReflectionModuleBuilder*, i);
- 				MonoArray *append = mb->types;
--				if (append && mono_array_length (append) > 0) {
-+				/* The types array might not be fully filled up */
-+				if (append && mb->num_types > 0) {
- 					guint32 len1, len2;
- 					MonoArray *new;
- 					len1 = res ? mono_array_length (res) : 0;
--					len2 = mono_array_length (append);
-+					len2 = mb->num_types;
- 					new = mono_array_new (domain, mono_defaults.monotype_class, len1 + len2);
- 					if (res)
- 						mono_array_memcpy_refs (new, 0, res, 0, len1);
diff --git a/dev-lang/mono/files/mono-1.1.18-mcs-crasher-fix.diff b/dev-lang/mono/files/mono-1.1.18-mcs-crasher-fix.diff
deleted file mode 100644
index c3aaec8a03a5..000000000000
--- a/dev-lang/mono/files/mono-1.1.18-mcs-crasher-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: mcs/anonymous.cs
-===================================================================
---- mcs/anonymous.cs	(revision 66810)
-+++ mcs/anonymous.cs	(revision 66811)
-@@ -1232,6 +1232,7 @@
- 
- 			aec.CurrentAnonymousMethod = this;
- 			aec.IsFieldInitializer = ec.IsFieldInitializer;
-+			aec.IsStatic = ec.IsStatic;
- 
- 			Report.Debug (64, "RESOLVE ANONYMOUS METHOD #1", this, Location, ec, aec,
- 				      RootScope, Parameters, Block);
diff --git a/dev-lang/mono/files/mono-1.2.1-zombie-processes.diff b/dev-lang/mono/files/mono-1.2.1-zombie-processes.diff
deleted file mode 100644
index d3cf471d821c..000000000000
--- a/dev-lang/mono/files/mono-1.2.1-zombie-processes.diff
+++ /dev/null
@@ -1,256 +0,0 @@
---- trunk/mono/mono/io-layer/process-private.h	2006/05/12 10:38:20	60618
-+++ trunk/mono/mono/io-layer/process-private.h	2006/11/23 00:39:10	68378
-@@ -31,6 +31,7 @@
- 	gchar proc_name[_WAPI_PROC_NAME_MAX_LEN];
- 	size_t min_working_set;
- 	size_t max_working_set;
-+	gboolean waited;
- };
- 
- extern void _wapi_process_reap (void);
-
---- trunk/mono/mono/io-layer/processes.c	2006/11/18 19:02:51	68130
-+++ trunk/mono/mono/io-layer/processes.c	2006/11/23 00:39:10	68378
-@@ -80,6 +80,10 @@
- 		process_handle->exitstatus = WEXITSTATUS(status);
- 	}
- 	_wapi_time_t_to_filetime (time(NULL), &process_handle->exit_time);
-+
-+	/* Don't set process_handle->waited here, it needs to only
-+	 * happen in the parent when wait() has been called.
-+	 */
- 	
- #ifdef DEBUG
- 	g_message ("%s: Setting handle %p signalled", __func__, handle);
-@@ -108,17 +112,17 @@
- 	int status;
- 	pid_t ret;
- 	
--	if (_wapi_handle_issignalled (test)) {
--		/* We've already done this one */
--		return (FALSE);
--	}
--	
- 	ok = _wapi_lookup_handle (test, WAPI_HANDLE_PROCESS,
- 				  (gpointer *)&process);
- 	if (ok == FALSE) {
- 		/* The handle must have been too old and was reaped */
- 		return (FALSE);
- 	}
-+
-+	if (process->waited) {
-+		/* We've already done this one */
-+		return(FALSE);
-+	}
- 	
- 	do {
- 		ret = waitpid (process->id, &status, WNOHANG);
-@@ -138,6 +142,8 @@
- 	g_message ("%s: Process %d finished", __func__, ret);
- #endif
- 
-+	process->waited = TRUE;
-+	
- 	*(int *)user_data = status;
- 	
- 	return (TRUE);
-@@ -185,8 +191,16 @@
- #ifdef DEBUG
- 	g_message ("%s: Waiting for process %p", __func__, handle);
- #endif
-+
-+	ok = _wapi_lookup_handle (handle, WAPI_HANDLE_PROCESS,
-+				  (gpointer *)&process_handle);
-+	if (ok == FALSE) {
-+		g_warning ("%s: error looking up process handle %p", __func__,
-+			   handle);
-+		return(WAIT_FAILED);
-+	}
- 	
--	if (_wapi_handle_issignalled (handle)) {
-+	if (process_handle->waited) {
- 		/* We've already done this one */
- #ifdef DEBUG
- 		g_message ("%s: Process %p already signalled", __func__,
-@@ -195,14 +209,6 @@
- 
- 		return (WAIT_OBJECT_0);
- 	}
--
--	ok = _wapi_lookup_handle (handle, WAPI_HANDLE_PROCESS,
--				  (gpointer *)&process_handle);
--	if (ok == FALSE) {
--		g_warning ("%s: error looking up process handle %p", __func__,
--			   handle);
--		return(WAIT_FAILED);
--	}
- 	
- 	pid = process_handle->id;
- 	
-@@ -211,9 +217,15 @@
- #endif
- 
- 	if (timeout == INFINITE) {
--		while ((ret = waitpid (pid, &status, 0)) != pid) {
--			if (ret == (pid_t)-1 && errno != EINTR) {
--				return(WAIT_FAILED);
-+		if (pid == _wapi_getpid ()) {
-+			do {
-+				Sleep (10000);
-+			} while(1);
-+		} else {
-+			while ((ret = waitpid (pid, &status, 0)) != pid) {
-+				if (ret == (pid_t)-1 && errno != EINTR) {
-+					return(WAIT_FAILED);
-+				}
- 			}
- 		}
- 	} else if (timeout == 0) {
-@@ -224,18 +236,47 @@
- 		}
- 	} else {
- 		/* Poll in a loop */
--		do {
--			ret = waitpid (pid, &status, WNOHANG);
--			if (ret == pid) {
--				break;
--			} else if (ret == (pid_t)-1 && errno != EINTR) {
--				return(WAIT_FAILED);
--			}
-+		if (pid == _wapi_getpid ()) {
-+			Sleep (timeout);
-+			return(WAIT_TIMEOUT);
-+		} else {
-+			do {
-+				ret = waitpid (pid, &status, WNOHANG);
-+#ifdef DEBUG
-+				g_message ("%s: waitpid returns: %d, timeout is %d", __func__, ret, timeout);
-+#endif
-+				
-+				if (ret == pid) {
-+					break;
-+				} else if (ret == (pid_t)-1 &&
-+					   errno != EINTR) {
-+#ifdef DEBUG
-+					g_message ("%s: waitpid failure: %s",
-+						   __func__,
-+						   g_strerror (errno));
-+#endif
- 
--			_wapi_handle_spin (100);
--			timeout -= 100;
--		} while (timeout > 0);
-+					if (errno == ECHILD &&
-+					    process_handle->waited) {
-+						/* The background
-+						 * process reaper must
-+						 * have got this one
-+						 */
-+#ifdef DEBUG
-+						g_message ("%s: Process %p already reaped", __func__, handle);
-+#endif
- 
-+						return(WAIT_OBJECT_0);
-+					} else {
-+						return(WAIT_FAILED);
-+					}
-+				}
-+
-+				_wapi_handle_spin (100);
-+				timeout -= 100;
-+			} while (timeout > 0);
-+		}
-+		
- 		if (timeout <= 0) {
- 			return(WAIT_TIMEOUT);
- 		}
-@@ -251,7 +292,8 @@
- 		SetLastError (ERROR_OUTOFMEMORY);
- 		return (WAIT_FAILED);
- 	}
--
-+	process_handle->waited = TRUE;
-+	
- 	return(WAIT_OBJECT_0);
- }
- 
-@@ -268,6 +310,8 @@
- 	process_handle->min_working_set = 204800;
- 	process_handle->max_working_set = 1413120;
- 
-+	process_handle->waited = FALSE;
-+	
- 	_wapi_time_t_to_filetime (time (NULL), &process_handle->create_time);
- }
- 
-@@ -919,6 +963,11 @@
- 		g_strfreev (env_strings);
- 	}
- 	
-+#ifdef DEBUG
-+	g_message ("%s: returning handle %p for pid %d", __func__, handle,
-+		   pid);
-+#endif
-+
- 	return(ret);
- }
- 		
-@@ -960,6 +1009,8 @@
- 	const char *handle_env;
- 	struct _WapiHandle_process process_handle = {0};
- 	
-+	mono_once (&process_ops_once, process_ops_init);
-+	
- 	handle_env = g_getenv ("_WAPI_PROCESS_HANDLE_OFFSET");
- 	g_unsetenv ("_WAPI_PROCESS_HANDLE_OFFSET");
- 	
---- trunk/mono/mono/io-layer/wapi-private.h	2006/03/24 12:19:30	58409
-+++ trunk/mono/mono/io-layer/wapi-private.h	2006/11/23 00:39:10	68378
-@@ -24,8 +24,7 @@
- /* Increment this whenever an incompatible change is made to the
-  * shared handle structure.
-  */
--/* Next time I change this, remember to fix the process count in shared.c */
--#define _WAPI_HANDLE_VERSION 10
-+#define _WAPI_HANDLE_VERSION 11
- 
- typedef enum {
- 	WAPI_HANDLE_UNUSED=0,
-
---- trunk/mono/mono/io-layer/shared.c	2006/07/25 12:56:51	62955
-+++ trunk/mono/mono/io-layer/shared.c	2006/11/23 00:39:10	68378
-@@ -292,12 +292,11 @@
- 	for (i = 0; i < _WAPI_SHARED_SEM_COUNT; i++) {
- 		def_vals[i] = 1;
- 	}
--#ifdef NEXT_VERSION_INC
-+
- 	/* Process count must start at '0' - the 1 for all the others
- 	 * sets the semaphore to "unlocked"
- 	 */
- 	def_vals[_WAPI_SHARED_SEM_PROCESS_COUNT] = 0;
--#endif
- 	
- 	defs.array = def_vals;
- 	
-@@ -438,19 +437,9 @@
- 	
- 	proc_count = semctl (_wapi_sem_id, _WAPI_SHARED_SEM_PROCESS_COUNT,
- 			     GETVAL);
--#ifdef NEXT_VERSION_INC
-+
- 	g_assert (proc_count > 0);
- 	if (proc_count == 1) {
--#else
--	/* Compatibility - the semaphore was initialised to '1' (which
--	 * normally means 'unlocked'.  Instead of fixing that right
--	 * now, which would mean a shared file version increment, just
--	 * cope with the value starting too high for now.  Fix this
--	 * next time I have to change the file version.
--	 */
--	g_assert (proc_count > 1);
--	if (proc_count == 2) {
--#endif
- 		/* Just us, so blow away the semaphores and the shared
- 		 * files
- 		 */
diff --git a/dev-lang/mono/mono-1.1.13.8.1.ebuild b/dev-lang/mono/mono-1.1.13.8.1.ebuild
deleted file mode 100644
index 584044b63f30..000000000000
--- a/dev-lang/mono/mono-1.1.13.8.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.13.8.1.ebuild,v 1.4 2006/11/06 19:40:35 dertobi123 Exp $
-
-inherit eutils mono flag-o-matic multilib autotools
-
-RESTRICT="confcache"
-
-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"
-
-DEPEND=">=dev-libs/glib-2.0
-	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
-	)"
-
-RDEPEND="${DEPEND}
-	X? ( >=dev-dotnet/libgdiplus-1.1.13 )
-	dev-util/pkgconfig
-	dev-libs/libxml2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix munging of Unix paths
-	epatch ${FILESDIR}/${PN}-1.1.13-pathfix.diff
-	epatch ${FILESDIR}/${PN}-1.1.13-resource-manager.diff
-	epatch ${FILESDIR}/${PN}-1.1.13.8-dynamic-assembly-get-types.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,mono/os/unix}/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 -j1 || die "MONO compilation failure"
-}
-
-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.1.18-r1.ebuild b/dev-lang/mono/mono-1.1.18-r1.ebuild
deleted file mode 100644
index e280b6ac46cf..000000000000
--- a/dev-lang/mono/mono-1.1.18-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.18-r1.ebuild,v 1.1 2006/10/28 19:41:16 latexer 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-${PV:0:3}/${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.1.18 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# confcache causes build errors
-RESTRICT="confcache"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix mcs crasher
-	cd ${S}/mcs
-	epatch ${FILESDIR}/${P}-mcs-crasher-fix.diff
-
-	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
-
-	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 || die "compile failed"
-}
-
-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.1.18.ebuild b/dev-lang/mono/mono-1.1.18.ebuild
deleted file mode 100644
index d366bf8c666b..000000000000
--- a/dev-lang/mono/mono-1.1.18.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.18.ebuild,v 1.3 2006/10/27 06:10:03 latexer 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-${PV:0:3}/${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.1.18 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# confcache causes build errors
-RESTRICT="confcache"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix mcs crasher
-	cd ${S}/mcs
-	epatch ${FILESDIR}/${P}-mcs-crasher-fix.diff
-
-	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
-
-	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 || die "compile failed"
-}
-
-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.1.ebuild b/dev-lang/mono/mono-1.2.1.ebuild
deleted file mode 100644
index 45e0aa702150..000000000000
--- a/dev-lang/mono/mono-1.2.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.1.ebuild,v 1.1 2006/11/24 23:40:40 latexer 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.1 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# confcache causes build errors
-RESTRICT="confcache"
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-zombie-processes.diff
-
-	# 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
-
-	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 || die "compile failed"
-}
-
-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.ebuild b/dev-lang/mono/mono-1.2.ebuild
deleted file mode 100644
index 3f3e69e15868..000000000000
--- a/dev-lang/mono/mono-1.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.ebuild,v 1.1 2006/11/10 22:52:02 latexer 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 )"
-DEPEND="${RDEPEND}
-		  sys-devel/bc
-		>=dev-util/pkgconfig-0.19"
-
-# Parallel build unfriendly
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# confcache causes build errors
-RESTRICT="confcache"
-
-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
-
-	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 || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-}