Bump. NPTL problem seems no longer to rely on gcc-3.4 to work. See bug #63734 for the long, painful details.

Package-Manager: portage-2.0.51.16

4 files changed, 156 insertions, 12 deletions

diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog
index 7d5030c047bc..7a2f8546802b 100644
--- a/dev-dotnet/mono/ChangeLog
+++ b/dev-dotnet/mono/ChangeLog
@@ -1,6 +1,12 @@
 # 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.45 2005/01/18 16:38:31 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.46 2005/02/18 19:12:33 latexer Exp $
+
+*mono-1.0.6 (18 Feb 2005)
+
+  18 Feb 2005; Peter Johanson <latexer@gentoo.org> +mono-1.0.6.ebuild:
+  Bump. NPTL problem seems no longer to rely on gcc-3.4 to work. See bug #63734
+  for the long, painful details.
 
   18 Jan 2005; Rainer Groesslinger <scandium@gentoo.org> mono-0.28.ebuild,
   mono-1.0.1-r1.ebuild, mono-1.0.1-r2.ebuild, mono-1.0.1.ebuild,
diff --git a/dev-dotnet/mono/Manifest b/dev-dotnet/mono/Manifest
index 77354e934666..eac329bfb3ad 100644
--- a/dev-dotnet/mono/Manifest
+++ b/dev-dotnet/mono/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 973616d5bc2737b6718ddc2d03a916ad mono-1.0.5-r1.ebuild 2136
 MD5 32e3811df462320ca1e2a9471d9d1762 mono-1.0.2.ebuild 1724
 MD5 b62f7d455836dc2c1f62d8280da04d00 mono-1.0.1-r1.ebuild 1743
@@ -8,11 +5,12 @@ MD5 2c674640890888e826f8a96600030be5 mono-1.0.5-r3.ebuild 4201
 MD5 2806bbfbbf7318fe22326bc97b695a17 mono-1.0.4.ebuild 1511
 MD5 0084ddd574a5adaad6a27948d8804986 mono-1.0.4-r1.ebuild 2114
 MD5 b46db46b0f2592a07868e9400ae44c56 mono-0.28.ebuild 2109
+MD5 7d0a03fbaaed2d05761cb78468dbf864 mono-1.0.6.ebuild 3838
 MD5 255860e8338bc5cd919d5eefee894643 mono-1.0.1.ebuild 1489
 MD5 9576181cecca6c094488e2b121ff4af9 mono-1.0.5-r2.ebuild 3602
 MD5 916a99e6f3aaec9b8f12a2542d900fe9 mono-1.0.1-r2.ebuild 1689
 MD5 c8eb4919490e8a2d596a532423c3cd0b mono-1.0.2-r1.ebuild 2114
-MD5 30da5a077a3a6ae18cfab7e7ced5bcf8 ChangeLog 11956
+MD5 2b4d0fdc4537dfac5a471cb09b98abf0 ChangeLog 12167
 MD5 990f209857fbfeb9bd514a82fb957d23 mono-1.0.5.ebuild 1534
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 9f4b4eb6a1555ed574dbdd359cae3070 files/dotnet.conf 573
@@ -21,6 +19,7 @@ MD5 7d7ffd8b6b060338e93efa00227516e7 files/digest-mono-1.0.1 64
 MD5 c56c6d79308a09f11e1a64e84c4bfd13 files/digest-mono-1.0.2 64
 MD5 2cef534891ce7b0c980d5615ae1397af files/digest-mono-1.0.4 64
 MD5 3304a21c35939f14b13ea1a8759e47b7 files/digest-mono-1.0.5 64
+MD5 c6035d1153d210b3f27ab455ed98b791 files/digest-mono-1.0.6 127
 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-r1 64
@@ -31,10 +30,3 @@ MD5 9e2e1b58a310e4236f757e683b71c879 files/digest-mono-1.0.5-r3 127
 MD5 48284ee0228c56980a839fb245258db7 files/mcs-1.0.5-pathfix.diff 628
 MD5 43da8709d0752a2ef9f9dfb050a05d9f files/digest-mono-0.28 123
 MD5 3c800bd50d6527c12be393369c234f0e files/mono-1.0-segv.diff 378
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB7TuYPgS8WLD64cERAjeKAJ0d8D6vWHHT2ki7SBEGhi6ADELKOwCfZem7
-4U17T+YdFeWbI0IL36Tuufw=
-=ClID
------END PGP SIGNATURE-----
diff --git a/dev-dotnet/mono/files/digest-mono-1.0.6 b/dev-dotnet/mono/files/digest-mono-1.0.6
new file mode 100644
index 000000000000..58c23e350ff3
--- /dev/null
+++ b/dev-dotnet/mono/files/digest-mono-1.0.6
@@ -0,0 +1,2 @@
+MD5 61700d5e113a1c9c99511971141b6901 mono-1.0.6.tar.gz 18486989
+MD5 465cf1256ae0ae7aac8c70a85991ddeb mcs-1.0.6.tar.gz 22322108
diff --git a/dev-dotnet/mono/mono-1.0.6.ebuild b/dev-dotnet/mono/mono-1.0.6.ebuild
new file mode 100644
index 000000000000..991db18de057
--- /dev/null
+++ b/dev-dotnet/mono/mono-1.0.6.ebuild
@@ -0,0 +1,144 @@
+# 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.6.ebuild,v 1.1 2005/02/18 19:12:33 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}
+
+	cd ${MCS_S}
+	epatch ${FILESDIR}/mcs-1.0.5-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
+}