Revbump to push out mcs fix. D'oh.

Package-Manager: portage-2.1.2_pre2-r8

4 files changed, 136 insertions, 25 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 646d66050d68..f6c4e1f17bb0 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,11 @@
 # 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.94 2006/10/27 16:22:23 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.95 2006/10/28 19:41:16 latexer Exp $
+
+*mono-1.1.18-r1 (28 Oct 2006)
+
+  28 Oct 2006; Peter Johanson <latexer@gentoo.org> +mono-1.1.18-r1.ebuild:
+  Revbump to push out mcs fix. D'oh.
 
   27 Oct 2006; Christian Faulhammer <opfer@gentoo.org>
   mono-1.1.13.8.1.ebuild:
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index a34cf3e4d457..0c4fc3e572fe 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dotnet.conf 570 RMD160 ba6616d6ce12c29ca83139c2de1282c9d4b4daef SHA1 c31dbfdee348fb5e943ac86cb1e60a93a0c3a2e9 SHA256 60ddac408b87b4529e2c3bb9b342d99446da06a459595cc610e335140f29c860
 MD5 e8acd8bc997d82f676be5cf2057d3d25 files/dotnet.conf 570
 RMD160 ba6616d6ce12c29ca83139c2de1282c9d4b4daef files/dotnet.conf 570
@@ -66,16 +63,16 @@ MD5 25426f960f7fc04c8932375f20885eda files/mono-1.1.9.1-io-layer-fix.diff 5552
 RMD160 ed98a87a73bf812f3c9ef654d2895b6a31e71cdf files/mono-1.1.9.1-io-layer-fix.diff 5552
 SHA256 e0dbe1cd0a39cbd05d40e28f81268ef246b3b8bf377fab8cd092024bfbfc0379 files/mono-1.1.9.1-io-layer-fix.diff 5552
 DIST mcs-1.0.5.tar.gz 22283191 RMD160 1d5a85a4da6d422737ab7e9c866e32bd1439440b SHA256 0c493f3bb9ac3396926ca1cb173d6a481be4fd563907ce89df26824da1a412d2
