Add 1.0.5-r4, which now works for NPTL glibc using only gcc-3.3.5. This is hopefully the new target for stabalization. Also add in new mono-1.1.4, which will remain p.masked but in portage for amd64 folks. Removed some older ebuilds as well.

Package-Manager: portage-2.0.51.16

15 files changed, 243 insertions, 358 deletions

diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog
index 1bcbf270159f..2ac2dabdc233 100644
--- a/dev-dotnet/mono/ChangeLog
+++ b/dev-dotnet/mono/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-dotnet/mono
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.49 2005/02/19 22:31:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.50 2005/02/21 18:07:57 latexer Exp $
+
+*mono-1.0.5-r4 (21 Feb 2005)
+
+  21 Feb 2005; Peter Johanson <latexer@gentoo.org> -mono-1.0.1-r1.ebuild,
+  -mono-1.0.1-r2.ebuild, -mono-1.0.1.ebuild, -mono-1.0.5-r1.ebuild,
+  +mono-1.0.5-r4.ebuild, -mono-1.0.5.ebuild, +mono-1.1.4.ebuild:
+  Add 1.0.5-r4, which now works for NPTL glibc using only gcc-3.3.5. This is
+  hopefully the new target for stabalization. Also add in new mono-1.1.4, which
+  will remain p.masked but in portage for amd64 folks. Removed some older
+  ebuilds as well.
 
   19 Feb 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.6.ebuild:
   Remove the gmcs wrapper script, as on mono-1.0.x, we don't install gmcs
diff --git a/dev-dotnet/mono/Manifest b/dev-dotnet/mono/Manifest
index be264a7d58bc..d9ab52caf08d 100644
--- a/dev-dotnet/mono/Manifest
+++ b/dev-dotnet/mono/Manifest
@@ -1,32 +1,26 @@
-MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
-MD5 b46db46b0f2592a07868e9400ae44c56 mono-0.28.ebuild 2109
-MD5 255860e8338bc5cd919d5eefee894643 mono-1.0.1.ebuild 1489
-MD5 b62f7d455836dc2c1f62d8280da04d00 mono-1.0.1-r1.ebuild 1743
-MD5 916a99e6f3aaec9b8f12a2542d900fe9 mono-1.0.1-r2.ebuild 1689
-MD5 c8eb4919490e8a2d596a532423c3cd0b mono-1.0.2-r1.ebuild 2114
 MD5 32e3811df462320ca1e2a9471d9d1762 mono-1.0.2.ebuild 1724
-MD5 0084ddd574a5adaad6a27948d8804986 mono-1.0.4-r1.ebuild 2114
+MD5 15347c4ddac88480462c9f63a21e8b06 mono-1.0.5-r3.ebuild 4199
 MD5 2806bbfbbf7318fe22326bc97b695a17 mono-1.0.4.ebuild 1511
-MD5 973616d5bc2737b6718ddc2d03a916ad mono-1.0.5-r1.ebuild 2136
-MD5 990f209857fbfeb9bd514a82fb957d23 mono-1.0.5.ebuild 1534
-MD5 9576181cecca6c094488e2b121ff4af9 mono-1.0.5-r2.ebuild 3602
+MD5 0084ddd574a5adaad6a27948d8804986 mono-1.0.4-r1.ebuild 2114
+MD5 b46db46b0f2592a07868e9400ae44c56 mono-0.28.ebuild 2109
 MD5 ee415b7d491fbdf8c2bc2fdca73ec845 mono-1.0.6.ebuild 3910
