Bump, and add autotools related fixes from Diego in bug #125949

(Portage version: 2.1_pre6-r1)

9 files changed, 154 insertions, 38 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index a9e797166c94..1bd788441b5c 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # 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.75 2006/02/20 02:29:02 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.76 2006/03/15 05:26:35 latexer Exp $
+
+*mono-1.1.13.4 (15 Mar 2006)
+
+  15 Mar 2006; Peter Johanson <latexer@gentoo.org> mono-1.1.8.3.ebuild,
+  mono-1.1.12.1-r1.ebuild, mono-1.1.13.1.ebuild, mono-1.1.13.2.ebuild,
+  +mono-1.1.13.4.ebuild:
+  Bump, and add autotools related fixes from Diego in bug #125949
 
 *mono-1.1.13.2 (20 Feb 2006)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 9cbd4c95f669..c6d286616f5f 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -7,12 +7,15 @@ SHA256 ee145119eba6c73ccac97f08b9809fd03c8a7a9d0b3ee34c02eb0946fc5a0bf3 files/di
 MD5 5710fbd5e73458a082d829efe0df479b files/digest-mono-1.1.12.1-r1 247
 RMD160 5ee360e154e563a264fac464c9fb7cb4fbe9cbda files/digest-mono-1.1.12.1-r1 247
 SHA256 310c5adc5635dc92f84051b7623a363e2bf83cd97e1a0cb7224a0ca700a732f8 files/digest-mono-1.1.12.1-r1 247
-MD5 0d121adaeeb4d5b9909c77e26d593cf7 files/digest-mono-1.1.13.1 67
-RMD160 fb315a94987c9595fb2504989ea12649a2611103 files/digest-mono-1.1.13.1 67
-SHA256 4ee46c78ba61f4384efaeb2dadb261c6ced55935ba2ffa7ba2e89b8cbfbb72f1 files/digest-mono-1.1.13.1 67
+MD5 841faeaa62401a6437e4c1e32fd5ba79 files/digest-mono-1.1.13.1 247
+RMD160 76fada3d2cd925bfc2c325b1a362aced22d82dfa files/digest-mono-1.1.13.1 247
+SHA256 ce9d87117b9d3602a095d05644e107269e457c5f2e8117018391826332ec3c1a files/digest-mono-1.1.13.1 247
 MD5 9356a5ffa7403e953fe309126d44cbb4 files/digest-mono-1.1.13.2 247
 RMD160 d4797742d6ce6392f0fcf6a69ca773d2410c16d6 files/digest-mono-1.1.13.2 247
 SHA256 c30b889a492f2bab7fd85c61cc056b3a77cc7546730ed763ed0ccabf4309c4a8 files/digest-mono-1.1.13.2 247
+MD5 09f9a3fa545438bad7f2693d0a4d4cf3 files/digest-mono-1.1.13.4 247
+RMD160 172b4fd11743f08aa3f7083c2d22678af0dd2306 files/digest-mono-1.1.13.4 247
+SHA256 ec5554edf5709037f063f10fc4ea56eef5421f7f5c0067f31f74d6a3b482fa01 files/digest-mono-1.1.13.4 247
 MD5 e57f70fb8569f040ed1b4669c3e07652 files/digest-mono-1.1.8.3 66
 RMD160 813629ecd598eface69389f5da09fa8387a7f54c files/digest-mono-1.1.8.3 66
 SHA256 7df3eb46a3e2cf65fc4d5e3afd3dfbfcea9dbc93e65e1d3f2cf2bc50fa0dc739 files/digest-mono-1.1.8.3 66
@@ -64,15 +67,18 @@ SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909 metadata
 MD5 d4ad74a81ac4b6d1f6c76f5527fe39f3 mono-1.0.5-r5.ebuild 3719
 RMD160 b7e162c6daf0139834bba35b1cd39eec1da66569 mono-1.0.5-r5.ebuild 3719
 SHA256 18ed8d8b04c0d0c05d96e89d21edb842fca1343bbae52e4ae7e893812ead262b mono-1.0.5-r5.ebuild 3719
