Fix bug 258722, mono fails to build on solaris. Fix bug 262429, dodoc not finding target files.

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

4 files changed, 33 insertions, 11 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 6a8f3ccbb0fd..4941a175e834 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.156 2009/03/27 15:50:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.157 2009/03/28 00:53:50 loki_val Exp $
+
+  28 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/mono-2.2-freebsd-elf_common.patch, mono-2.2-r4.ebuild:
+  Fix bug 258722, mono fails to build on solaris. Fix bug 262429, dodoc not
+  finding target files.
 
   27 Mar 2009; Brent Baude <ranger@gentoo.org> mono-2.0.1-r1.ebuild:
   Marking mono-2.0.1-r1 ppc stable for bug 234305
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 46719d2380f7..8916ce9d0a8e 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -7,6 +7,7 @@ AUX mono-2.0-mimeicon.patch 2186 RMD160 11ab8a2cefb4fe408c95c43ca5656294e797c985
 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-2.2-freebsd-elf_common.patch 677 RMD160 55feea5e25ac9654c95bfb1a49dc1770a7cd9d01 SHA1 7cbb37524398f9d5789dd4f3ae76b07d33a42d84 SHA256 d753a10897805e87ddde9986982d565f941c6a45a56bf60b91d28fd2531c35a0
 AUX mono-2.2-libdir126.patch 2788 RMD160 931e034c90accc2058596714d7ec07d138a77575 SHA1 7807f1d3e28c82ac0292cec2f49e063898a5d0cb SHA256 2d3de73c7aa6fdc90ddec67fc814910f40d6d8ed52ec918397ca9f5ac219c6a1
 AUX mono-2.2-ppc-threading.patch 563 RMD160 2ed9822034a966e31cc90312c09e4fec70951d38 SHA1 3dda8a39085fddec0b0e25e31743d49762575605 SHA256 b2a708fc4ec8b886bf095c0d5eacbfdb8c08e1bc58442cfb6fd116f93de466a7
 AUX mono-2.2-r121596-work-around-runtime-crash.patch 767 RMD160 a1b7ef12e28a3c14f1beff5f490523efbc474d26 SHA1 be9eb136478b61ff0f365fc9c6f51f082df50c61 SHA256 302df7e285fdc6dc44729d85b6784c3a2abd365b6915f8e00323b611fd12c5b1
@@ -20,6 +21,6 @@ DIST mono-2.2.tar.bz2 24360722 RMD160 664f09ccd8822b62d94d242871b956b00adae7b6 S
 EBUILD mono-1.2.5.1-r1.ebuild 3683 RMD160 401b51ae78003a32d05e9ff1a80d13c798e07fe3 SHA1 bc24aca5e487f01bb1b0a9010a6e5e032c558e46 SHA256 a7cb4ef5ca8cd35456bbf8a3fbdae6e3c01ad2cea86a9be78ca97343867482fb
 EBUILD mono-1.2.6-r3.ebuild 3917 RMD160 6c680c414a4741fbfe2e20dd5b6120561de8c46d SHA1 8b32f6ca403becc675713fe84fad202255988e24 SHA256 915c05b51344c249c821191adb48568d4516689eff4937e4b4992088f8dfc0eb
 EBUILD mono-2.0.1-r1.ebuild 2672 RMD160 3316aa2244269309cce2f3ab52da64f3d219c9e7 SHA1 3ab7144923afb5ffde32c7107b3691731847d40b SHA256 5f0c313d5b0bbf6165989f87f6a8676efdc9211e144c2c62fb14d69828191a4b