-MD5 15347c4ddac88480462c9f63a21e8b06 mono-1.0.5-r3.ebuild 4199
-MD5 b4ee0cce0e6cba5157c9ce71406cd711 ChangeLog 12310
-MD5 43da8709d0752a2ef9f9dfb050a05d9f files/digest-mono-0.28 123
+MD5 a0e670e6e84f7e5b08574fa0610d3c74 mono-1.1.4.ebuild 1838
+MD5 9576181cecca6c094488e2b121ff4af9 mono-1.0.5-r2.ebuild 3602
+MD5 c8eb4919490e8a2d596a532423c3cd0b mono-1.0.2-r1.ebuild 2114
+MD5 192d33789fedf6f63ad59952446ffe77 mono-1.0.5-r4.ebuild 3827
+MD5 e84a79cef88b0c3f06cc9754a21209ce ChangeLog 12800
+MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 9f4b4eb6a1555ed574dbdd359cae3070 files/dotnet.conf 573
 MD5 f33c78b627cbbc1db2ab5f6cc5299e70 files/dotnet.init 1034
-MD5 3c800bd50d6527c12be393369c234f0e files/mono-1.0-segv.diff 378
-MD5 7d7ffd8b6b060338e93efa00227516e7 files/digest-mono-1.0.1 64
-MD5 7d7ffd8b6b060338e93efa00227516e7 files/digest-mono-1.0.1-r1 64
-MD5 7d7ffd8b6b060338e93efa00227516e7 files/digest-mono-1.0.1-r2 64
 MD5 c56c6d79308a09f11e1a64e84c4bfd13 files/digest-mono-1.0.2 64
-MD5 c56c6d79308a09f11e1a64e84c4bfd13 files/digest-mono-1.0.2-r1 64
 MD5 2cef534891ce7b0c980d5615ae1397af files/digest-mono-1.0.4 64
+MD5 c6035d1153d210b3f27ab455ed98b791 files/digest-mono-1.0.6 127
+MD5 7266922629dc78088ee3d230acbf895e files/digest-mono-1.1.4 64
+MD5 c56c6d79308a09f11e1a64e84c4bfd13 files/digest-mono-1.0.2-r1 64
 MD5 2cef534891ce7b0c980d5615ae1397af files/digest-mono-1.0.4-r1 64
-MD5 3304a21c35939f14b13ea1a8759e47b7 files/digest-mono-1.0.5 64
-MD5 3304a21c35939f14b13ea1a8759e47b7 files/digest-mono-1.0.5-r1 64
 MD5 9e2e1b58a310e4236f757e683b71c879 files/digest-mono-1.0.5-r2 127
 MD5 9e2e1b58a310e4236f757e683b71c879 files/digest-mono-1.0.5-r3 127
+MD5 9e2e1b58a310e4236f757e683b71c879 files/digest-mono-1.0.5-r4 127
 MD5 48284ee0228c56980a839fb245258db7 files/mcs-1.0.5-pathfix.diff 628
-MD5 c6035d1153d210b3f27ab455ed98b791 files/digest-mono-1.0.6 127
+MD5 43da8709d0752a2ef9f9dfb050a05d9f files/digest-mono-0.28 123
+MD5 3c800bd50d6527c12be393369c234f0e files/mono-1.0-segv.diff 378
diff --git a/dev-dotnet/mono/files/digest-mono-1.0.1 b/dev-dotnet/mono/files/digest-mono-1.0.1
deleted file mode 100644
index 45d0222a6f3e..000000000000
--- a/dev-dotnet/mono/files/digest-mono-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e569c5b5a9153dfe10811c17bfefd884 mono-1.0.1.tar.gz 18245041
diff --git a/dev-dotnet/mono/files/digest-mono-1.0.1-r1 b/dev-dotnet/mono/files/digest-mono-1.0.1-r1
deleted file mode 100644
index 45d0222a6f3e..000000000000
--- a/dev-dotnet/mono/files/digest-mono-1.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e569c5b5a9153dfe10811c17bfefd884 mono-1.0.1.tar.gz 18245041
diff --git a/dev-dotnet/mono/files/digest-mono-1.0.1-r2 b/dev-dotnet/mono/files/digest-mono-1.0.1-r2
deleted file mode 100644
index 45d0222a6f3e..000000000000
--- a/dev-dotnet/mono/files/digest-mono-1.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e569c5b5a9153dfe10811c17bfefd884 mono-1.0.1.tar.gz 18245041
diff --git a/dev-dotnet/mono/files/digest-mono-1.0.5 b/dev-dotnet/mono/files/digest-mono-1.0.5
deleted file mode 100644
index f6b1f5d92509..000000000000
--- a/dev-dotnet/mono/files/digest-mono-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09c9b5e7a128e7607e79d4d35bf76f68 mono-1.0.5.tar.gz 18477749
diff --git a/dev-dotnet/mono/files/digest-mono-1.0.5-r1 b/dev-dotnet/mono/files/digest-mono-1.0.5-r4
index f6b1f5d92509..7d194132b39f 100644
--- a/dev-dotnet/mono/files/digest-mono-1.0.5-r1
+++ b/dev-dotnet/mono/files/digest-mono-1.0.5-r4
@@ -1 +1,2 @@
 MD5 09c9b5e7a128e7607e79d4d35bf76f68 mono-1.0.5.tar.gz 18477749
