Revbump with fix for bug 257313, OOM bug when compiling openoffice.

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

4 files changed, 52 insertions, 4 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 2572e05e6495..41e0d6352613 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/mono
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.168 2009/05/09 00:16:48 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.169 2009/05/12 20:30:20 loki_val Exp $
+
+*mono-2.4-r2 (12 May 2009)
+
+  12 May 2009; Peter Alfredsen <loki_val@gentoo.org> -mono-2.4-r1.ebuild,
+  +mono-2.4-r2.ebuild, +files/mono-2.4-openoffice.patch:
+  Revbump with fix for bug 257313, OOM bug when compiling openoffice.
 
   09 May 2009; Peter Alfredsen <loki_val@gentoo.org> mono-2.4.9999.ebuild:
   Switch back to 2-4 branch
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 9af9dfdb3c41..5f9eefcd643f 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -13,6 +13,7 @@ AUX mono-2.2-ppc-threading.patch 563 RMD160 2ed9822034a966e31cc90312c09e4fec7095
 AUX mono-2.2-r121596-work-around-runtime-crash.patch 767 RMD160 a1b7ef12e28a3c14f1beff5f490523efbc474d26 SHA1 be9eb136478b61ff0f365fc9c6f51f082df50c61 SHA256 302df7e285fdc6dc44729d85b6784c3a2abd365b6915f8e00323b611fd12c5b1
 AUX mono-2.2-r123987-bless-crash.patch 1543 RMD160 5c56cc0b69e09c2dee150bd6c34d0e1abbe3c82c SHA1 81709d2196530b7e15f96aa6ec325510bff7cda2 SHA256 3125ecbe26798ad4e009b04845e3eb8895d537bd8e1a7fd67267491403c8010e
 AUX mono-2.2-uselibdir.patch 714 RMD160 fb0478a9923c5de30b6f71fa1c1cad9703e3dc8c SHA1 790e357aaccb87cb76f08a1c12e16a8804e23b58 SHA256 0d97639d48e9a40847f1053799d00827323df0af615fdf26254a03f069123b03
+AUX mono-2.4-openoffice.patch 925 RMD160 37659aa877e5dd9b7a36bf6b2c522762e595747d SHA1 c7fff16e6dd5dced08feb3bd16c9b41342c2d8ab SHA256 cdedb982bd67bba7db1fb8bbf18af2a31f4b9b72caeab290bc74e060116ba627
 AUX mono-2.4-ppcbuild-fix.patch 1141 RMD160 3519c930ac57317aa473593ed0962c90c7dea900 SHA1 d86b76af7b246ebefd209e26368a89460d31be67 SHA256 d6ddde4185f8c459a8953cc8a7bd5a1ea5d1eecb7ea4c5cb0c404462ab1ba3ee
 AUX mono-biginteger_overflow.diff 848 RMD160 1f2cb38e577102943399459e2ef0f511dcad5209 SHA1 15203be56015aed4a9b63ca3ade01d3a22f4bae3 SHA256 adc10b8a97cbcb6b4758f7de041eee757259d55e1e2cbaf84a89e5ef83e46806
 DIST mono-1.2.5.1.tar.bz2 17492757 RMD160 8000374d9aaa3149599ba83079959303a6bae014 SHA1 c5f843cfdbb1d0114059c7d2d9ba2477529d22a8 SHA256 434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96
@@ -26,9 +27,9 @@ EBUILD mono-2.0.1-r1.ebuild 3345 RMD160 01c45829585999af6d2ee4469cd6167b20e19909
 EBUILD mono-2.0.9999.ebuild 7424 RMD160 f2dce783cbe755aa3c716acc2dc33266c97a96bc SHA1 95a2312709715fdda3e60baf2e51cab27513a026 SHA256 5fbe767454182db3091f57c34a3953b33c4600538ffcdc137289630da867f9de
 EBUILD mono-2.2-r5.ebuild 7148 RMD160 bdbdbe8b2bb13c72879880b02f07a20c5b01295f SHA1 8281fc4a4f7c52c8242506bf06a6804d11c8cac7 SHA256 d0669daee864058838207a9b6f8adba720f0322f97652e9758caf47aafd98c21
 EBUILD mono-2.2.9999.ebuild 7539 RMD160 8979507f63308d3ea1703019315e77d30f105611 SHA1 f3ef56f15bfb57fc2ba2ab1dbde433b93f5cab98 SHA256 921633a30b2629cfb0617d3168e4174e85b8accba131a8fd525bf9ab56f212ca