-EBUILD mono-2.2-r4.ebuild 7699 RMD160 525a05e61b6d48bbb1fd99b77a4658802908828a SHA1 d6d014793aa3130d3d8ab762bc5a0cb4948b611e SHA256 621430f08e91f94c1697c55e147f10b44e64246117468becd6f6fe4b71b95ce7
-MISC ChangeLog 34968 RMD160 1ef7ee23fc217c86344348f12edba27f735682dd SHA1 2f5b8bc94f49d512ba9e86881bb6c7af7cc67d5b SHA256 cd45df598fa1a9408bdba6582f5f0e217f31303f98364c14d323305fad29c7f5
+EBUILD mono-2.2-r4.ebuild 7701 RMD160 b5659dc0f26420df1327f50bd19edb5f75428d21 SHA1 5c5de8d70d1803cbadb44b1886c0807f75d2f63b SHA256 4a4123ac9ff99e32bf401cfa6d9b7f81d3896041a28290975c957537379d3c4d
+MISC ChangeLog 35188 RMD160 0f83a765042f7de0edc54f8b1544f2821216f8a7 SHA1 7ef488a87ca70ddb4ab5286529913bc8940cd654 SHA256 d41c8136422d63dc2a3019d4e40476d3e4d9cd9ec6afe442b0fb741048636076
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
diff --git a/dev-lang/mono/files/mono-2.2-freebsd-elf_common.patch b/dev-lang/mono/files/mono-2.2-freebsd-elf_common.patch
new file mode 100644
index 000000000000..3dc66cc4b9aa
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.2-freebsd-elf_common.patch
@@ -0,0 +1,20 @@
+--- mono/utils/freebsd-elf_common.h.orig	2009-02-12 10:56:14.604852206 +0100
++++ mono/utils/freebsd-elf_common.h	2009-02-12 10:56:52.034748775 +0100
+@@ -42,10 +42,14 @@
+  * not include the padding.
+  */
+ 
++/*
++ * Patched acording to: http://lists.ximian.com/pipermail/mono-patches/2009-January/138782.html
++ */
++
+ typedef struct {
+-	u_int32_t	n_namesz;	/* Length of name. */
+-	u_int32_t	n_descsz;	/* Length of descriptor. */
+-	u_int32_t	n_type;		/* Type of this note. */
++	uint32_t	n_namesz;	/* Length of name. */
++	uint32_t	n_descsz;	/* Length of descriptor. */
++	uint32_t	n_type;		/* Type of this note. */
+ } Elf_Note;
+ 
+ /* Indexes into the e_ident array.  Keep synced with
diff --git a/dev-lang/mono/mono-2.2-r4.ebuild b/dev-lang/mono/mono-2.2-r4.ebuild
index d26bd89278bd..414f613b325f 100644
--- a/dev-lang/mono/mono-2.2-r4.ebuild
+++ b/dev-lang/mono/mono-2.2-r4.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.2-r4.ebuild,v 1.1 2009/03/22 21:35:13 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.2-r4.ebuild,v 1.2 2009/03/28 00:53:50 loki_val Exp $
 
 EAPI=2
 
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}/mono-2.2-uselibdir.patch"
 	"${FILESDIR}/mono-2.2-r121596-work-around-runtime-crash.patch"
 	"${FILESDIR}/mono-2.2-r123987-bless-crash.patch"
+	"${FILESDIR}/mono-2.2-freebsd-elf_common.patch"
 )
 
 pkg_setup() {
@@ -73,7 +74,8 @@ src_configure() {
 		--with-libgdiplus=$(use minimal && printf "no" || printf "installed" ) \
 		$(use_with xen xen_opt) \
 		--without-ikvm-native \
-		--with-jit
+		--with-jit \
+		--disable-dtrace
 
 }
 
@@ -95,12 +97,6 @@ src_install() {
 	sed -i -e "s:mono/2.0/mod.exe:mono/1.0/mod.exe:" \
 		"${D}"/usr/bin/mod || die "Failed to fix mod."
 
-	docinto docs
-	dodoc docs/*
-
-	docinto libgc
-	dodoc libgc/ChangeLog
-
 	find "${D}"/usr/ -name '*nunit-docs*' -exec rm -rf '{}' '+' || die "Removing nunit .docs failed"
 
 	#Standardize install paths for eselect-nunit