Fix compilation with mono-debugger-2.4.2, bug 273488.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 535 insertions, 5 deletions

diff --git a/dev-util/monodevelop-debugger-mdb/ChangeLog b/dev-util/monodevelop-debugger-mdb/ChangeLog
index 0e69fc44b6b0..a21758fc4a86 100644
--- a/dev-util/monodevelop-debugger-mdb/ChangeLog
+++ b/dev-util/monodevelop-debugger-mdb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/monodevelop-debugger-mdb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop-debugger-mdb/ChangeLog,v 1.3 2009/03/30 18:58:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop-debugger-mdb/ChangeLog,v 1.4 2009/06/18 17:25:06 loki_val Exp $
+
+*monodevelop-debugger-mdb-2.0-r1 (18 Jun 2009)
+
+  18 Jun 2009; Peter Alfredsen <loki_val@gentoo.org>
+  monodevelop-debugger-mdb-2.0.ebuild,
+  +monodevelop-debugger-mdb-2.0-r1.ebuild,
+  +files/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch:
+  Fix compilation with mono-debugger-2.4.2, bug 273488.
 
 *monodevelop-debugger-mdb-2.0 (30 Mar 2009)
 
diff --git a/dev-util/monodevelop-debugger-mdb/Manifest b/dev-util/monodevelop-debugger-mdb/Manifest
index d7262a78e17a..77ed99a027fa 100644
--- a/dev-util/monodevelop-debugger-mdb/Manifest
+++ b/dev-util/monodevelop-debugger-mdb/Manifest
@@ -1,4 +1,6 @@
+AUX monodevelop-debugger-mdb-2.0-mono-2.4.2.patch 16652 RMD160 0c1442311e9efb8b3097e310debc77485523a5f7 SHA1 9add34ec0d30221a2dc1657b8daec85769b24204 SHA256 fd2eca14ceba666a8239f7e83de8374689098432ff17f8bc5910bdb5477e45a3
 DIST monodevelop-debugger-mdb-2.0.tar.bz2 42044 RMD160 4e50b0cd56f3fdf8c41f5541277c3019e2998b0a SHA1 18bbe195c45c4d2df6ae263ad19514676c688804 SHA256 82a1e345ab4c62a3a330b405bfad94d3bb3ec0678ac98b87b6bd8c3752839f15
-EBUILD monodevelop-debugger-mdb-2.0.ebuild 868 RMD160 f580e48e1f9f223ac7b600140ec350103abf1cd2 SHA1 c3d9e55e0e6153d9eb8016ec8cf6f80710f15541 SHA256 2aacc421f50d30e4b7c482ac87b27d6acc665fc5476f89ca5cb18610fa9090f9
-MISC ChangeLog 947 RMD160 79a39d135a0177ecc909621fb34ceacc83c10009 SHA1 3273adede2a472bc91926dcaf0f4228b962e7ab2 SHA256 cdba005eda2a132d38db0632143ad8d888b824f8992058c69764341976fa5b03
+EBUILD monodevelop-debugger-mdb-2.0-r1.ebuild 955 RMD160 729d70cf60610bbfb97e48ea81e8bff25dec1dfb SHA1 1652896fe7203c0c2af713319a112eae4cf6de67 SHA256 97eac00a22242cd08dd3e3fa19f7220d3570961b7c4a5c2110ca63df16c3b031
+EBUILD monodevelop-debugger-mdb-2.0.ebuild 876 RMD160 dde04785a4399bf871220c3f59e8312053080b44 SHA1 65fece9c6cf86d56f4b6d6bc491b4216290dbb95 SHA256 0c1ef02cd43b8bb041ad3aaed984bdf9044ae93c43d94acaf196e1353bf2b77e
+MISC ChangeLog 1243 RMD160 def208f23ef9311f17c0a86b17a2e8d2b5a4a6b3 SHA1 538d0c58f960b0a8991d5b35a91645da04c70f26 SHA256 1659e666dd9e41acd033fd3b9ca002470195801533b3af5b186f68d2289233a4
 MISC metadata.xml 161 RMD160 a0a2d2292aa270508f486b7b8df44e41284c26d7 SHA1 9b8b4681d509e9534cc771857355f912aa79643d SHA256 94675b9f5f7cd65b33f9ad2c853ad20c178253e38c6535795a189ef89f1b11f7
