Bump, includes a few important fixes from SVN since the release, and the pathfix stuff from the 1.0.x mono ebuilds.

(Portage version: 2.0.51.19)

7 files changed, 171 insertions, 8 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 83615e6cf4e4..026315b311e5 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.34 2005/03/21 19:51:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.35 2005/03/25 21:42:47 latexer Exp $
+
+*mono-1.1.5 (25 Mar 2005)
+
+  25 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.5-pathfix.diff, +files/mono-1.1.5-r42108.diff,
+  +files/mono-1.1.5-r42122.diff, +mono-1.1.5.ebuild:
+  Bump, includes a few important fixes from SVN since the release, and the
+  pathfix stuff from the 1.0.x mono ebuilds.
 
   21 Mar 2005; David Holm <dholm@gentoo.org> mono-1.0.5-r5.ebuild:
   Stable on ppc.
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 79612a59010a..1b43171ec159 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,15 +1,20 @@
-MD5 26d4cdfad9aa08a326b867e07d2e9bd1 ChangeLog 14162
-MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
-MD5 ebddf7f07919de9d3b279d55d0f577df mono-1.0.4-r1.ebuild 2111
+MD5 a161b577896468b2fa8ccc93412a1a40 mono-1.1.5.ebuild 2351
 MD5 5c7a4c0458aa7e08da7f5572a6d215f5 mono-1.0.4.ebuild 1507
+MD5 ebddf7f07919de9d3b279d55d0f577df mono-1.0.4-r1.ebuild 2111
 MD5 c69ad4a401355c5a7f29cb0f2de55ae2 mono-1.0.5-r5.ebuild 3931
 MD5 e4d80474cce3145601e84a16325b3aaa mono-1.0.6.ebuild 3908
 MD5 fc071f649fb4cf6711c8ca4ec3466219 mono-1.1.4.ebuild 1844
+MD5 26d4cdfad9aa08a326b867e07d2e9bd1 ChangeLog 14162
+MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
+MD5 e8acd8bc997d82f676be5cf2057d3d25 files/dotnet.conf 570
+MD5 6e11372f48bd32e76012be8aae54e594 files/dotnet.init 1031
+MD5 d7752110175a6157ea42e6528c791fbb files/mono-1.1.5-pathfix.diff 648
 MD5 2cef534891ce7b0c980d5615ae1397af files/digest-mono-1.0.4 64
-MD5 2cef534891ce7b0c980d5615ae1397af files/digest-mono-1.0.4-r1 64
-MD5 9e2e1b58a310e4236f757e683b71c879 files/digest-mono-1.0.5-r5 127
 MD5 c6035d1153d210b3f27ab455ed98b791 files/digest-mono-1.0.6 127
 MD5 7266922629dc78088ee3d230acbf895e files/digest-mono-1.1.4 64
-MD5 e8acd8bc997d82f676be5cf2057d3d25 files/dotnet.conf 570
-MD5 6e11372f48bd32e76012be8aae54e594 files/dotnet.init 1031
+MD5 c9963606d2ccf69b09fdd7b4fc247d78 files/digest-mono-1.1.5 64
+MD5 ca0f98ff16ba20d2ff9af83580ad0db8 files/mono-1.1.5-r42108.diff 496
+MD5 2cef534891ce7b0c980d5615ae1397af files/digest-mono-1.0.4-r1 64
+MD5 9e2e1b58a310e4236f757e683b71c879 files/digest-mono-1.0.5-r5 127
 MD5 48284ee0228c56980a839fb245258db7 files/mcs-1.0.5-pathfix.diff 628
