Bump to new release, including fix for bug #100515. Remove some older 1.1.x versions.

(Portage version: 2.0.51.22-r2)

11 files changed, 73 insertions, 198 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index a9c065084a27..f60fcbaf259c 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,15 @@
 # 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.54 2005/07/06 15:25:00 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.55 2005/08/04 18:31:13 latexer Exp $
+
+*mono-1.1.8.3 (04 Aug 2005)
+
+  04 Aug 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.8.3-array-getvalue.diff, +files/mono-1.1.8.3-icall.diff,
+  -mono-1.1.6.ebuild, -mono-1.1.6-r1.ebuild, -mono-1.1.7.ebuild,
+  +mono-1.1.8.3.ebuild:
+  Bump to new release, including fix for bug #100515. Remove some older 1.1.x
+  versions.
 
 *mono-1.1.8.2 (06 Jul 2005)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index e279a518a8a8..eafac981455e 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -7,6 +7,7 @@ MD5 a0dd21a7e04af4ad48721bd1d75f73b4 mono-1.1.6.ebuild 2299
 MD5 6363e10008d0710369a421a483dc00db ChangeLog 17761
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 2c5d8c2386af6fa7552457f2080322e3 mono-1.1.7.ebuild 2191
+MD5 42a4c2601dc98de14022dd7229092aa2 mono-1.1.8.3.ebuild 2439
 MD5 37e534333d18587029873b843d639840 mono-1.1.7-r1.ebuild 2546
 MD5 e8acd8bc997d82f676be5cf2057d3d25 files/dotnet.conf 570
 MD5 6e11372f48bd32e76012be8aae54e594 files/dotnet.init 1031
@@ -25,3 +26,6 @@ MD5 b891d116e888db40b523dfa97fad8018 files/mono-1.1.6-r42300.diff 1572
 MD5 f8eec8ed3193207430c3a59266b5e56c files/digest-mono-1.1.7 64
 MD5 f8eec8ed3193207430c3a59266b5e56c files/digest-mono-1.1.7-r1 64
 MD5 85422af6a9f91917a9c9c3b8cceb5c33 files/mono-1.1.7-ppc-tls.diff 412