-DIST mono-1.0.5.tar.gz 18477749 RMD160 7486e68adbd8f59b3c706e66c3f6edf862928d7d SHA1 f872440051b34f1f5f68ed5a37f1eba82babdda6 SHA256 7129baba97816695ec87bf5abedc34a4ffa3295e98e6b2f826cd0bb0831b599f
-DIST mono-1.1.12.1.tar.gz 17899010 RMD160 4e008bb159549e964e4ea8937ed95d731fb6453f SHA1 9cf8fcbbe3f133328ba3555c3763536780e7314f SHA256 6f2b0ba748dc2571981c7280ba9a7c9c4498c1bca872be1f5ac33015b138e3cd
-DIST mono-1.1.13.1.tar.gz 17989571 RMD160 415e958674bed0b5feb380809bcfb85e14617f97 SHA1 2d48a18ead0c0179fc578a3206fd11fedf563aa0 SHA256 79b757e744cc19fd02ed74a51ffaca16d4b4f7124da43a845c99200c0e3868df
-DIST mono-1.1.13.2.tar.gz 18043178 RMD160 64ad831d21ea067146ac94ec9363f45ae365aeea SHA1 0792459914fef4869f9236efb77cded9b0e84b7a SHA256 00cbb15edf1f7d5bfa96a9a30a564d555420a955ed7da777b786ebd362d8239c
-DIST mono-1.1.13.4.tar.gz 18107270 RMD160 761b3df0be4552e4d8e67f0e6cef6e7c9b3dc9b3 SHA1 a04ef2fc339428a7c9db0b6e4bc72e3209f8e957 SHA256 203e4a93001207eed2463f12d024415a0f6c314eb6ba4f9835cae6eb777d4a6e
-DIST mono-1.1.13.6.tar.gz 18217583 RMD160 f8a07beeaf46fb873715809525157034effd4b0b SHA1 3a5993073fe1489ad794dd49605173354dc2e8b4 SHA256 ec60e3b670752c3453dfe8b76af0c1a17d60e81c842b375af7d3966d84329ea6
-DIST mono-1.1.13.8.1.tar.gz 17758715 RMD160 a100a96b19300b253c12a2ad70caf65721418209 SHA1 f2cb79844073694859b1fb92eb770e3705239a3d SHA256 841cd62de1f61fefd17190dcc744e03f49c495039cc2088627ede9d9d825e21a
-DIST mono-1.1.13.8.tar.gz 17758074 RMD160 c742a4f3302e184bd532b30fbce8e87cb99def44 SHA1 c3d75aee282fce8afcec6e6a9bed5601f4149902 SHA256 bc3f7317c2058a2d84d0d08193826897704544df001d9657cfa06bcc4778db32
-DIST mono-1.1.16.1.tar.gz 19115095 RMD160 3ccf59d5e8f3e7ce74bccd495d7a8413a0fdce9c SHA1 fd68988e2d6002f4b631edfb8dee372bc9d979b3 SHA256 6404bd0b34c642bb159328486949424d7d51f444cfbed5c83ee5f4ee3ad34b0f
-DIST mono-1.1.17.1.tar.gz 19352812 RMD160 664c46d1b81015c427177ab6a704d2bda5a3ad82 SHA1 970487ecb21e9b90255e0c7a420479f1cbd31d72 SHA256 abc547c45952152a4aebd3923790f651ce32c5535ea1de3aae031fba2a06b489
+DIST mono-1.0.5.tar.gz 18477749 RMD160 7486e68adbd8f59b3c706e66c3f6edf862928d7d SHA256 7129baba97816695ec87bf5abedc34a4ffa3295e98e6b2f826cd0bb0831b599f
+DIST mono-1.1.12.1.tar.gz 17899010 RMD160 4e008bb159549e964e4ea8937ed95d731fb6453f SHA256 6f2b0ba748dc2571981c7280ba9a7c9c4498c1bca872be1f5ac33015b138e3cd
+DIST mono-1.1.13.1.tar.gz 17989571 RMD160 415e958674bed0b5feb380809bcfb85e14617f97 SHA256 79b757e744cc19fd02ed74a51ffaca16d4b4f7124da43a845c99200c0e3868df
+DIST mono-1.1.13.2.tar.gz 18043178 RMD160 64ad831d21ea067146ac94ec9363f45ae365aeea SHA256 00cbb15edf1f7d5bfa96a9a30a564d555420a955ed7da777b786ebd362d8239c
+DIST mono-1.1.13.4.tar.gz 18107270 RMD160 761b3df0be4552e4d8e67f0e6cef6e7c9b3dc9b3 SHA256 203e4a93001207eed2463f12d024415a0f6c314eb6ba4f9835cae6eb777d4a6e
+DIST mono-1.1.13.6.tar.gz 18217583 RMD160 f8a07beeaf46fb873715809525157034effd4b0b SHA256 ec60e3b670752c3453dfe8b76af0c1a17d60e81c842b375af7d3966d84329ea6
+DIST mono-1.1.13.8.1.tar.gz 17758715 RMD160 a100a96b19300b253c12a2ad70caf65721418209 SHA256 841cd62de1f61fefd17190dcc744e03f49c495039cc2088627ede9d9d825e21a
+DIST mono-1.1.13.8.tar.gz 17758074 RMD160 c742a4f3302e184bd532b30fbce8e87cb99def44 SHA256 bc3f7317c2058a2d84d0d08193826897704544df001d9657cfa06bcc4778db32
+DIST mono-1.1.16.1.tar.gz 19115095 RMD160 3ccf59d5e8f3e7ce74bccd495d7a8413a0fdce9c SHA256 6404bd0b34c642bb159328486949424d7d51f444cfbed5c83ee5f4ee3ad34b0f
+DIST mono-1.1.17.1.tar.gz 19352812 RMD160 664c46d1b81015c427177ab6a704d2bda5a3ad82 SHA256 abc547c45952152a4aebd3923790f651ce32c5535ea1de3aae031fba2a06b489
 DIST mono-1.1.18.tar.gz 19457001 RMD160 60134edff923ca2a39cb82f75f5dcc7468edb601 SHA1 9791658fe6f5e4c6fd001a2f7fe4d46e80b549e2 SHA256 8b5a62cb91b92a9b77c62595f7f081971efac66fdfebaf1de7cd5c15b425c36b
 DIST mono-1.1.8.3.tar.gz 15348432 RMD160 a012252c76797c230cb9a62ee713314a44325932 SHA256 f0fc905d24074297402c746487d13cf53c331b20e0fcf1421cbb05cd2ca6392b
 EBUILD mono-1.0.5-r5.ebuild 3719 RMD160 b7e162c6daf0139834bba35b1cd39eec1da66569 SHA1 dad9ededf38f418ade4b53dc6a186ce4e1f246f0 SHA256 18ed8d8b04c0d0c05d96e89d21edb842fca1343bbae52e4ae7e893812ead262b
