Go eapi-2, libgdiplus needs it anyway. Tweak sigaltstack usage so we don't have to send segfaults to the kernel all the time. Prepare for ia64 and arm by making the options they'll need ready.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64

4 files changed, 49 insertions, 24 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 890f6de92e24..83a788199fa6 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.146 2008/11/23 16:52:37 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.147 2008/11/24 23:56:14 loki_val Exp $
+
+  24 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/mono-2.0.1-fix_implicit_pointer_conversions.patch,
+  mono-2.0.1.ebuild:
+  Go eapi-2, libgdiplus needs it anyway. Tweak sigaltstack usage so we don't
+  have to send segfaults to the kernel all the time. Prepare for ia64 and
+  arm by making the options they'll need ready.
 
   23 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> mono-2.0.1.ebuild:
   Drop libdir patches, lib64 isn't really needed for platform independent
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 946b706cbb61..9ee0ef43afca 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -5,6 +5,7 @@ AUX mono-1.9.1-glibc-2.8-deprecated-arg-max.patch 644 RMD160 e708d40581b1c354208
 AUX mono-2.0-mimeicon.patch 2186 RMD160 11ab8a2cefb4fe408c95c43ca5656294e797c985 SHA1 5a11bc3367c1a32a76c853309cc429ba79f37502 SHA256 531365bf3033fe22b139239be9cb4f46ab2a84970f53bb2f13eaf4e23030625f
 AUX mono-2.0-ppc-threading.patch 498 RMD160 f1d72e8ac6549ef0cbddbb256b2323fbe2ee7695 SHA1 55a2b6b1aa729a5ebcae31bb822548c9ed59bf3b SHA256 f3b7a7c1435b0aa3a8f3216cfbf0b7ad18ff565b324f41492c6ae8412be313bd
 AUX mono-2.0.1-fix-wsdl-troubles-with-muine.patch 552 RMD160 2d0c75c9c26a997ead5bfbfa412447bfd16a1d1e SHA1 eec25804a179da8c7d38ee5a2783223d28033c79 SHA256 d38683b4037fb3cda08daec0840d0b0b617efd6f82e8bb9f468e744254d293e3
+AUX mono-2.0.1-fix_implicit_pointer_conversions.patch 681 RMD160 cd207884e32f9916a397b53e2abfde760916ad94 SHA1 8f8f67354a6bd5b67b015621a9a42c3d4ea80580 SHA256 9aa2a0d966c848adec5498c9cac9a74098b31dc487c0a17f49c37e422e881678
 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
 DIST mono-1.2.6.tar.bz2 18163130 RMD160 c6536b008cb73845943956c9ab365589a28c013c SHA1 f51f2e14d05313dba4b2d3fd5a47a9a3361ebeae SHA256 24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
@@ -13,6 +14,6 @@ DIST mono-2.0.1.tar.bz2 19385815 RMD160 ecada26dc398f0ea4cc4cae62885f4d1438bd540
 EBUILD mono-1.2.5.1-r1.ebuild 3636 RMD160 329054cd7c5f9ac414229c479670eedc65542d5b SHA1 f248f71b77f1582a7a1e58c316cb2039595927b1 SHA256 85bdc359b2997ef55a9741e92a3423ccea7236befa88b34a7dd2cedab7811d3f
 EBUILD mono-1.2.6-r3.ebuild 3917 RMD160 6c680c414a4741fbfe2e20dd5b6120561de8c46d SHA1 8b32f6ca403becc675713fe84fad202255988e24 SHA256 915c05b51344c249c821191adb48568d4516689eff4937e4b4992088f8dfc0eb
 EBUILD mono-1.9.1.ebuild 3667 RMD160 ea021f9d0d82c06e1284e839d71278a8d75d277e SHA1 6d0f9b58ab233bb77cc0478e6f88977ad46e8932 SHA256 4f2912b09f00d0ab408300eb9c26333f07d8804de9eaac8de19fd4bf1ea2e40f
-EBUILD mono-2.0.1.ebuild 2728 RMD160 0c991f0a386ed2f7b0deedbf51743d2b28106d3e SHA1 c3954e474b700926a12e0efe0378a22cbd4f1621 SHA256 636078175660ad29eb227704367c12202ba98a7d2e0bff4fc332cd13655bc5f3
-MISC ChangeLog 32010 RMD160 95c30c94bf4cea36112bcd06d7561d43f0158b80 SHA1 fe6fcac8986c12ea1826efc8c9d21ca8388ce284 SHA256 73ca38f66a7a8e8b56b58d91a3db0065ebdcfd9c7e10479159ca37c0d03f0717
+EBUILD mono-2.0.1.ebuild 2717 RMD160 a1704b9ab611658869d370cf4b2c5a12cc463332 SHA1 b7978423b4c57c7b967ed6498434d336e1324c4d SHA256 58bf802fff65e1cb7cce5ce1d57fe2b3793e7e1dd3b1a1a71799c872cf23a1bd
+MISC ChangeLog 32344 RMD160 4444237318a02280ff5abf73f3943689376aa3c1 SHA1 0a6ce7cd3c71d021bc7a6a0264a4e01dc7acd1e8 SHA256 f5e15628aa34ba49fe13534acb8ab10dece1472bf1b2207213798732782cd126
 MISC metadata.xml 222 RMD160 cbf2224a6d16a37b2f8c4eff9ea28cd7e28fd84b SHA1 20ea003ff61f1c1570c4f7d38b539c05d8e27018 SHA256 6dbd789b6ca1020dbe527c49482c43505c294843e3e6aaf150165bc8d59b9189
