Revision bump with fix for mcs path finding on amd64/multilib arches. See bug #106661.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 121 insertions, 2 deletions

diff --git a/dev-util/monodevelop/ChangeLog b/dev-util/monodevelop/ChangeLog
index b5cf81bfb692..7fb13e536679 100644
--- a/dev-util/monodevelop/ChangeLog
+++ b/dev-util/monodevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/monodevelop
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.35 2005/09/16 06:30:50 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.36 2005/09/23 15:16:57 latexer Exp $
+
+*monodevelop-0.7-r2 (23 Sep 2005)
+
+  23 Sep 2005; Peter Johanson <latexer@gentoo.org>
+  +files/monodevelop-0.7-mcs-path-fix.diff, +monodevelop-0.7-r2.ebuild:
+  Revision bump with fix for mcs path finding on amd64/multilib arches. See
+  bug #106661.
 
   16 Sep 2005; Peter Johanson <latexer@gentoo.org> -monodevelop-0.7.ebuild:
   Remove one older version.
diff --git a/dev-util/monodevelop/Manifest b/dev-util/monodevelop/Manifest
index 3d3428bac251..cab32b692a07 100644
--- a/dev-util/monodevelop/Manifest
+++ b/dev-util/monodevelop/Manifest
@@ -1,10 +1,13 @@
 MD5 35c17e64aed292e7a7f6aeb5915787a3 monodevelop-0.5.1-r4.ebuild 1559
-MD5 e544a30a7e2b39773bf5a7b12c4abdbd ChangeLog 5980
+MD5 e236f49fd346c46a9c0dfe00f2b0aa3d ChangeLog 6230
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 9cf588769f67de01bdb230e64b451ac5 monodevelop-0.7-r1.ebuild 1800
+MD5 a430f9561f918a21f460a4749427c249 monodevelop-0.7-r2.ebuild 1843
 MD5 f36ce806f3552f974021d1a56021f67c files/monodevelop-0.5.1-iconloader.diff 1255
 MD5 9e3ea3908c299c9240a5f7689f83909a files/monodevelop-0.5.1-nemerle-gtk-sharp.diff 1874
 MD5 48b44fa7ba76c3b567d260ecff9e7aea files/digest-monodevelop-0.7-r1 68
 MD5 8c9f33855ebcc0bd8100baec6a00fb50 files/digest-monodevelop-0.5.1-r4 157
 MD5 cff7e9d967516c14789c6d0246791c9d files/monodevelop-0.7-boo-0.6.0-compat.diff 1576
 MD5 31886624cd9fce60d5c7346c2b22960e files/monodevelop-0.7-gtksharp-update.diff 8260