@@ -118,6 +115,10 @@ EBUILD mono-1.1.17.1.ebuild 2762 RMD160 55c46f4ed769382f0d2a1acc9bdc1cde8dbd4fc2
 MD5 93477e0320b72e6ba4d5b7a24c9b89e7 mono-1.1.17.1.ebuild 2762
 RMD160 55c46f4ed769382f0d2a1acc9bdc1cde8dbd4fc2 mono-1.1.17.1.ebuild 2762
 SHA256 2824d76116105dd5c5cb1ff63a428154864f247473893c0d9501012a5d39b28e mono-1.1.17.1.ebuild 2762
+EBUILD mono-1.1.18-r1.ebuild 2842 RMD160 e3229722a3c263f2700fdab0c8a59f5c19e03390 SHA1 4b74c395b2fa2e49eced6b934babfed8588a46c3 SHA256 ae78d763cc6f24e73b06e236a9e789f4ccf156cce0b6272bb6b27d89683daa5c
+MD5 ed7229cd0e063c61b031ca514ed81abb mono-1.1.18-r1.ebuild 2842
+RMD160 e3229722a3c263f2700fdab0c8a59f5c19e03390 mono-1.1.18-r1.ebuild 2842
+SHA256 ae78d763cc6f24e73b06e236a9e789f4ccf156cce0b6272bb6b27d89683daa5c mono-1.1.18-r1.ebuild 2842
 EBUILD mono-1.1.18.ebuild 2839 RMD160 0d460cf3ba4ae4ded656f8a7eb919c3011579ac5 SHA1 67256536a84d982b3fb157063c3425cd5432dccf SHA256 7a986002ca72aa5a399666e015c1a74929573d994d8b76dbf6792b724391add3
 MD5 161188252053d1852e854b488b901647 mono-1.1.18.ebuild 2839
 RMD160 0d460cf3ba4ae4ded656f8a7eb919c3011579ac5 mono-1.1.18.ebuild 2839
@@ -126,10 +127,10 @@ EBUILD mono-1.1.8.3.ebuild 2487 RMD160 77bffc9eb0883e7e6624829b1f5bf44a15021cbc
 MD5 4bfd6907ec394737df6275cf0472da49 mono-1.1.8.3.ebuild 2487
 RMD160 77bffc9eb0883e7e6624829b1f5bf44a15021cbc mono-1.1.8.3.ebuild 2487
 SHA256 02a7e3ab2158beec15e5e02a53dddb67ef8ddc7280d22bc7fc7eb2acc48967ca mono-1.1.8.3.ebuild 2487
-MISC ChangeLog 23788 RMD160 9296484d568129807a0fe2c22ea32c057e9b5c26 SHA1 b38d26cb1f23508d2fe06646599d52fbab5de6f9 SHA256 148b01e84eb1d52ba2d0220d12c02550d79085eac31aa17e5ac708aeaad09462
-MD5 37ff4326892dcac8f63ba2ee15d1d981 ChangeLog 23788
-RMD160 9296484d568129807a0fe2c22ea32c057e9b5c26 ChangeLog 23788
-SHA256 148b01e84eb1d52ba2d0220d12c02550d79085eac31aa17e5ac708aeaad09462 ChangeLog 23788
+MISC ChangeLog 23934 RMD160 2771d78488598e907f9c6af48209fe33364511b2 SHA1 cad7434b8983fc10b6dccc1811bf30270360edba SHA256 61eab71041043f240e468246d9a7c77aa39ec79999907f6eeedbcf36b29e955d
+MD5 83698ab67857e965da5e1d16ed56ca98 ChangeLog 23934
+RMD160 2771d78488598e907f9c6af48209fe33364511b2 ChangeLog 23934
+SHA256 61eab71041043f240e468246d9a7c77aa39ec79999907f6eeedbcf36b29e955d ChangeLog 23934
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 metadata.xml 159
@@ -167,13 +168,9 @@ SHA256 55e1079e6eefa4e46d01c302f49e91ac44628b042ac4fceef0784a964571bbc0 files/di
 MD5 50e943e86589c5e27406bcf286abbcb7 files/digest-mono-1.1.18 241
 RMD160 b307054f1e12dd426b5b76993b14c413e0a77b98 files/digest-mono-1.1.18 241
 SHA256 f6cfe6d2dfd1765838f21bc87f80a4014e6607a40315208e2e3768c5400879ce files/digest-mono-1.1.18 241
+MD5 50e943e86589c5e27406bcf286abbcb7 files/digest-mono-1.1.18-r1 241
+RMD160 b307054f1e12dd426b5b76993b14c413e0a77b98 files/digest-mono-1.1.18-r1 241
+SHA256 f6cfe6d2dfd1765838f21bc87f80a4014e6607a40315208e2e3768c5400879ce files/digest-mono-1.1.18-r1 241
 MD5 1c53aa1336e4c123a7ace134d2248dba files/digest-mono-1.1.8.3 244
 RMD160 a7d4b0a82819ab48368f9a2f80c986ed96b8eb3d files/digest-mono-1.1.8.3 244
 SHA256 61c176c75d114704a760223cba7fae07f60cf548b3d722015f4a7040851098ab files/digest-mono-1.1.8.3 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFQjKeNQqtfCuFneMRAqhEAJ9BAe23tjJdFwjINa5YKsjlT6QH2gCfdiBw
