10 files changed, 17 insertions, 278 deletions
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 5d67d264bde2..89a899d73d53 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.73 2006/01/30 18:32:34 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.74 2006/02/20 01:33:46 latexer Exp $
+
+  20 Feb 2006; Peter Johanson <latexer@gentoo.org> -mono-1.1.9.1.ebuild,
+  -mono-1.1.9.2.ebuild, -mono-1.1.10.1.ebuild, mono-1.1.12.1-r1.ebuild,
+  mono-1.1.13.1.ebuild:
+  Remove some unneeded versions, and add a small fix to make sure we build
+  using bundled mcs/classlibs. Fixes bug #118062.
 
   30 Jan 2006; Herbie Hopkins <herbs@gentoo.org> mono-1.1.12.1-r1.ebuild,
   mono-1.1.13.1.ebuild:
diff --git a/dev-lang/mono/files/digest-mono-1.1.10.1 b/dev-lang/mono/files/digest-mono-1.1.10.1
deleted file mode 100644
index 478f471c2ee5..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.10.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9aae7f81d389cefd483f04edc5ab2d58 mono-1.1.10.1.tar.gz 17145786
diff --git a/dev-lang/mono/files/digest-mono-1.1.9.1 b/dev-lang/mono/files/digest-mono-1.1.9.1
deleted file mode 100644
index ae8e7d318633..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7457f35cc61b830cd485c75b4d64ea52 mono-1.1.9.1.tar.gz 16534284
diff --git a/dev-lang/mono/files/digest-mono-1.1.9.2 b/dev-lang/mono/files/digest-mono-1.1.9.2
deleted file mode 100644
index 45eb54848474..000000000000
--- a/dev-lang/mono/files/digest-mono-1.1.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 edc4adaa92594a8eea8018bb3701b639 mono-1.1.9.2.tar.gz 16617632
diff --git a/dev-lang/mono/mono-1.0.5-r5.ebuild b/dev-lang/mono/mono-1.0.5-r5.ebuild
index fbb9f3a1a6de..15b82c283475 100644
--- a/dev-lang/mono/mono-1.0.5-r5.ebuild
+++ b/dev-lang/mono/mono-1.0.5-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.0.5-r5.ebuild,v 1.5 2006/01/09 22:09:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.0.5-r5.ebuild,v 1.6 2006/02/20 01:33:46 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
diff --git a/dev-lang/mono/mono-1.1.10.1.ebuild b/dev-lang/mono/mono-1.1.10.1.ebuild
deleted file mode 100644
index ba53e1f1bca7..000000000000
--- a/dev-lang/mono/mono-1.1.10.1.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.10.1.ebuild,v 1.2 2006/01/09 22:09:07 mr_bones_ Exp $
-
-inherit eutils mono flag-o-matic multilib
-
-DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
-HOMEPAGE="http://www.go-mono.com/"
-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"
-IUSE="nptl X"
-
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
-	sys-devel/bc
-	!<dev-dotnet/pnet-0.6.12
-	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-	ppc? (
-		>=sys-devel/gcc-3.2.3-r4
-		>=sys-libs/glibc-2.3.3_pre20040420
-	)"
-
-RDEPEND="${DEPEND}
-	X? ( >=dev-dotnet/libgdiplus-1.1.10 )
-	dev-util/pkgconfig
-	dev-libs/libxml2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix munging of Unix paths
-	epatch ${FILESDIR}/${PN}-1.1.5-pathfix.diff
-
-	# Install all our .dlls under $(libdir), not $(prefix)/lib
-	if [ $(get_libdir) != "lib" ] ; then
-		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,mono/os/unix}/Makefile.am \
-			${S}/configure.in || die "sed failed"
-		sed -i -e 's:^libdir.*:libdir=@libdir@:' \
-			${S}/{scripts,}/*.pc.in || die "sed failed"
-	fi
-
-	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"
-
-	# Force __thread on amd64. See bug #83770
-	if use amd64
-	then
-		myconf="${myconf} --with-tls=__thread"
-	else
-		if use nptl
-		then
-			myconf="${myconf} --with-tls=__thread"
-		else
-			myconf="${myconf} --with-tls=pthread"
-		fi
-	fi
-
-	econf ${myconf} || die
-	emake -j1 || die "MONO compilation failure"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-	docinto docs
-	dodoc docs/*
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "This version of mono has changed the assembly version for"
-	ewarn "ICSharpCode.SharpZipLib, which may break some installed"
-	ewarn "applications such as monodoc. Please re-emerge monodoc and any"
-	ewarn "other packages you have which may make use of this library."
-}
diff --git a/dev-lang/mono/mono-1.1.12.1-r1.ebuild b/dev-lang/mono/mono-1.1.12.1-r1.ebuild
index 4f27de7f9f73..adf4f96dc0d3 100644
--- a/dev-lang/mono/mono-1.1.12.1-r1.ebuild
+++ b/dev-lang/mono/mono-1.1.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.12.1-r1.ebuild,v 1.2 2006/01/30 18:32:34 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.12.1-r1.ebuild,v 1.3 2006/02/20 01:33:46 latexer Exp $
 
 inherit eutils mono flag-o-matic multilib
 
@@ -72,6 +72,9 @@ src_compile() {
 		fi
 	fi
 
+	# Force the use of the monolite mcs, to prevent us from trying to build
+	# with old buggy classlibs/mcs versions. See bug #118062
+	touch ${S}/mcs/build/deps/use-monolite
 	econf ${myconf} || die
 	emake -j1 || die "MONO compilation failure"
 }
diff --git a/dev-lang/mono/mono-1.1.13.1.ebuild b/dev-lang/mono/mono-1.1.13.1.ebuild
index 790a1126308b..c1ca39c63555 100644
--- a/dev-lang/mono/mono-1.1.13.1.ebuild
+++ b/dev-lang/mono/mono-1.1.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.13.1.ebuild,v 1.3 2006/01/30 18:32:34 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.13.1.ebuild,v 1.4 2006/02/20 01:33:46 latexer Exp $
 
 inherit eutils mono flag-o-matic multilib
 
@@ -72,6 +72,9 @@ src_compile() {
 		fi
 	fi
 
+	# Force the use of the monolite mcs, to prevent us from trying to build
+	# with old buggy classlibs/mcs versions. See bug #118062
+	touch ${S}/mcs/build/deps/use-monolite
 	econf ${myconf} || die
 	emake -j1 || die "MONO compilation failure"
 }
diff --git a/dev-lang/mono/mono-1.1.9.1.ebuild b/dev-lang/mono/mono-1.1.9.1.ebuild
deleted file mode 100644
index 4fea0c78f522..000000000000
--- a/dev-lang/mono/mono-1.1.9.1.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.9.1.ebuild,v 1.4 2006/01/09 22:09:07 mr_bones_ 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/sources/mono-${PV:0:3}/${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
-	sys-devel/bc
-	!<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}
-
-	# Fix munging of Unix paths
-	epatch ${FILESDIR}/${PN}-1.1.5-pathfix.diff
-
-	# Fix for linking to ICU
-	epatch ${FILESDIR}/${PN}-1.1.5-icu-linking.diff
-
-	# Fix for bug #106971
-	epatch ${FILESDIR}/${P}-io-layer-fix.diff
-
-	# 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"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	strip-flags
-	# Replace O2 flag on amd64. See bug #96719
-	if use amd64
-	then
-		replace-flags -O2 -O1
-	fi
-
-	local myconf="--with-preview=yes"
-
-	# Force __thread on amd64. See bug #83770
-	if use amd64
-	then
-		myconf="${myconf} --with-tls=__thread"
-	else
-		if use nptl
-		then
-			myconf="${myconf} --with-tls=__thread"
-		else
-			myconf="${myconf} --with-tls=pthread"
-		fi
-	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
-
-	dodoc AUTHORS ChangeLog NEWS README
-	docinto docs
-	dodoc docs/*
-	docinto libgc
-	dodoc libgc/ChangeLog
-}
diff --git a/dev-lang/mono/mono-1.1.9.2.ebuild b/dev-lang/mono/mono-1.1.9.2.ebuild
deleted file mode 100644
index 06aa872f88ef..000000000000
--- a/dev-lang/mono/mono-1.1.9.2.ebuild
+++ /dev/null
@@ -1,83 +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.9.2.ebuild,v 1.3 2006/01/09 22:09:07 mr_bones_ 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/sources/mono-${PV:0:3}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2 X11 )"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="nptl X"
-
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
-	sys-devel/bc
-	!<dev-dotnet/pnet-0.6.12
-	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
-	ppc? (
-		>=sys-devel/gcc-3.2.3-r4
-		>=sys-libs/glibc-2.3.3_pre20040420
-	)"
-
-RDEPEND="${DEPEND}
-	X? ( >=dev-dotnet/libgdiplus-1.1.9.2 )
-	dev-util/pkgconfig
-	dev-libs/libxml2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix munging of Unix paths
-	epatch ${FILESDIR}/${PN}-1.1.5-pathfix.diff
-
-	# 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"
-	automake || die "automake failed"
-}
-
-src_compile() {
-	strip-flags
-
-	local myconf="--with-preview=yes"
-
-	# Force __thread on amd64. See bug #83770
-	if use amd64
-	then
-		myconf="${myconf} --with-tls=__thread"
-	else
-		if use nptl
-		then
-			myconf="${myconf} --with-tls=__thread"
-		else
-			myconf="${myconf} --with-tls=pthread"
-		fi
-	fi
-
-	econf ${myconf} || 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
-
-	dodoc AUTHORS ChangeLog NEWS README
-	docinto docs
-	dodoc docs/*
-	docinto libgc
-	dodoc libgc/ChangeLog
-}