+MD5 08f6767a7160565ad6796eee60e412cb files/mono-1.1.5-r42122.diff 1037
diff --git a/dev-lang/mono/files/digest-mono-1.1.5 b/dev-lang/mono/files/digest-mono-1.1.5
new file mode 100644
index 000000000000..0c20ed385f1e
--- /dev/null
+++ b/dev-lang/mono/files/digest-mono-1.1.5
@@ -0,0 +1 @@
+MD5 a4a0878ca1964a2a27db88dc0b9edb57 mono-1.1.5.tar.gz 13689959
diff --git a/dev-lang/mono/files/mono-1.1.5-pathfix.diff b/dev-lang/mono/files/mono-1.1.5-pathfix.diff
new file mode 100644
index 000000000000..01eb67f1c881
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.5-pathfix.diff
@@ -0,0 +1,12 @@
+diff -aur mono-1.1.4-orig/mcs/class/corlib/System.IO/Path.cs mono-1.1.4/mcs/class/corlib/System.IO/Path.cs
+--- mono-1.1.4-orig/mcs/class/corlib/System.IO/Path.cs	2005-02-05 14:42:23.000000000 -0500
++++ mono-1.1.4/mcs/class/corlib/System.IO/Path.cs	2005-02-22 21:00:50.122250160 -0500
+@@ -387,7 +387,7 @@
+ 			//if (root == path) return path;
+ 				
+ 			// STEP 3: split the directories, this gets rid of consecutative "/"'s
+-			string [] dirs = path.Split (DirectorySeparatorChar, AltDirectorySeparatorChar);
++			string [] dirs = path.Split (DirectorySeparatorChar);
+ 			// STEP 4: Get rid of directories containing . and ..
+ 			int target = 0;
+ 			
diff --git a/dev-lang/mono/files/mono-1.1.5-r42108.diff b/dev-lang/mono/files/mono-1.1.5-r42108.diff
new file mode 100644
index 000000000000..6b180e740807
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.5-r42108.diff
@@ -0,0 +1,11 @@
+diff -aur mono-1.1.5-orig/mono/metadata/metadata.c mono-1.1.5/mono/metadata/metadata.c
+--- mono-1.1.5-orig/mono/metadata/metadata.c	2005-03-16 11:18:22.000000000 -0500
++++ mono-1.1.5/mono/metadata/metadata.c	2005-03-22 23:50:27.000000000 -0500
+@@ -551,6 +551,7 @@
+ 				g_assert (i == 4 || i == 5);
+ 				field_size = i == 4 ? idx_size (MONO_TABLE_FIELD):
+ 					idx_size(MONO_TABLE_METHOD);
++				break;
+ 			case MONO_TABLE_GENERICPARAM:
+ 				g_assert (i == 2 || i == 4 || i == 5);
+ 				if (i == 2)
diff --git a/dev-lang/mono/files/mono-1.1.5-r42122.diff b/dev-lang/mono/files/mono-1.1.5-r42122.diff
new file mode 100644
index 000000000000..a9888e94b91f
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.5-r42122.diff
@@ -0,0 +1,40 @@
+Index: mono/mini/exceptions-ppc.c
+===================================================================
+--- mono/mini/exceptions-ppc.c	(revision 42121)
++++ mono/mini/exceptions-ppc.c	(working copy)
+@@ -199,6 +199,7 @@
+ 	ppc_break (code);
+ 
+ 	g_assert ((code - start) < sizeof(start));
++	mono_arch_flush_icache (start, code - start);
+ 	return start;
+ }
+ 
+@@ -268,6 +269,7 @@
+ 	ppc_blr (code);
+ 
+ 	g_assert ((code - start) < sizeof(start));
++	mono_arch_flush_icache (start, code - start);
+ 	return start;
+ }
+ 
+@@ -371,6 +373,7 @@
+ 	/* we should never reach this breakpoint */
+ 	ppc_break (code);
+ 	g_assert ((code - start) < size);
++	mono_arch_flush_icache (start, code - start);
+ 	return start;
+ }
+ 
+Index: mono/mini/tramp-ppc.c
+===================================================================
+--- mono/mini/tramp-ppc.c	(revision 42121)
++++ mono/mini/tramp-ppc.c	(working copy)
+@@ -537,6 +537,7 @@
+ 	if (notification_address)
+ 		*notification_address = buf;
+ 	ppc_blr (buf);
++	mono_arch_flush_icache (ptr, buf - ptr);
+ 
+ 	return ptr;
+ }
diff --git a/dev-lang/mono/mono-1.1.5.ebuild b/dev-lang/mono/mono-1.1.5.ebuild
new file mode 100644
index 000000000000..7cbb0cabbc66
--- /dev/null
+++ b/dev-lang/mono/mono-1.1.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5.ebuild,v 1.1 2005/03/25 21:42:47 latexer Exp $
+
+inherit eutils mono flag-o-matic
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.go-mono.com/"
+SRC_URI="http://www.go-mono.com/archive/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="nptl icu"
+
+DEPEND="virtual/libc
+	>=dev-libs/glib-2.0
+	!<dev-dotnet/pnet-0.6.12
+	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
+	icu? ( >=dev-libs/icu-2.6.2 )
+	ppc? (
+		>=sys-devel/gcc-3.2.3-r4
+		>=sys-libs/glibc-2.3.3_pre20040420
+	)"
+RDEPEND="${DEPEND}
+	dev-util/pkgconfig
+	dev-libs/libxml2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "s: -fexceptions::" ${S}/libgc/configure.host || die
+
+	# Fix munging of Unix paths
+	epatch ${FILESDIR}/${P}-pathfix.diff || die
+
+	# Various fixes from SVN.
+	epatch ${FILESDIR}/${P}-r42108.diff || die
+	epatch ${FILESDIR}/${P}-r42122.diff || die
+
+	# Ugly sed to replace windows path with *nix equivalent
+	for file in $(find ${S}/mcs/nunit20 -name AssemblyInfo.cs)
+	do
+		sed -i "s:\.\.\\\\\\\\:../:g" "${file}"
+	done
+
+	# Fix MONO_CFG_DIR for signing
+	sed -i \
+		"s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \
+		${S}/mcs/build/library.make || die
+}
+
+src_compile() {
+	strip-flags
+
+	local myconf="--with-sigaltstack=yes --with-preview=yes"
+	# This will be the setup when this hopefully goes into the tree
+	#local myconf="--with-sigaltstack=yes"
+	if use nptl && have_NPTL
+	then
+		myconf="${myconf} --with-tls=__thread"
+	else
+		myconf="${myconf} --with-tls=pthread"
+	fi
+
+	econf ${myconf} $(use_with icu) || die
+	emake -j1 || die "MONO compilation failure"
+}
+
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# Fix incorrect path to makecert EXE file
+	sed -i "s:makecert.exe:MakeCert.exe:" ${D}/usr/bin/makecert || die
+
+	# monoresgen script is broken. It should be symlink to /usr/bin/resgen
+	rm ${D}/usr/bin/monoresgen || die
+	dosym /usr/bin/resgen /usr/bin/monoresgen
+
+	dodoc AUTHORS ChangeLog NEWS README
+	docinto docs
+	dodoc docs/*
+	docinto libgc
+	dodoc libgc/ChangeLog
+}