-MD5 25407f82a4ff3dc9b35ea979b25bf211 mono-1.1.12.1-r1.ebuild 2630
-RMD160 6977ddc8d1d2b2e44c0aaa67064cf32940d10561 mono-1.1.12.1-r1.ebuild 2630
-SHA256 2d75cfa3bc36dcc28c238f04df57850b1fe60ea1b0fe190d015d17e288084aef mono-1.1.12.1-r1.ebuild 2630
-MD5 bf675399c158f1c6c3d0e008c3828e04 mono-1.1.13.1.ebuild 2628
-RMD160 2a42964a2bee5b2b5ec9f43c465bb9605c317482 mono-1.1.13.1.ebuild 2628
-SHA256 2c564b78402ac8e631ce8e76f501fae51c7aa732f55ea76bd0e74d75ed92d8fd mono-1.1.13.1.ebuild 2628
-MD5 8f8cd0857a1cb5b24872d907fcf02193 mono-1.1.13.2.ebuild 2628
-RMD160 58b3ef412a09618ee07d9389177a0b51473d8d13 mono-1.1.13.2.ebuild 2628
-SHA256 72e922243859ce2c6d17cd80e3d60be5487ff1a4c6cb0d64ed179be13251e5e2 mono-1.1.13.2.ebuild 2628
-MD5 d37f097bccd084e2ab9ae39ea0048cdf mono-1.1.8.3.ebuild 2504
-RMD160 de2b3b4fa7e236386897d6b7a6b6a88e63ca1376 mono-1.1.8.3.ebuild 2504
-SHA256 c4a5a89213ee5a75072dbdf0faec4a7160a994bbd622460e3235430fbd971540 mono-1.1.8.3.ebuild 2504
+MD5 e295dd19e18c0c78d986714370291eb3 mono-1.1.12.1-r1.ebuild 2616
+RMD160 70713543aa4b42d6b99712f5aa4eaf550f1cefaf mono-1.1.12.1-r1.ebuild 2616
+SHA256 bb8c77c6fed60cb62008678e98a7cb69170f48230790ddab6b4cd1a9883615c7 mono-1.1.12.1-r1.ebuild 2616
+MD5 d43ba89c204164dec5b84b5815be6fb6 mono-1.1.13.1.ebuild 2595
+RMD160 99508de1279c1743617e06d6463f85dc8593eeed mono-1.1.13.1.ebuild 2595
+SHA256 1ff83197e6856d05601d7cdb54c1e98c5d554db00fcd3ac595073f314dddea89 mono-1.1.13.1.ebuild 2595
+MD5 d43ba89c204164dec5b84b5815be6fb6 mono-1.1.13.2.ebuild 2595
+RMD160 99508de1279c1743617e06d6463f85dc8593eeed mono-1.1.13.2.ebuild 2595
+SHA256 1ff83197e6856d05601d7cdb54c1e98c5d554db00fcd3ac595073f314dddea89 mono-1.1.13.2.ebuild 2595
+MD5 d43ba89c204164dec5b84b5815be6fb6 mono-1.1.13.4.ebuild 2595
+RMD160 99508de1279c1743617e06d6463f85dc8593eeed mono-1.1.13.4.ebuild 2595
+SHA256 1ff83197e6856d05601d7cdb54c1e98c5d554db00fcd3ac595073f314dddea89 mono-1.1.13.4.ebuild 2595
+MD5 9c8932b8a97930ce2615ba31a3d52af0 mono-1.1.8.3.ebuild 2490
+RMD160 a69c0bb814c597333dfad410c3bd18585c50de88 mono-1.1.8.3.ebuild 2490
+SHA256 c28abf581370d40e008623c2a4492e7ea54f0e5872eec1425fea682796a7a5cd mono-1.1.8.3.ebuild 2490
diff --git a/dev-lang/mono/files/digest-mono-1.1.13.1 b/dev-lang/mono/files/digest-mono-1.1.13.1
index baae124626b5..0d79fc6a5faf 100644
--- a/dev-lang/mono/files/digest-mono-1.1.13.1
+++ b/dev-lang/mono/files/digest-mono-1.1.13.1
@@ -1 +1,3 @@
 MD5 b019e29082aa49267320c3993efcc385 mono-1.1.13.1.tar.gz 17989571
+RMD160 415e958674bed0b5feb380809bcfb85e14617f97 mono-1.1.13.1.tar.gz 17989571
+SHA256 79b757e744cc19fd02ed74a51ffaca16d4b4f7124da43a845c99200c0e3868df mono-1.1.13.1.tar.gz 17989571
diff --git a/dev-lang/mono/files/digest-mono-1.1.13.4 b/dev-lang/mono/files/digest-mono-1.1.13.4
new file mode 100644
index 000000000000..f9ac15b454bb
--- /dev/null
+++ b/dev-lang/mono/files/digest-mono-1.1.13.4
@@ -0,0 +1,3 @@
+MD5 a8c58b1d0722771745c228adbb27f3c1 mono-1.1.13.4.tar.gz 18107270
+RMD160 761b3df0be4552e4d8e67f0e6cef6e7c9b3dc9b3 mono-1.1.13.4.tar.gz 18107270
+SHA256 203e4a93001207eed2463f12d024415a0f6c314eb6ba4f9835cae6eb777d4a6e mono-1.1.13.4.tar.gz 18107270
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 adf4f96dc0d3..efbdaaecad14 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.3 2006/02/20 01:33:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.12.1-r1.ebuild,v 1.4 2006/03/15 05:26:35 latexer Exp $
 
 inherit eutils mono flag-o-matic multilib
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl X"
 
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
+DEPEND=">=dev-libs/glib-2.0
 	sys-devel/bc
 	!<dev-dotnet/pnet-0.6.12
 	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