-EBUILD mono-2.4-r1.ebuild 7198 RMD160 b72423a0f7050937292a1b0340918238c1ffeaa2 SHA1 6bd37677cc91c1ee661571fb0fae1d7774ecee50 SHA256 4600d0944fe6d5ea26db6169aa64e6244eeca0904f0f9d16d8bcfb6627f8064d
+EBUILD mono-2.4-r2.ebuild 7238 RMD160 c26eec9775efb524883fdb2e087e84979789b563 SHA1 3240b58f935dca84394d123870f8236451c5638a SHA256 05efe768202ddf6b3c38b69701c21cfa6f11a0d40d1813293ec3dd9c5403af71
 EBUILD mono-2.4.9999.ebuild 7539 RMD160 3b6ff81cb5af8902ea014d4e0b8bf6e915725068 SHA1 c5b68ba349794d7a7addcc024e64dc2d2dce8773 SHA256 972a32aebf963f3fa7c3333a95d4af2a483e0d8d38ff4df1e97490b2f1774da9
 EBUILD mono-2.4.ebuild 7021 RMD160 5e8e7200aff57bf24ac4d5a8c0a95cc68f31678c SHA1 f561af0952785cf9ad4dcf2186e073df0440d8b4 SHA256 840b575a6284d8172e629ef6a4548ff1b237d9e10fbae82c120989f0a5f66dc9
 EBUILD mono-9999.ebuild 7535 RMD160 2e8b279fa1ad5faff6fd2ad995792baaec940a51 SHA1 72ea252f50cf82489eb8c2de970ec39d331a638c SHA256 e6172cc44b375914724e8fa1df2d4213c978815d099e158e139a8325ec79c421
-MISC ChangeLog 37029 RMD160 1a73aa855e09916b52ac9033d878e7689daccbb9 SHA1 6a8d54f8c5bb188c875f56c74e6298c1e7d78e83 SHA256 c82d163bf9c2f6e81cb20706f1bed4f9d5dbc4edc5befa262fdd50216882f7c1
+MISC ChangeLog 37259 RMD160 55a760a2ef4faf7c50b84e86f8254990c5da2682 SHA1 3ca25b861e4ea9858ce34d12a7715cd52cba9c66 SHA256 5cbe3530e335b84ecc4c89c49c2ce736c161439a950434429a962ed5d2cace6c
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
diff --git a/dev-lang/mono/files/mono-2.4-openoffice.patch b/dev-lang/mono/files/mono-2.4-openoffice.patch
new file mode 100644
index 000000000000..1b09dec88795
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.4-openoffice.patch
@@ -0,0 +1,40 @@
+--- trunk/mcs/mcs/class.cs	2009/04/28 17:00:23	132860
++++ trunk/mcs/mcs/class.cs	2009/04/28 17:02:37	132861
+@@ -2905,6 +2905,9 @@
+ 	}
+ 
+ 	public sealed class Struct : ClassOrStruct {
++
++		bool is_unmanaged, has_unmanaged_check_done;
++
+ 		// <summary>
+ 		//   Modifiers allowed in a struct declaration
+ 		// </summary>
+@@ -2964,6 +2967,11 @@
+ 			if (requires_delayed_unmanagedtype_check)
+ 				return true;
+ 
++			if (has_unmanaged_check_done)
++				return is_unmanaged;
++
++			has_unmanaged_check_done = true;
++
+ 			foreach (FieldBase f in fields) {
+ 				if ((f.ModFlags & Modifiers.STATIC) != 0)
+ 					continue;
+@@ -2972,6 +2980,7 @@
+ 				// struct S { S* s; }
+ 				Type mt = f.MemberType;
+ 				if (mt == null) {
++					has_unmanaged_check_done = false;
+ 					requires_delayed_unmanagedtype_check = true;
+ 					return true;
+ 				}
+@@ -2988,6 +2997,7 @@
+ 				return false;
+ 			}
+ 
++			is_unmanaged = true;
+ 			return true;
+ 		}
+ 
diff --git a/dev-lang/mono/mono-2.4-r1.ebuild b/dev-lang/mono/mono-2.4-r2.ebuild
index d46c1997f378..a680cfd7b228 100644
--- a/dev-lang/mono/mono-2.4-r1.ebuild
+++ b/dev-lang/mono/mono-2.4-r2.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-lang/mono/mono-2.4-r1.ebuild,v 1.1 2009/05/08 09:44:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.4-r2.ebuild,v 1.1 2009/05/12 20:30:20 loki_val Exp $
 
 EAPI=2
 
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}/mono-2.2-ppc-threading.patch"
 	"${FILESDIR}/mono-2.2-uselibdir.patch"
 	"${FILESDIR}/mono-2.4-ppcbuild-fix.patch"
+	"${FILESDIR}/mono-2.4-openoffice.patch"
 )
 
 pkg_setup() {