+MD5 aa1d0acf06eb9ba8e87b5bec1b860e1b mcs-1.0.5.tar.gz 22283191
diff --git a/dev-dotnet/mono/files/digest-mono-1.1.4 b/dev-dotnet/mono/files/digest-mono-1.1.4
new file mode 100644
index 000000000000..b2912d71ce59
--- /dev/null
+++ b/dev-dotnet/mono/files/digest-mono-1.1.4
@@ -0,0 +1 @@
+MD5 66755e5f201e912cecdd19807ba62487 mono-1.1.4.tar.gz 13085573
diff --git a/dev-dotnet/mono/mono-1.0.1-r1.ebuild b/dev-dotnet/mono/mono-1.0.1-r1.ebuild
deleted file mode 100644
index 332be3e549dc..000000000000
--- a/dev-dotnet/mono/mono-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.1-r1.ebuild,v 1.6 2005/01/18 16:38:31 scandium Exp $
-
-inherit eutils mono flag-o-matic debug
-
-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"
-
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
-	>=dev-libs/icu-2.6.1
-	!<dev-dotnet/pnet-0.6.12
-	ppc? ( >=sys-devel/gcc-3.2.3-r4 )
-	ppc? ( >=sys-libs/glibc-2.3.3_pre20040420 )"
-RDEPEND="${DEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxml2"
-
-src_compile() {
-	strip-flags
-
-	if use nptl || have_NPTL
-	then
-		eerror "mono currently has bug in garbage collection when"
-		eerror "using a NPTL enabled glibc. Please see bug #54603"
-		eerror "on bugs.gentoo.org for details. You can use the"
-		eerror "package.masked mono-1.0.1-r2 release if you need NPTL"
-		eerror "but you have been warned of the problems."
-		die "NPTL glibc not support by this release"
-	fi
-
-	econf --with-tls=pthread || 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
-
-	# init script
-	exeinto /etc/init.d ; newexe ${FILESDIR}/dotnet.init dotnet
-	insinto /etc/conf.d ; newins ${FILESDIR}/dotnet.conf dotnet
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you want to avoid typing '<runtime> program.exe'"
-	einfo "you can configure your runtime in /etc/conf.d/dotnet"
-	einfo "Use /etc/init.d/dotnet to register your runtime"
-	echo
-}
diff --git a/dev-dotnet/mono/mono-1.0.1-r2.ebuild b/dev-dotnet/mono/mono-1.0.1-r2.ebuild
deleted file mode 100644
index 7351ac89e861..000000000000
--- a/dev-dotnet/mono/mono-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.1-r2.ebuild,v 1.4 2005/01/18 16:38:31 scandium Exp $
-
-inherit eutils mono flag-o-matic debug
-
-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"
-
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
-	>=dev-libs/icu-2.6.1
-	!<dev-dotnet/pnet-0.6.12
-	ppc? ( >=sys-devel/gcc-3.2.3-r4 )
-	ppc? ( >=sys-libs/glibc-2.3.3_pre20040420 )"
-RDEPEND="${DEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxml2"
-
-src_compile() {
-	strip-flags
-
-	local myconf=""
-	if use nptl && have_NPTL
-	then
-		ewarn "You are using NPTL glibc, which is known to cause problems with"
-		ewarn "garbage collection in Mono. Please see bug #54603 on bug.gentoo.org"
-		ewarn "for details. You have been warned!"
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	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
-
-	# init script
-	exeinto /etc/init.d ; newexe ${FILESDIR}/dotnet.init dotnet
-	insinto /etc/conf.d ; newins ${FILESDIR}/dotnet.conf dotnet
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you want to avoid typing '<runtime> program.exe'"
-	einfo "you can configure your runtime in /etc/conf.d/dotnet"
-	einfo "Use /etc/init.d/dotnet to register your runtime"
-	echo
-}
diff --git a/dev-dotnet/mono/mono-1.0.1.ebuild b/dev-dotnet/mono/mono-1.0.1.ebuild
deleted file mode 100644
index 58851bff4a39..000000000000
--- a/dev-dotnet/mono/mono-1.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.1.ebuild,v 1.4 2005/01/18 16:38:31 scandium Exp $
-
-inherit eutils mono flag-o-matic debug
-
-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"
-
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
-	>=dev-libs/icu-2.6.1
-	!<dev-dotnet/pnet-0.6.12
-	ppc? ( >=sys-devel/gcc-3.2.3-r4 )
-	ppc? ( >=sys-libs/glibc-2.3.3_pre20040420 )"
-RDEPEND="${DEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxml2"
-
-src_compile() {
-	strip-flags
-
-	local myconf=""
-	if use nptl && have_NPTL
-	then
-		myconf="${myconf} --with-tls=__thread"
-	else
-		myconf="${myconf} --with-tls=pthread"
-	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
-
-	# init script
-	exeinto /etc/init.d ; newexe ${FILESDIR}/dotnet.init dotnet
-	insinto /etc/conf.d ; newins ${FILESDIR}/dotnet.conf dotnet
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you want to avoid typing '<runtime> program.exe'"
-	einfo "you can configure your runtime in /etc/conf.d/dotnet"
-	einfo "Use /etc/init.d/dotnet to register your runtime"
-	echo
-}
diff --git a/dev-dotnet/mono/mono-1.0.5-r1.ebuild b/dev-dotnet/mono/mono-1.0.5-r1.ebuild
deleted file mode 100644
index 178d1dfafe87..000000000000
--- a/dev-dotnet/mono/mono-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r1.ebuild,v 1.3 2005/01/18 16:38:31 scandium Exp $
-
-inherit eutils mono flag-o-matic debug gcc
-
-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"
-
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
-	>=dev-libs/icu-2.6.1
-	!<dev-dotnet/pnet-0.6.12
-	nptl? ( >=sys-devel/gcc-3.4 )
-	ppc? (
-		>=sys-devel/gcc-3.2.3-r4
-		>=sys-libs/glibc-2.3.3_pre20040420
-	)"
-
-RDEPEND="${DEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxml2"
-
-src_compile() {
-	strip-flags
-
-	local myconf="--with-sigaltstack=yes"
-	if use nptl && have_NPTL
-	then
-		# NPTL support only works with gcc-3.4 and higher currently. ):
-		if [ `gcc-minor-version` -lt 4 ]
-		then
-			echo
-			eerror "NPTL enabled mono requires gcc-3.4 or higher to function."
-			eerror "Please use gcc-config to select gcc-3.4 for the mono installation."
-			die "gcc version not high enough for NPTL support."
-		else
-			myconf="${myconf} --with-tls=__thread"
-			sed -i "s: -fexceptions::" ${S}/libgc/configure.host
-		fi
-	else
-		if have_NPTL
-		then
-			ewarn "NPTL glibc detected, but nptl USE flag is not set."
-			ewarn "This may cause some problems for mono as it will be"
-			ewarn "compiled with normal pthread support."
-		fi
-
-		myconf="${myconf} --with-tls=pthread"
-	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
-
-	# init script
-	exeinto /etc/init.d ; newexe ${FILESDIR}/dotnet.init dotnet
-	insinto /etc/conf.d ; newins ${FILESDIR}/dotnet.conf dotnet
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you want to avoid typing '<runtime> program.exe'"
-	einfo "you can configure your runtime in /etc/conf.d/dotnet"
-	einfo "Use /etc/init.d/dotnet to register your runtime"
-	echo
-}
diff --git a/dev-dotnet/mono/mono-1.0.5-r4.ebuild b/dev-dotnet/mono/mono-1.0.5-r4.ebuild
new file mode 100644
index 000000000000..e287d4e925c3
--- /dev/null
+++ b/dev-dotnet/mono/mono-1.0.5-r4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r4.ebuild,v 1.1 2005/02/21 18:07:57 latexer Exp $
+
+inherit eutils mono flag-o-matic debug
+
+MCS_P=${P/mono/mcs}
+MCS_S=${WORKDIR}/${MCS_P}
+
+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
+		http://www.go-mono.com/archive/${PV}/${MCS_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="nptl"
+
+DEPEND="virtual/libc
+	>=dev-libs/glib-2.0
+	>=dev-libs/icu-2.6.1
+	!<dev-dotnet/pnet-0.6.12
+	>=sys-devel/gcc-3.3.5
+	ppc? (
+		>=sys-libs/glibc-2.3.3_pre20040420
+	)"
+
+RDEPEND="${DEPEND}
+	dev-util/pkgconfig
+	dev-libs/libxml2"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${MCS_P}-pathfix.diff
+
+	# Disable installing the precompiled mcs/classlibs
+	sed -i "s: runtime : :" ${S}/Makefile.in
+	# Fix the path for the jay man page
+	sed -i "s:man/man1:share/man/man1:" ${MCS_S}/jay/Makefile
+
+	# Ugly sed to replace windows path with *nix equivalent
+	for file in $(find ${MCS_S}/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:" \
+		${MCS_S}/build/library.make
+
+	# add our own little in-place mcs script
+	echo "${S}/mono/mini/mono ${S}/runtime/mcs.exe \"\$@\" " > ${S}/runtime/mcs
+	chmod +x ${S}/runtime/mcs
+
+	echo "${S}/mono/mini/mono ${S}/runtime/monoresgen.exe \"\$@\" " > ${S}/runtime/monoresgen
+	chmod +x ${S}/runtime/monoresgen
+
+	PATH="${S}/runtime:${PATH}"
+	MONO_CFG_DIR='${D}/etc/'
+	export PATH
+	export MONO_CFG_DIR
+}
+
+src_compile() {
+	strip-flags
+
+	local myconf="--with-sigaltstack=yes"
+	if use nptl && have_NPTL
+	then
+		myconf="${myconf} --with-tls=__thread"
+		sed -i "s: -fexceptions::" ${S}/libgc/configure.host
+	else
+		if have_NPTL
+		then
+			ewarn "NPTL glibc detected, but nptl USE flag is not set."
+			ewarn "This may cause some problems for mono as it will be"
+			ewarn "compiled with normal pthread support."
+		fi
+
+		myconf="${myconf} --with-tls=pthread"
+	fi
+
+	econf ${myconf} || die
+	emake -j1 || die "mono runtime compilation failure"
+
+	cd ${S}
+	ln -s ../runtime ${WORKDIR}/${P}/runtime/lib
+
+	# Now that we have a valid config for lib mappings, put them
+	# in our temporary config directory.
+
+	dodir /etc/mono
+	cp ${S}/data/{config,machine.config} ${D}/etc/mono/
+
+	cd ${MCS_S}
+	echo "prefix=${S}/runtime" > build/config.make
+	echo "MONO_PATH=${S}/runtime/net_1_1" >> build/config.make
+	echo "BOOTSTRAP_MCS=${S}/runtime/mcs" >> build/config.make
+	echo "RUNTIME=${S}/mono/mini/mono \${RUNTIME_FLAGS}" >> build/config.make
+	echo "PATH=${S}/runtime:${PATH}" >> build/config.make
+	echo "export PATH" >> build/config.make
+	echo "export MONO_PATH" >> build/config.make
+	emake -j1 PLATFORM=linux || die "mcs compiler compilation failure"
+	echo "prefix=/usr" >> build/config.make
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+	docinto docs
+	dodoc docs/*
+	docinto libgc
+	dodoc libgc/ChangeLog
+
+	cd ${MCS_S}
+	make PLATFORM=linux DESTDIR=${D} install || die
+
+	docinto mcs
+	dodoc AUTHORS README* ChangeLog INSTALL.txt
+	docinto mcs/docs
+	dodoc docs/*.txt
+
+	# Remove some extraneous tools
+	cd ${D}/usr/bin
+	rm {CorCompare,EnumCheck,GenerateDelegate,ictool,IFaceDisco}.exe
+	rm nunit-console.exe
+
+	# init script
+	exeinto /etc/init.d ; newexe ${FILESDIR}/dotnet.init dotnet
+	insinto /etc/conf.d ; newins ${FILESDIR}/dotnet.conf dotnet
+}
+
+pkg_postinst() {
+	echo
+	einfo "If you want to avoid typing '<runtime> program.exe'"
+	einfo "you can configure your runtime in /etc/conf.d/dotnet"
+	einfo "Use /etc/init.d/dotnet to register your runtime"
+	echo
+}
diff --git a/dev-dotnet/mono/mono-1.0.5.ebuild b/dev-dotnet/mono/mono-1.0.5.ebuild
deleted file mode 100644
index 0f1c9382554a..000000000000
--- a/dev-dotnet/mono/mono-1.0.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5.ebuild,v 1.3 2005/01/18 16:38:31 scandium Exp $
-
-inherit eutils mono flag-o-matic debug
-
-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=""
-
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
-	>=dev-libs/icu-2.6.1
-	!<dev-dotnet/pnet-0.6.12
-	ppc? (
-		>=sys-devel/gcc-3.2.3-r4
-		>=sys-libs/glibc-2.3.3_pre20040420
-	)"
-RDEPEND="${DEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxml2"
-
-src_compile() {
-	strip-flags
-
-	if have_NPTL
-	then
-		eerror "To use mono with an NPTL enabled glibc, please emerge"
-		eerror "mono-${PV}-r1."
-		die "NPTL glibc not support by this release"
-	fi
-
-	econf --with-tls=pthread --with-sigaltstack=yes || 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
-
-	# init script
-	exeinto /etc/init.d ; newexe ${FILESDIR}/dotnet.init dotnet
-	insinto /etc/conf.d ; newins ${FILESDIR}/dotnet.conf dotnet
-}
-
-pkg_postinst() {
-	echo
-	einfo "If you want to avoid typing '<runtime> program.exe'"
-	einfo "you can configure your runtime in /etc/conf.d/dotnet"
-	einfo "Use /etc/init.d/dotnet to register your runtime"
-	echo
-}
diff --git a/dev-dotnet/mono/mono-1.1.4.ebuild b/dev-dotnet/mono/mono-1.1.4.ebuild
new file mode 100644
index 000000000000..fc5c2ef05fa6
--- /dev/null
+++ b/dev-dotnet/mono/mono-1.1.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.1.4.ebuild,v 1.1 2005/02/21 18:07:57 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
+	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
+}
+
+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
+
+	# prj2make sources missing from mono-1.1.4 tarball, so we remove the wrapper
+	# script
+	rm ${D}/usr/bin/prj2make ${D}/usr/share/man/man1/prj2make.1
+
+	dodoc AUTHORS ChangeLog NEWS README
+	docinto docs
+	dodoc docs/*
+	docinto libgc
+	dodoc libgc/ChangeLog
+}