diff --git a/dev-lang/mono/mono-1.1.13.1.ebuild b/dev-lang/mono/mono-1.1.13.1.ebuild
index c1ca39c63555..b610d0a94faf 100644
--- a/dev-lang/mono/mono-1.1.13.1.ebuild
+++ b/dev-lang/mono/mono-1.1.13.1.ebuild
@@ -1,8 +1,10 @@
 # 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.4 2006/02/20 01:33:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.13.1.ebuild,v 1.5 2006/03/15 05:26:35 latexer Exp $
 
-inherit eutils mono flag-o-matic multilib
+inherit eutils mono flag-o-matic multilib autotools
+
+RESTRICT="confcache"
 
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com/"
@@ -13,8 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl X"
 
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
+DEPEND=">=dev-libs/glib-2.0
 	sys-devel/bc
 	!<dev-dotnet/pnet-0.6.12
 	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
@@ -48,10 +49,10 @@ src_unpack() {
 			${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"
+	# Remove the dummy ltconfig and leave to libtoolize handling it
+	rm -f ${S}/libgc/ltconfig
+
+	eautoreconf
 }
 
 src_compile() {
diff --git a/dev-lang/mono/mono-1.1.13.2.ebuild b/dev-lang/mono/mono-1.1.13.2.ebuild
index f25058eb93cb..06f91f7d8e60 100644
--- a/dev-lang/mono/mono-1.1.13.2.ebuild
+++ b/dev-lang/mono/mono-1.1.13.2.ebuild
@@ -1,8 +1,10 @@
 # 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.2.ebuild,v 1.1 2006/02/20 02:29:02 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.13.2.ebuild,v 1.2 2006/03/15 05:26:35 latexer Exp $
 
-inherit eutils mono flag-o-matic multilib
+inherit eutils mono flag-o-matic multilib autotools
+
+RESTRICT="confcache"
 
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com/"
@@ -13,8 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl X"
 
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
+DEPEND=">=dev-libs/glib-2.0
 	sys-devel/bc
 	!<dev-dotnet/pnet-0.6.12
 	nptl? ( >=sys-devel/gcc-3.3.5-r1 )
@@ -48,10 +49,10 @@ src_unpack() {
 			${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"
+	# Remove the dummy ltconfig and leave to libtoolize handling it
+	rm -f ${S}/libgc/ltconfig
+
+	eautoreconf
 }
 
 src_compile() {
diff --git a/dev-lang/mono/mono-1.1.13.4.ebuild b/dev-lang/mono/mono-1.1.13.4.ebuild
new file mode 100644
index 000000000000..1b3888c2fce0
--- /dev/null
+++ b/dev-lang/mono/mono-1.1.13.4.ebuild
@@ -0,0 +1,98 @@
+# 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.4.ebuild,v 1.1 2006/03/15 05:26:35 latexer Exp $
+
+inherit eutils mono flag-o-matic multilib autotools
+
+RESTRICT="confcache"
+
+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=">=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.13 )
+	dev-util/pkgconfig
+	dev-libs/libxml2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix munging of Unix paths
+	epatch ${FILESDIR}/${PN}-1.1.13-pathfix.diff
+	epatch ${FILESDIR}/${PN}-1.1.13-resource-manager.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@:' \
+			-e 's:${prefix}/lib/:${libdir}/:g' \
+			${S}/{scripts,}/*.pc.in || die "sed failed"
+	fi
+
+	# Remove the dummy ltconfig and leave to libtoolize handling it
+	rm -f ${S}/libgc/ltconfig
+
+	eautoreconf
+}
+
+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
+
+	# 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"
+}
+
+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.8.3.ebuild b/dev-lang/mono/mono-1.1.8.3.ebuild
index 32d01a32e4c6..95db924f1913 100644
--- a/dev-lang/mono/mono-1.1.8.3.ebuild
+++ b/dev-lang/mono/mono-1.1.8.3.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.8.3.ebuild,v 1.7 2006/01/22 09:50:13 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.8.3.ebuild,v 1.8 2006/03/15 05:26:35 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="nptl icu X"
 
-DEPEND="virtual/libc
-	>=dev-libs/glib-2.0
+DEPEND=">=dev-libs/glib-2.0
 	sys-devel/bc
 	!<dev-dotnet/pnet-0.6.12
 	nptl? ( >=sys-devel/gcc-3.3.5-r1 )