-kpOPOUBPX/bwHExUCYCYFys=
-=ZOyq
------END PGP SIGNATURE-----
diff --git a/dev-lang/mono/files/digest-mono-1.1.18-r1 b/dev-lang/mono/files/digest-mono-1.1.18-r1
new file mode 100644
index 000000000000..62a321da8e10
--- /dev/null
+++ b/dev-lang/mono/files/digest-mono-1.1.18-r1
@@ -0,0 +1,3 @@
+MD5 ce7c16c15b938edb2f1ea781921ef3eb mono-1.1.18.tar.gz 19457001
+RMD160 60134edff923ca2a39cb82f75f5dcc7468edb601 mono-1.1.18.tar.gz 19457001
+SHA256 8b5a62cb91b92a9b77c62595f7f081971efac66fdfebaf1de7cd5c15b425c36b mono-1.1.18.tar.gz 19457001
diff --git a/dev-lang/mono/mono-1.1.18-r1.ebuild b/dev-lang/mono/mono-1.1.18-r1.ebuild
new file mode 100644
index 000000000000..e280b6ac46cf
--- /dev/null
+++ b/dev-lang/mono/mono-1.1.18-r1.ebuild
@@ -0,0 +1,106 @@
+# 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.18-r1.ebuild,v 1.1 2006/10/28 19:41:16 latexer Exp $
+
+inherit eutils flag-o-matic multilib autotools
+
+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="~amd64 ~ppc ~x86"
+IUSE="X nptl"
+
+RDEPEND="!<dev-dotnet/pnet-0.6.12
+		 >=dev-libs/glib-2.6
+		 nptl? ( >=sys-devel/gcc-3.3.5-r1 )
+		 ppc?	(
+					>=sys-devel/gcc-3.2.3-r4
+					>=sys-libs/glibc-2.3.3_pre20040420
+				)
+		 X? ( >=dev-dotnet/libgdiplus-1.1.18 )"
+DEPEND="${RDEPEND}
+		  sys-devel/bc
+		>=dev-util/pkgconfig-0.19"
+
+# Parallel build unfriendly
+MAKEOPTS="${MAKEOPTS} -j1"
+
+# confcache causes build errors
+RESTRICT="confcache"
+
+function get-memory-total() {
+	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix mcs crasher
+	cd ${S}/mcs
+	epatch ${FILESDIR}/${P}-mcs-crasher-fix.diff
+
+	cd ${S}
+
+	# Fix the install path, install into $(libdir)
+	sed -i -e 's:$(prefix)/lib:$(libdir):'                                    \
+		-i -e 's:$(exec_prefix)/lib:$(libdir):'                               \
+		-i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
+		${S}/{scripts,mono/metadata}/Makefile.am ${S}/configure.in            \
+	|| die "sed failed"
+
+	sed -i -e 's:^libdir.*:libdir=@libdir@:'                                  \
+		-i -e 's:${prefix}/lib/:${libdir}/:g'                                 \
+		${S}/{scripts,}/*.pc.in                                               \
+	|| die "sed failed"
+
+	# Remove dummy ltconfig and let libtool handle it
+	rm -f ${S}/libgc/ltconfig
+
+	eautoreconf
+}
+
+src_compile() {
+	# mono's build system is finiky, strip the flags
+	strip-flags
+
+	# Enable the 2.0 FX, use the system glib and the gc
+	local myconf="--with-preview=yes --with-glib=system --with-gc=included"
+
+	# Threading support
+	if use amd64 ; then
+		# force __thread on amd64 (bug #83770)
+		myconf="${myconf} --with-tls=__thread"
+	else
+		if use nptl ; then
+			myconf="${myconf} --with-tls=__thread"
+		else
+			myconf="${myconf} --with-tls=pthread"
+		fi
+	fi
+
+	# Enable large heaps if memory is more than >=3GB
+	if [[ $(get-memory-total) -ge 3145728 ]] ; then
+		myconf="${myconf} --with-large-heap=yes"
+	fi
+
+	# Force the use of monolite mcs to prevent issues with classlibs (bug #118062)
+	touch ${S}/mcs/build/deps/use-monolite
+
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	docinto docs
+	dodoc docs/*
+
+	docinto libgc
+	dodoc libgc/ChangeLog
+}