Two new versions. -r1 has NPTL support hanked, -r2 has the NPTL suppor and is package.masked. See bug #54603

6 files changed, 142 insertions, 2 deletions

diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog
index 3310adffa7b0..860bdfcaf90e 100644
--- a/dev-dotnet/mono/ChangeLog
+++ b/dev-dotnet/mono/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/mono
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.27 2004/08/06 00:47:53 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.28 2004/08/17 23:59:30 latexer Exp $
+
+*mono-1.0.1-r1 (17 Aug 2004)
+
+  17 Aug 2004; Peter Johanson <latexer@gentoo.org> +mono-1.0.1-r1.ebuild,
+  +mono-1.0.1-r2.ebuild:
+  Two new versions. One removes all NPTL support, in hopes of being marked
+  stable soon. -r2 keeps the support, and is package.masked.
 
 *mono-1.0.1 (05 Aug 2004)
 
diff --git a/dev-dotnet/mono/Manifest b/dev-dotnet/mono/Manifest
index 5b450451fbb2..e37c431af4de 100644
--- a/dev-dotnet/mono/Manifest
+++ b/dev-dotnet/mono/Manifest
@@ -1,3 +1,4 @@
+MD5 a7593e12909b24fb1b230112522a2560 mono-1.0.1-r1.ebuild 1697
 MD5 f7e22e6411bbcd37bf830d576b10e66a mono-0.96.ebuild 1557
 MD5 320ce3e4c19a4e80c41ee9400a39f23c mono-0.30.ebuild 2392
 MD5 0569a7578a0082a433223c7dad460a6e mono-0.91.ebuild 1661
@@ -5,15 +6,18 @@ MD5 6a866ffdedeca043a6aaf267f8e2cab9 mono-0.30.1.ebuild 2394
 MD5 d61de115e7b37b55c71b44b0cb2bee89 mono-0.28.ebuild 2093
 MD5 31a0153f11f6e5217ce22aae7d833fe1 mono-1.0.1.ebuild 1478
 MD5 38b11c580052bca1c3ab11d14b281b51 mono-0.95.ebuild 1557
+MD5 911e2e48de0c548661da9868c6c7b6b1 mono-1.0.1-r2.ebuild 1678
 MD5 198b7500d7079c1159c29aba0b3e3250 mono-0.97.ebuild 1784
 MD5 f694ec86655b731f2d46488f531684f5 mono-0.31.ebuild 2546
-MD5 be4490523e8abdb6abe06960581fe55c ChangeLog 8322
+MD5 1a128ed8d12cf239633044ce3251cd17 ChangeLog 8588
 MD5 17c5779bfef6d1e1415ec71550d175ea mono-1.0.ebuild 1656
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 9f4b4eb6a1555ed574dbdd359cae3070 files/dotnet.conf 573
 MD5 f33c78b627cbbc1db2ab5f6cc5299e70 files/dotnet.init 1034
 MD5 7d7ffd8b6b060338e93efa00227516e7 files/digest-mono-1.0.1 64
 MD5 33b073ed2746ffc3552b2c68a2215b56 files/digest-mono-0.30.1 127
+MD5 7d7ffd8b6b060338e93efa00227516e7 files/digest-mono-1.0.1-r1 64
+MD5 7d7ffd8b6b060338e93efa00227516e7 files/digest-mono-1.0.1-r2 64
 MD5 43da8709d0752a2ef9f9dfb050a05d9f files/digest-mono-0.28 123
 MD5 b1d7d1f8b30cadd81ca257cfb0126f2b files/digest-mono-0.30 123
 MD5 e7d95f62bf18430aa812b1a501c2e485 files/digest-mono-0.31 124
diff --git a/dev-dotnet/mono/files/digest-mono-1.0.1-r1 b/dev-dotnet/mono/files/digest-mono-1.0.1-r1
new file mode 100644
index 000000000000..45d0222a6f3e
--- /dev/null
+++ b/dev-dotnet/mono/files/digest-mono-1.0.1-r1
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..45d0222a6f3e
--- /dev/null
+++ b/dev-dotnet/mono/files/digest-mono-1.0.1-r2
@@ -0,0 +1 @@
+MD5 e569c5b5a9153dfe10811c17bfefd884 mono-1.0.1.tar.gz 18245041
diff --git a/dev-dotnet/mono/mono-1.0.1-r1.ebuild b/dev-dotnet/mono/mono-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..2f524241a8f8
--- /dev/null
+++ b/dev-dotnet/mono/mono-1.0.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 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.1 2004/08/17 23:59:30 latexer 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
+	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 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 || 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
new file mode 100644
index 000000000000..e1f2b1bbff2e
--- /dev/null
+++ b/dev-dotnet/mono/mono-1.0.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 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.1 2004/08/17 23:59:30 latexer 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
+	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
+}