diff --git a/dev-util/monodevelop-debugger-mdb/files/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch b/dev-util/monodevelop-debugger-mdb/files/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch
new file mode 100644
index 000000000000..9cff3ac3daee
--- /dev/null
+++ b/dev-util/monodevelop-debugger-mdb/files/monodevelop-debugger-mdb-2.0-mono-2.4.2.patch
@@ -0,0 +1,478 @@
+Index: Mono.Debugging.Server.Mdb/DebuggerServer.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/DebuggerServer.cs	(revision 136420)
++++ Mono.Debugging.Server.Mdb/DebuggerServer.cs	(revision 136421)
+@@ -39,6 +39,7 @@
+ 		Dictionary<int, ST.WaitCallback> breakUpdates = new Dictionary<int,ST.WaitCallback> ();
+ 		bool breakUpdateEventsQueued;
+ 		
++		MdbAdaptor mdbAdaptor;
+ 		AsyncEvaluationTracker asyncEvaluationTracker;
+ 		RuntimeInvokeManager invokeManager;
+ 
+@@ -51,6 +52,7 @@
+ 		public DebuggerServer (IDebuggerController dc)
+ 		{
+ 			this.controller = dc;
++			
+ 			MarshalByRefObject mbr = (MarshalByRefObject)controller;
+ 			ILease lease = mbr.GetLifetimeService() as ILease;
+ 			lease.Register(this);
+@@ -79,8 +81,18 @@
+ 			}
+ 		}
+ 
++		public MdbAdaptor MdbAdaptor {
++			get { return mdbAdaptor; }
++		}
++
+ 		#region IDebugger Members
+ 
++		public string InitializeMdb (string mdbVersion)
++		{
++			mdbAdaptor = MdbAdaptorFactory.CreateAdaptor (mdbVersion);
++			return mdbAdaptor.MdbVersion;
++		}
++
+ 		public void Run (DL.DebuggerStartInfo startInfo)
+ 		{
+ 			try {
+@@ -91,6 +103,7 @@
+ 
+ 				DebuggerConfiguration config = new DebuggerConfiguration ();
+ 				config.LoadConfiguration ();
++				mdbAdaptor.InitializeConfiguration (config);
+ 				debugger = new MD.Debugger (config);
+ 				
+ 				debugger.ModuleLoadedEvent += OnModuleLoadedEvent;
+Index: Mono.Debugging.Server.Mdb/MdbAdaptor.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/MdbAdaptor.cs	(revision 0)
++++ Mono.Debugging.Server.Mdb/MdbAdaptor.cs	(revision 136421)
+@@ -0,0 +1,62 @@
++// 
++// MdbAdaptor.cs
++//  
++// Author:
++//       Lluis Sanchez Gual <lluis@novell.com>
++// 
++// Copyright (c) 2009 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 "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++// 
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++// 
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++using System;
++using MDB=Mono.Debugger;
++using Mono.Debugging.Backend.Mdb;
++
++namespace DebuggerServer
++{
++	public abstract class MdbAdaptor
++	{
++		public MdbAdaptor ()
++		{
++			MdbVersion = "2.0";
++		}
++		
++		public string MdbVersion { get; internal set; }
++		
++		public virtual void SetupXsp (MDB.DebuggerConfiguration config)
++		{
++			ThrowNotSupported ("ASP.NET debugging not supported");
++		}
++		
++		public virtual void InitializeBreakpoint (MDB.SourceBreakpoint bp)
++		{
++		}
++		
++		public virtual void InitializeConfiguration (MDB.DebuggerConfiguration config)
++		{
++		}
++		
++		public abstract void AbortThread (MDB.Thread thread, MDB.RuntimeInvokeResult result);
++		
++		public void ThrowNotSupported (string feature)
++		{
++			throw new InvalidOperationException (feature + ". You need to install a more recent Mono Debugger version.");
++		}
++	}
++}
+Index: Mono.Debugging.Server.Mdb/Makefile
+===================================================================
+--- Mono.Debugging.Server.Mdb/Makefile	(revision 136420)
++++ Mono.Debugging.Server.Mdb/Makefile	(revision 136421)
+@@ -59,6 +59,8 @@
+ 	ICollectionAdaptor.cs \
+ 	IndexerValueReference.cs \
+ 	LiteralValueReference.cs \
++	MdbAdaptor.cs \
++	MdbAdaptorFactory.cs \
+ 	NamespaceValueReference.cs \
+ 	NRefactoryEvaluator.cs \
+ 	NullValueReference.cs \
+@@ -77,7 +79,9 @@
+ 
+ DATA_FILES = 
+ 
+-RESOURCES = 
++RESOURCES =  \
++	MdbAdaptor-2-0.cs \
++	MdbAdaptor-2-4-2.cs 
+ 
+ EXTRAS = \
+ 	ChangeLog 
+Index: Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs	(revision 0)
++++ Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs	(revision 136421)
+@@ -0,0 +1,51 @@
++// 
++// MdbAdaptor22.cs
++//  
++// Author:
++//       Lluis Sanchez Gual <lluis@novell.com>
++// 
++// Copyright (c) 2009 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 "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++// 
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++// 
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++using System;
++using Mono.Debugger;
++
++namespace DebuggerServer
++{
++	public class MdbAdaptor_2_4_2: MdbAdaptor
++	{
++		public override void SetupXsp (DebuggerConfiguration config)
++		{
++			config.SetupXSP ();
++			config.StopOnManagedSignals = true;
++		}
++		
++		public override void InitializeConfiguration (Mono.Debugger.DebuggerConfiguration config)
++		{
++			base.InitializeConfiguration (config);
++			config.RedirectOutput = true;
++		}
++
++		public override void AbortThread (Mono.Debugger.Thread thread, Mono.Debugger.RuntimeInvokeResult result)
++		{
++			result.Abort ();
++		}
++	}
++}
+Index: Mono.Debugging.Server.Mdb/ChangeLog
+===================================================================
+--- Mono.Debugging.Server.Mdb/ChangeLog	(revision 136420)
++++ Mono.Debugging.Server.Mdb/ChangeLog	(revision 136421)
+@@ -1,3 +1,16 @@
++2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
++
++	* Makefile:
++	* MdbAdaptor.cs:
++	* MdbAdaptor-2-0.cs:
++	* DebuggerServer.cs:
++	* MdbAdaptor-2-4-2.cs:
++	* MdbAdaptorFactory.cs:
++	* RuntimeInvokeManager.cs:
++	* Mono.Debugging.Server.Mdb.csproj: Added support for mono
++	  2.4.2. Since the api changed, access to the changed methods
++	  has to be done through a dynamically compiled adapter.
++
+ 2009-02-20  Lluis Sanchez Gual  <lluis@novell.com>
+ 
+ 	* Mono.Debugging.Server.Mdb.csproj: Updated references.
+Index: Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs	(revision 136420)
++++ Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs	(revision 136421)
+@@ -52,9 +52,7 @@
+ 					lock (operationsToCancel) {
+ 						if (!aborted) {
+ 							aborted = true;
+-							res.Abort ();
+-							res.CompletedEvent.WaitOne ();
+-							ctx.Thread.AbortInvocation ();
++							Server.Instance.MdbAdaptor.AbortThread (ctx.Thread, res);
+ 							WaitToStop (ctx.Thread);
+ 						}
+ 					}
+@@ -73,9 +71,7 @@
+ 						}
+ 						else
+ 							aborted = true;
+-						res.Abort ();
+-						res.CompletedEvent.WaitOne ();
+-						ctx.Thread.AbortInvocation ();
++						Server.Instance.MdbAdaptor.AbortThread (ctx.Thread, res);
+ 						WaitToStop (ctx.Thread);
+ 						throw new TimeOutException ();
+ 					}
+Index: Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs	(revision 0)
++++ Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs	(revision 136421)
+@@ -0,0 +1,128 @@
++// 
++// MdbAdaptorFactory.cs
++//  
++// Author:
++//       Lluis Sanchez Gual <lluis@novell.com>
++// 
++// Copyright (c) 2009 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 "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++// 
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++// 
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++using System;
++using System.Reflection;
++using System.Diagnostics;
++using System.IO;
++
++namespace DebuggerServer
++{
++	public static class MdbAdaptorFactory
++	{
++		// Bump this version number if any change is in MdbAdaptor or subclases
++		const int ApiVersion = 2;
++		
++		static readonly string[] supportedVersions = new string[] {"2-4-2", "2-0"};
++		
++		public static MdbAdaptor CreateAdaptor (string mdbVersion)
++		{
++			ProcessStartInfo pinfo = new ProcessStartInfo ();
++			pinfo.FileName = "gmcs";
++			
++			if (mdbVersion != null) {
++				MdbAdaptor mdb = TryCreateAdaptor (pinfo, mdbVersion);
++				if (mdb == null)
++					throw new InvalidOperationException ("Unsupported MDB version");
++				return mdb;
++			}
++			
++			foreach (string v in supportedVersions) {
++				MdbAdaptor mdb = TryCreateAdaptor (pinfo, v);
++				if (mdb != null)
++					return mdb;
++			}
++			throw new InvalidOperationException ("Unsupported MDB version");
++		}
++		
++		static MdbAdaptor TryCreateAdaptor (ProcessStartInfo pinfo, string versions)
++		{
++			string[] versionsArray = versions.Split ('|');
++			string version = versionsArray [0];
++			
++			string tmpPath = Path.GetTempPath ();
++			tmpPath = Path.Combine (tmpPath, "monodevelop-debugger-mdb");
++			if (!Directory.Exists (tmpPath))
++				Directory.CreateDirectory (tmpPath);
++			
++			string outFile = Path.Combine (tmpPath, "adaptor-" + ApiVersion + "--" + version + ".dll");
++			
++			string[] refAssemblies = new string [] {
++				typeof(MdbAdaptorFactory).Assembly.Location,
++				typeof(Mono.Debugger.Debugger).Assembly.Location,
++				typeof(Mono.Debugging.Client.DebuggerSession).Assembly.Location,
++				typeof(Mono.Debugging.Backend.Mdb.IDebuggerServer).Assembly.Location
++			};
++			
++			DateTime refsTime = DateTime.MinValue;
++			foreach (string rasm in refAssemblies) {
++				DateTime t = File.GetLastWriteTime (rasm);
++				if (t > refsTime)
++					refsTime = t;
++			}
++			
++			if (!File.Exists (outFile) || File.GetLastWriteTime (outFile) < refsTime) {
++				string args = "/t:library ";
++				args += "\"/out:" + outFile + "\" ";
++				foreach (string rasm in refAssemblies)
++					args += "\"/r:" + rasm + "\" ";
++				
++				// Write the source code for all required classes
++				foreach (string ver in versionsArray) {
++					Stream s = typeof(MdbAdaptorFactory).Assembly.GetManifestResourceStream ("MdbAdaptor-" + ver + ".cs");
++					StreamReader sr = new StreamReader (s);
++					string txt = sr.ReadToEnd ();
++					sr.Close ();
++					s.Close ();
++					
++					string csfile = Path.Combine (tmpPath, "adaptor-" + ver + ".cs");
++					File.WriteAllText (csfile, txt);
++					args += "\"" + csfile + "\" ";
++				}
++				
++				pinfo.Arguments = args;
++				Process proc = Process.Start (pinfo);
++				proc.WaitForExit ();
++				if (proc.ExitCode != 0)
++					return null;
++				Console.WriteLine ("Generated: " + outFile);
++			}
++			
++			Assembly asm = Assembly.LoadFrom (outFile);
++			Type at = asm.GetType ("DebuggerServer.MdbAdaptor_" + version.Replace ('-','_'));
++			if (at != null) {
++				try {
++					MdbAdaptor a = (MdbAdaptor) Activator.CreateInstance (at);
++					a.MdbVersion = version;
++					return a;
++				} catch {
++					// MDB version not really supported
++				}
++			}
++			return null;
++		}
++	}
++}
+Index: Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs
+===================================================================
+--- Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs	(revision 0)
++++ Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs	(revision 136421)
+@@ -0,0 +1,40 @@
++// 
++// MdbAdaptor_2_0.cs
++//  
++// Author:
++//       Lluis Sanchez Gual <lluis@novell.com>
++// 
++// Copyright (c) 2009 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 "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++// 
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++// 
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++using System;
++
++namespace DebuggerServer
++{
++	public class MdbAdaptor_2_0: MdbAdaptor
++	{
++		public override void AbortThread (Mono.Debugger.Thread thread, Mono.Debugger.RuntimeInvokeResult result)
++		{
++			result.Abort ();
++			result.CompletedEvent.WaitOne ();
++			thread.AbortInvocation ();
++		}
++	}
++}
+Index: Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs
+===================================================================
+--- Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs	(revision 136420)
++++ Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs	(revision 136421)
+@@ -37,11 +37,13 @@
+ 	public class MonoDebuggerSession: DebuggerSession
+ 	{
+ 		DebuggerController controller;
++		static string detectedMdbVersion;
+ 		
+ 		public void StartDebugger ()
+ 		{
+ 			controller = new DebuggerController (this, Frontend);
+ 			controller.StartDebugger ();
++			InitMdbVersion ();
+ 		}
+ 		
+ 		public override void Dispose ()
+@@ -54,6 +56,12 @@
+ 		{
+ 			controller.DebuggerServer.Run (startInfo);
+ 		}
++		
++		void InitMdbVersion ()
++		{
++			// Cache detected mdb versions, so version detection is done only once
++			detectedMdbVersion = controller.DebuggerServer.InitializeMdb (detectedMdbVersion);
++		}
+ 
+ 		protected override void OnAttachToProcess (int processId)
+ 		{
+Index: Mono.Debugging.Backend.Mdb/ChangeLog
+===================================================================
+--- Mono.Debugging.Backend.Mdb/ChangeLog	(revision 136420)
++++ Mono.Debugging.Backend.Mdb/ChangeLog	(revision 136421)
+@@ -1,3 +1,10 @@
++2009-06-18  Lluis Sanchez Gual  <lluis@novell.com>
++
++	* IDebuggerServer.cs:
++	* MonoDebuggerSession.cs: Added support for mono 2.4.2. Since
++	  the api changed, access to the changed methods has to be
++	  done through a dynamically compiled adapter.
++
+ 2009-03-05  Lluis Sanchez Gual  <lluis@novell.com>
+ 
+ 	* AssemblyInfo.cs:
+Index: Mono.Debugging.Backend.Mdb/IDebuggerServer.cs
+===================================================================
+--- Mono.Debugging.Backend.Mdb/IDebuggerServer.cs	(revision 136420)
++++ Mono.Debugging.Backend.Mdb/IDebuggerServer.cs	(revision 136421)
+@@ -32,6 +32,8 @@
+ {
+ 	public interface IDebuggerServer
+ 	{
++		string InitializeMdb (string mdbVersion);
++		
+ 		void Run (DebuggerStartInfo startInfo);
+ 
+ 		void Stop ();
diff --git a/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-r1.ebuild b/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-r1.ebuild
new file mode 100644
index 000000000000..d4c73936eb1a
--- /dev/null
+++ b/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0-r1.ebuild,v 1.1 2009/06/18 17:25:06 loki_val Exp $
+
+EAPI=2
+
+inherit mono multilib eutils
+
+DESCRIPTION="MDB Extension for MonoDevelop"
+HOMEPAGE="http://www.monodevelop.com/"
+SRC_URI="http://ftp.novell.com/pub/mono/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/mono-2.4.2_pre1
+	=dev-util/monodevelop-${PV}*
+	 >=dev-util/mono-debugger-2.0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.23"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0-mono-2.4.2.patch"
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr		\
+	|| die "configure failed"
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "install failed"
+	mono_multilib_comply
+}
diff --git a/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.ebuild b/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.ebuild
index 447873acb33c..047f0bbf4bf7 100644
--- a/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.ebuild
+++ b/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.ebuild,v 1.1 2009/03/30 18:58:08 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop-debugger-mdb/monodevelop-debugger-mdb-2.0.ebuild,v 1.2 2009/06/18 17:25:06 loki_val Exp $
 
 EAPI=2
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=dev-lang/mono-2
+RDEPEND="<dev-lang/mono-2.4.2_pre1
 	=dev-util/monodevelop-${PV}*
 	 >=dev-util/mono-debugger-2.0"