+MD5 48b6815b0eb2b1996cc0bd00b3e312a6 files/monodevelop-0.7-mcs-path-fix.diff 1917
+MD5 48b44fa7ba76c3b567d260ecff9e7aea files/digest-monodevelop-0.7-r2 68
diff --git a/dev-util/monodevelop/files/digest-monodevelop-0.7-r2 b/dev-util/monodevelop/files/digest-monodevelop-0.7-r2
new file mode 100644
index 000000000000..c965015f597c
--- /dev/null
+++ b/dev-util/monodevelop/files/digest-monodevelop-0.7-r2
@@ -0,0 +1 @@
+MD5 a62a5e12127ca5dd8c3e4f44dd6ecc4b monodevelop-0.7.tar.gz 1901522
diff --git a/dev-util/monodevelop/files/monodevelop-0.7-mcs-path-fix.diff b/dev-util/monodevelop/files/monodevelop-0.7-mcs-path-fix.diff
new file mode 100644
index 000000000000..88a94df0a83b
--- /dev/null
+++ b/dev-util/monodevelop/files/monodevelop-0.7-mcs-path-fix.diff
@@ -0,0 +1,38 @@
+diff -aur monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
+--- monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs	2005-03-22 13:02:01.000000000 -0500
++++ monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs	2005-09-23 00:33:46.000000000 -0400
+@@ -463,20 +463,23 @@
+ 			stream.Close ();
+ 		}
+ 		
++		string compilerName = String.Empty;
+ 		string GetCompilerName()
+ 		{
+-			//return fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()) + 
+-			//       "csc.exe";
+-			string ret = fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory());
+-			// Interop between mono 1.0.x and mono 1.1.x
+-			if (ret.IndexOf("mono/1.0") == -1) {
+-				ret = ret.Substring(0, ret.Length - 4);
+-				ret = ret + "bin/mcs";
+-			} else {
+-				ret = ret.Substring(0, ret.Length - 13);
+-				ret = ret + "bin/mcs";
++			if (compilerName == String.Empty)
++			{
++				string runtimeDir = fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory());
++				// The following regex foo gets the index of the
++				// last match of lib/lib32/lib64 and uses
++				// the text before that as the 'prefix' in order
++				// to find the right mcs to use.
++				Regex regex = new Regex ("lib[32 64]?");
++				MatchCollection matches = regex.Matches(runtimeDir);
++				Match match = matches[matches.Count - 1];
++				compilerName = runtimeDir.Substring(0, match.Index) + Path.Combine("bin", "mcs");
+ 			}
+-			return ret;
++
++			return compilerName;
+ 		}
+ 		
+ 		ICompilerResult ParseOutput(TempFileCollection tf, string stdout, string stderr)
diff --git a/dev-util/monodevelop/monodevelop-0.7-r2.ebuild b/dev-util/monodevelop/monodevelop-0.7-r2.ebuild
new file mode 100644
index 000000000000..fc85b941d5f9
--- /dev/null
+++ b/dev-util/monodevelop/monodevelop-0.7-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-0.7-r2.ebuild,v 1.1 2005/09/23 15:16:57 latexer Exp $
+
+inherit mono eutils fdo-mime
+
+DESCRIPTION="MonoDevelop is a project to port SharpDevelop to Gtk#"
+SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.gz"
+HOMEPAGE="http://monodevelop.com/"
+LICENSE="GPL-2"
+
+IUSE="boo java"
+DEPEND=">=dev-dotnet/gtksourceview-sharp-0.10
+	>=dev-dotnet/gecko-sharp-0.10
+	>=dev-lang/mono-1.1.4
+	>=dev-util/monodoc-1.0
+	>=dev-dotnet/gtk-sharp-2.3.90
+	>=dev-dotnet/gnomevfs-sharp-2.3.90
+	>=dev-dotnet/gnome-sharp-2.3.90
+	>=dev-dotnet/gconf-sharp-2.3.90
+	>=dev-dotnet/gtkhtml-sharp-2.3.90
+	>=dev-dotnet/glade-sharp-2.3.90
+	>=sys-devel/automake-1.8
+	boo? ( >=dev-lang/boo-0.6.0 )
+	java? ( || ( >=dev-dotnet/ikvm-bin-0.14 >=dev-dotnet/ikvm-0.14.0.1-r1 ) )"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gtksharp-update.diff
+	epatch ${FILESDIR}/${P}-boo-0.6.0-compat.diff
+	epatch ${FILESDIR}/${P}-mcs-path-fix.diff
+}
+
+src_compile() {
+	econf \
+		$(use_enable boo) \
+		$(use_enable java) \
+		--disable-update-mimedb \
+		--disable-update-desktopdb \
+		|| die
+	emake -j1 || die
+}
+
+src_install () {
+	# Needed if update-mime-info is run
+	addwrite ${ROOT}/usr/share/mime
+
+	make DESTDIR=${D} install || die
+
+	# Install documentation.
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	echo
+	ewarn "${P} is affected by a bug in gtk-sharp which makes it"
+	ewarn "crash horribly when loading any project referencing the"
+	ewarn "gtk-sharp-1.0.x assemblies. If you absolutly need to use"
+	ewarn "monodevelop to compile such projects, use ${PN}-0.5.x with"
+	ewarn "mono-1.0.x"
+	echo
+}