+MD5 2acaae80bdfac5c08af32cfd24b36c43 files/mono-1.1.8.3-array-getvalue.diff 1327
+MD5 f82809daef4d783797094233672feb3f files/mono-1.1.8.3-icall.diff 433
+MD5 e57f70fb8569f040ed1b4669c3e07652 files/digest-mono-1.1.8.3 66
diff --git a/dev-lang/mono/files/digest-mono-1.1.6 b/dev-lang/mono/files/digest-mono-1.1.6
deleted file mode 100644
index d5d81037e76d..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5097b149effa0b248a4398fe630bd30 mono-1.1.6.tar.gz 13752717
diff --git a/dev-lang/mono/files/digest-mono-1.1.6-r1 b/dev-lang/mono/files/digest-mono-1.1.6-r1
deleted file mode 100644
index d5d81037e76d..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5097b149effa0b248a4398fe630bd30 mono-1.1.6.tar.gz 13752717
diff --git a/dev-lang/mono/files/digest-mono-1.1.7 b/dev-lang/mono/files/digest-mono-1.1.7
deleted file mode 100644
index 1aea05202cf8..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f81c6b02ef0c5d5ef7ab827d28eb9731 mono-1.1.7.tar.gz 14766534
diff --git a/dev-lang/mono/files/digest-mono-1.1.8.3 b/dev-lang/mono/files/digest-mono-1.1.8.3
new file mode 100644
index 000000000000..7b672604ebdc
--- /dev/null
+++ b/dev-lang/mono/files/digest-mono-1.1.8.3
@@ -0,0 +1 @@
+MD5 5aefdc915cbd6ed84834692f59b92080 mono-1.1.8.3.tar.gz 15348432
diff --git a/dev-lang/mono/files/mono-1.1.8.3-array-getvalue.diff b/dev-lang/mono/files/mono-1.1.8.3-array-getvalue.diff
new file mode 100644
index 000000000000..b679620022cc
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.8.3-array-getvalue.diff
@@ -0,0 +1,34 @@
+diff -aur mono-1.1.8.2-orig/mcs/class/corlib/System/Array.cs mono-1.1.8.2/mcs/class/corlib/System/Array.cs
+--- mono-1.1.8.2-orig/mcs/class/corlib/System/Array.cs	2005-06-04 14:00:46.000000000 -0400
++++ mono-1.1.8.2/mcs/class/corlib/System/Array.cs	2005-07-25 21:18:09.000000000 -0400
+@@ -188,10 +188,10 @@
+ 		public extern int GetLowerBound (int dimension);
+ 
+ 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+-		public extern object GetValue (int[] indices);
++		public extern object GetValue (params int[] indices);
+ 
+ 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+-		public extern void SetValue (object value, int[] indices);
++		public extern void SetValue (object value, params int[] indices);
+ 
+ 		// CAUTION! No bounds checking!
+ 		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+@@ -486,7 +486,7 @@
+ 		}
+ 
+ 		[ComVisible (false)]
+-		public object GetValue (long [] indices)
++		public object GetValue (params long [] indices)
+ 		{
+ 			if (indices == null) {
+ 				// LAMESPEC: Docs say we should throw a ArgumentNull, but .NET
+@@ -497,7 +497,7 @@
+ 		}
+ 
+ 		[ComVisible (false)]
+-		public void SetValue (object value, long [] indices)
++		public void SetValue (object value, params long [] indices)
+ 		{
+ 			if (indices == null) {
+ 				// LAMESPEC: Docs say we should throw a ArgumentNull, but .NET
diff --git a/dev-lang/mono/files/mono-1.1.8.3-icall.diff b/dev-lang/mono/files/mono-1.1.8.3-icall.diff
new file mode 100644
index 000000000000..dbc12694e770
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.8.3-icall.diff
@@ -0,0 +1,10 @@
+--- mono-1.1.8-orig/mono/metadata/icall.c	2005-07-27 21:27:32.000000000 -0700
++++ mono-1.1.8/mono/metadata/icall.c	2005-07-27 21:28:03.000000000 -0700
+@@ -2561,7 +2561,6 @@
+ 					else 
+ 						result = *((gpointer *)((char *)this + field->offset));
+ 				
+-					g_assert (result);
+ 					out_args = mono_array_new (domain, mono_defaults.object_class, 1);
+ 					*outArgs = out_args;
+ 					mono_array_set (out_args, gpointer, 0, result);
diff --git a/dev-lang/mono/mono-1.1.6-r1.ebuild b/dev-lang/mono/mono-1.1.6-r1.ebuild
deleted file mode 100644
index 3af4b70511a2..000000000000
--- a/dev-lang/mono/mono-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.6-r1.ebuild,v 1.4 2005/05/17 18:11:27 dholm 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 X"
-
-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}
-	X? ( >=dev-dotnet/libgdiplus-1.1.4 )
-	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}/${PN}-1.1.5-pathfix.diff || die
-
-	# Fix for linking to ICU
-	epatch ${FILESDIR}/${PN}-1.1.5-icu-linking.diff || die
-
-	# fix from SVN.
-	epatch ${FILESDIR}/${PN}-1.1.5-r42108.diff || die
-
-	# Fix amd64 bug #88041
-	epatch ${FILESDIR}/${PN}-1.1.6-r42300.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
-
-	libtoolize --copy --force || die "libtoolize failed"
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	strip-flags
-	local myconf="--with-preview=yes"
-
-	if use 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
-}
diff --git a/dev-lang/mono/mono-1.1.6.ebuild b/dev-lang/mono/mono-1.1.6.ebuild
deleted file mode 100644
index f8e8d2679d44..000000000000
--- a/dev-lang/mono/mono-1.1.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.6.ebuild,v 1.5 2005/05/17 18:11:27 dholm 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 X"
-
-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}
-	X? ( >=dev-dotnet/libgdiplus-1.1.4 )
-	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}/${PN}-1.1.5-pathfix.diff || die
-
-	# Fix for linking to ICU
-	epatch ${FILESDIR}/${PN}-1.1.5-icu-linking.diff || die
-
-	# fix from SVN.
-	epatch ${FILESDIR}/${PN}-1.1.5-r42108.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
-
-	libtoolize --copy --force || die "libtoolize failed"
-	aclocal || die "aclocal failed"
-	autoconf || die "autoconf failed"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	strip-flags
-	local myconf="--with-preview=yes"
-
-	if use 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
-}
diff --git a/dev-lang/mono/mono-1.1.7.ebuild b/dev-lang/mono/mono-1.1.8.3.ebuild
index 4354414c2a89..291b483c0f8e 100644
--- a/dev-lang/mono/mono-1.1.7.ebuild
+++ b/dev-lang/mono/mono-1.1.8.3.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.5 2005/05/17 19:00:55 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.8.3.ebuild,v 1.1 2005/08/04 18:31:13 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.go-mono.com/sources/mono-${PV:0:3}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
-KEYWORDS="~x86 -ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl icu X"
 
 DEPEND="virtual/libc
@@ -31,7 +31,6 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i "s: -fexceptions::" ${S}/libgc/configure.host || die
 
 	# Fix munging of Unix paths
 	epatch ${FILESDIR}/${PN}-1.1.5-pathfix.diff || die
@@ -39,11 +38,23 @@ src_unpack() {
 	# Fix for linking to ICU
 	epatch ${FILESDIR}/${PN}-1.1.5-icu-linking.diff || die
 
+	# Fix array Get/Set parameters
+	epatch ${FILESDIR}/${PN}-1.1.8.3-array-getvalue.diff || die
+
+	# icall fix (ximian bug #)
+	epatch ${FILESDIR}/${PN}-1.1.8.3-icall.diff || die
+
 	# Fix MONO_CFG_DIR for signing
 	sed -i \
 		"s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \
 		${S}/mcs/build/library.make || die
 
+	# Install all our .dlls under $(libdir), not $(prefix)/lib
+	sed -i -e 's:$(prefix)/lib:$(libdir):' \
+		-e 's:$(exec_prefix)/lib:$(libdir):' \
+		-e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
+		${S}/{scripts,mono/metadata}/Makefile.am ${S}/configure.in || die
+
 	libtoolize --copy --force || die "libtoolize failed"
 	aclocal || die "aclocal failed"
 	autoconf || die "autoconf failed"
@@ -77,10 +88,6 @@ src_install() {
 	# 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/*