Fix nasty bug in mcs cause banshee not to compile. See bug #152843.

Package-Manager: portage-2.1.2_pre2-r8

4 files changed, 35 insertions, 10 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 32cce772051b..170d46cf251a 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.92 2006/10/22 18:42:50 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.93 2006/10/27 06:10:03 latexer Exp $
+
+  27 Oct 2006; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.18-mcs-crasher-fix.diff, mono-1.1.18.ebuild:
+  Fix nasty bug in mcs cause banshee not to compile. See bug #152843.
 
   22 Oct 2006; Jurek Bartuszek <jurek@gentoo.org> mono-1.1.18.ebuild:
   Updated dependency for libgdiplus (was >=1.1.17, is >=1.1.18).
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 7e03a7960541..be47ede51c0b 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -22,6 +22,10 @@ AUX mono-1.1.13.8-dynamic-assembly-get-types.diff 879 RMD160 b9f5145db1e976a18fd
 MD5 7511373a118b88b5ea102f7b3ff73f9e files/mono-1.1.13.8-dynamic-assembly-get-types.diff 879
 RMD160 b9f5145db1e976a18fd0e5e9b3626d3f63b37638 files/mono-1.1.13.8-dynamic-assembly-get-types.diff 879
 SHA256 b154eb304b73a2588d2669a0ff819d6391e9b12098454cdf72c0ab9002865340 files/mono-1.1.13.8-dynamic-assembly-get-types.diff 879
+AUX mono-1.1.18-mcs-crasher-fix.diff 437 RMD160 08cd21ee2aaf40d1fc608a48eaa07fc72a486034 SHA1 cc65b495db168b41582f8069c132066fd706174b SHA256 71b06b9f00ad66a87872cd90f3c3d578e11a2152215883a40c73c44879cf7c80
+MD5 48a38cb735bc6e9a4735dc9c2952625b files/mono-1.1.18-mcs-crasher-fix.diff 437
+RMD160 08cd21ee2aaf40d1fc608a48eaa07fc72a486034 files/mono-1.1.18-mcs-crasher-fix.diff 437
+SHA256 71b06b9f00ad66a87872cd90f3c3d578e11a2152215883a40c73c44879cf7c80 files/mono-1.1.18-mcs-crasher-fix.diff 437
 AUX mono-1.1.5-icu-linking.diff 468 RMD160 54bf343447bb7142b5821edc3122671b9b263e97 SHA1 eb84b2e4a52c0585d5e6bb20a9190a6175c354f9 SHA256 d14621935b1e8214ef713d2ce9480085a60798a2138ded1a7517ac4867479797
 MD5 046e84a24a93a7c5c1b6a6c4e8cf3fed files/mono-1.1.5-icu-linking.diff 468
 RMD160 54bf343447bb7142b5821edc3122671b9b263e97 files/mono-1.1.5-icu-linking.diff 468
@@ -111,18 +115,18 @@ EBUILD mono-1.1.17.1.ebuild 2762 RMD160 55c46f4ed769382f0d2a1acc9bdc1cde8dbd4fc2
 MD5 93477e0320b72e6ba4d5b7a24c9b89e7 mono-1.1.17.1.ebuild 2762
 RMD160 55c46f4ed769382f0d2a1acc9bdc1cde8dbd4fc2 mono-1.1.17.1.ebuild 2762
 SHA256 2824d76116105dd5c5cb1ff63a428154864f247473893c0d9501012a5d39b28e mono-1.1.17.1.ebuild 2762
-EBUILD mono-1.1.18.ebuild 2757 RMD160 1292308fcd48a542083b9ba9f8fbaac47de0d13b SHA1 fd55aec110e262b64eee6aeb56c52a4c34ebf24a SHA256 b1895b5fb2dd37d61085dd859994ba25fa6057e33232404f248fc6f9ff6c171d
-MD5 f71c2471d9750ab38502756668295dc2 mono-1.1.18.ebuild 2757
-RMD160 1292308fcd48a542083b9ba9f8fbaac47de0d13b mono-1.1.18.ebuild 2757
-SHA256 b1895b5fb2dd37d61085dd859994ba25fa6057e33232404f248fc6f9ff6c171d mono-1.1.18.ebuild 2757
+EBUILD mono-1.1.18.ebuild 2839 RMD160 0d460cf3ba4ae4ded656f8a7eb919c3011579ac5 SHA1 67256536a84d982b3fb157063c3425cd5432dccf SHA256 7a986002ca72aa5a399666e015c1a74929573d994d8b76dbf6792b724391add3
+MD5 161188252053d1852e854b488b901647 mono-1.1.18.ebuild 2839
+RMD160 0d460cf3ba4ae4ded656f8a7eb919c3011579ac5 mono-1.1.18.ebuild 2839
+SHA256 7a986002ca72aa5a399666e015c1a74929573d994d8b76dbf6792b724391add3 mono-1.1.18.ebuild 2839
 EBUILD mono-1.1.8.3.ebuild 2487 RMD160 77bffc9eb0883e7e6624829b1f5bf44a15021cbc SHA1 3e482ed0f4bd15a5bb6d0e29d4ef61d14d8063e3 SHA256 02a7e3ab2158beec15e5e02a53dddb67ef8ddc7280d22bc7fc7eb2acc48967ca
 MD5 4bfd6907ec394737df6275cf0472da49 mono-1.1.8.3.ebuild 2487
 RMD160 77bffc9eb0883e7e6624829b1f5bf44a15021cbc mono-1.1.8.3.ebuild 2487
 SHA256 02a7e3ab2158beec15e5e02a53dddb67ef8ddc7280d22bc7fc7eb2acc48967ca mono-1.1.8.3.ebuild 2487
-MISC ChangeLog 23480 RMD160 825d56f03c70c6ef50b23198ee7ea5cf0665068e SHA1 d80b404e5666b9dbdd224b9d0aba925efa4ae0b5 SHA256 fa54b5bc269ac16b98379abfbc0dadee8b9c9997872c15cdaaac5f81196db722
-MD5 5e3834b7809d543d7efbcdd679d028aa ChangeLog 23480
-RMD160 825d56f03c70c6ef50b23198ee7ea5cf0665068e ChangeLog 23480
-SHA256 fa54b5bc269ac16b98379abfbc0dadee8b9c9997872c15cdaaac5f81196db722 ChangeLog 23480
+MISC ChangeLog 23667 RMD160 77f2e6ab0811d8ebf4c54b50a4d1f19b2617b211 SHA1 225934076f82054b1006b7caf5f4ead0dd99f806 SHA256 4ed94710d540d3f7ed5904e27fe2d9cfedbeef8145be08d2715fdf4e17228361
+MD5 d5b9a49497589f231b038b8d4350db80 ChangeLog 23667
+RMD160 77f2e6ab0811d8ebf4c54b50a4d1f19b2617b211 ChangeLog 23667
+SHA256 4ed94710d540d3f7ed5904e27fe2d9cfedbeef8145be08d2715fdf4e17228361 ChangeLog 23667
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 metadata.xml 159
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
new file mode 100644
index 000000000000..c3aaec8a03a5
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.18-mcs-crasher-fix.diff
@@ -0,0 +1,12 @@
+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/mono-1.1.18.ebuild b/dev-lang/mono/mono-1.1.18.ebuild
index e3fc9eff77d5..d366bf8c666b 100644
--- a/dev-lang/mono/mono-1.1.18.ebuild
+++ b/dev-lang/mono/mono-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2006/10/22 18:42:50 jurek Exp $
+# $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
 
@@ -37,6 +37,11 @@ function get-memory-total() {
 
 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)