diff --git a/dev-lang/mono/files/mono-2.0.1-fix_implicit_pointer_conversions.patch b/dev-lang/mono/files/mono-2.0.1-fix_implicit_pointer_conversions.patch
new file mode 100644
index 000000000000..35b99919336f
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.0.1-fix_implicit_pointer_conversions.patch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_implicit_pointer_conversions.dpatch by Mirco Bauer <meebey@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad mono-1.2.6~/mono/metadata/security.c mono-1.2.6/mono/metadata/security.c
+--- mono-1.2.6~/mono/metadata/security.c	2007-11-08 23:07:19.000000000 +0100
++++ mono-1.2.6/mono/metadata/security.c	2007-12-24 15:54:02.000000000 +0100
+@@ -12,6 +12,7 @@
+ #endif
+ 
+ #include <mono/metadata/appdomain.h>
++#include <mono/metadata/assembly.h>
+ #include <mono/metadata/image.h>
+ #include <mono/metadata/exception.h>
+ #include <mono/metadata/object-internals.h>
diff --git a/dev-lang/mono/mono-2.0.1.ebuild b/dev-lang/mono/mono-2.0.1.ebuild
index f845c1a3ab7b..300d9ac06c89 100644
--- a/dev-lang/mono/mono-2.0.1.ebuild
+++ b/dev-lang/mono/mono-2.0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.0.1.ebuild,v 1.2 2008/11/23 16:52:37 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.0.1.ebuild,v 1.3 2008/11/24 23:56:14 loki_val Exp $
+
+EAPI=2
 
 inherit base eutils flag-o-matic multilib autotools
 
@@ -15,7 +17,9 @@ IUSE=""
 
 RDEPEND="!<dev-dotnet/pnet-0.6.12
 		>=dev-libs/glib-2.6
-		=dev-dotnet/libgdiplus-${PV%%.*}*"
+		=dev-dotnet/libgdiplus-${PV%%.*}*
+	ia64? ( sys-libs/libunwind )"
+
 DEPEND="${RDEPEND}
 		sys-devel/bc
 		>=dev-util/pkgconfig-0.19"
@@ -23,41 +27,36 @@ PDEPEND="dev-dotnet/pe-format"
 
 RESTRICT="test"
 
-#Threading and mimeicon patches from Fedora CVS. Muine patch from Novell.
+#Threading and mimeicon patches from Fedora CVS. Muine patch from Novell. Pointer conversions patch from Debian.
 
 PATCHES=(	"${FILESDIR}/${PN}-biginteger_overflow.diff"
 		"${FILESDIR}/${PN}-2.0-ppc-threading.patch"
 		"${FILESDIR}/${PN}-2.0-mimeicon.patch"
-		"${FILESDIR}/${P}-fix-wsdl-troubles-with-muine.patch" )
+		"${FILESDIR}/${P}-fix-wsdl-troubles-with-muine.patch"
+		"${FILESDIR}/${P}-fix_implicit_pointer_conversions.patch" )
 
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
-}
-
-src_compile() {
+src_configure() {
 	# mono's build system is finiky, strip the flags
 	strip-flags
 
 	#Remove this at your own peril. Mono will barf in unexpected ways.
 	append-flags -fno-strict-aliasing
 
-	# 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	--without-moonlight \
+	econf	--disable-dependency-tracking \
+		--without-moonlight \
 		--with-preview=yes \
 		--with-glib=system \
 		--with-gc=included \
 		--with-libgdiplus=installed \
-		--with-tls=__thread \
-		--with-ikvm=yes \
+		--with-tls=$(use arm && printf "pthread" || printf "__thread" ) \
+		--with-sigaltstack=$((use x86 || use amd64) && printf "yes" || printf "no" ) \
+		--with-ikvm-native=no \
 		--with-jit=yes
+
+	# dev-dotnet/ikvm provides ikvm-native
+}
+
+src_compile() {
 	emake EXTERNAL_MCS=false EXTERNAL_MONO=false
 
 	if [[ "$?" -ne "0" ]]; then