Fix for NPTL when using gcc-3.4, and fix the LICENSE syntax.

15 files changed, 62 insertions, 36 deletions

diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog
index 2f0f2d012b6d..9e75faf4c6db 100644
--- a/dev-dotnet/mono/ChangeLog
+++ b/dev-dotnet/mono/ChangeLog
@@ -1,6 +1,14 @@
 # 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.32 2004/09/23 14:38:52 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.33 2004/10/29 17:08:48 latexer Exp $
+
+  29 Oct 2004; <peter@gentoo.org> mono-0.28.ebuild, mono-0.30.1.ebuild,
+  mono-0.30.ebuild, mono-0.31.ebuild, mono-0.91.ebuild, mono-0.95.ebuild,
+  mono-0.96.ebuild, mono-0.97.ebuild, mono-1.0.1-r1.ebuild,
+  mono-1.0.1-r2.ebuild, mono-1.0.1.ebuild, mono-1.0.2-r1.ebuild,
+  mono-1.0.2.ebuild, mono-1.0.ebuild:
+  Change the masked mono to include a fix for NPTL systems available for
+  gcc-3.4. Please test. Also fixed the LICENSE syntax.
 
   23 Sep 2004; <peter@gentoo.org> mono-1.0.2.ebuild:
   Fix a small typo.
diff --git a/dev-dotnet/mono/mono-0.28.ebuild b/dev-dotnet/mono/mono-0.28.ebuild
index e3b4703727c2..535e0528e532 100644
--- a/dev-dotnet/mono/mono-0.28.ebuild
+++ b/dev-dotnet/mono/mono-0.28.ebuild
@@ -1,6 +1,6 @@
 # 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-0.28.ebuild,v 1.5 2004/06/29 14:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.28.ebuild,v 1.6 2004/10/29 17:08:48 latexer Exp $
 
 inherit mono
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz
 	http://www.go-mono.com/archive/${MCS_P}.tar.gz"
 
-LICENSE="GPL-2 LGPL-2 X11"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="x86 -ppc"
 IUSE=""
diff --git a/dev-dotnet/mono/mono-0.30.1.ebuild b/dev-dotnet/mono/mono-0.30.1.ebuild
index ad26fbac8b68..f3e192d1d2bc 100644
--- a/dev-dotnet/mono/mono-0.30.1.ebuild
+++ b/dev-dotnet/mono/mono-0.30.1.ebuild
@@ -1,6 +1,6 @@
 # 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-0.30.1.ebuild,v 1.3 2004/06/29 14:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.30.1.ebuild,v 1.4 2004/10/29 17:08:48 latexer Exp $
 
 inherit mono flag-o-matic
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz
 	http://www.go-mono.com/archive/${MCS_P}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2 | X11"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 -ppc"
 IUSE=""
diff --git a/dev-dotnet/mono/mono-0.30.ebuild b/dev-dotnet/mono/mono-0.30.ebuild
index 311293a816d2..778d95600394 100644
--- a/dev-dotnet/mono/mono-0.30.ebuild
+++ b/dev-dotnet/mono/mono-0.30.ebuild
@@ -1,6 +1,6 @@
 # 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-0.30.ebuild,v 1.3 2004/06/29 14:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.30.ebuild,v 1.4 2004/10/29 17:08:48 latexer Exp $
 
 inherit mono flag-o-matic
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz
 	http://www.go-mono.com/archive/${MCS_P}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2 | X11"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 -ppc"
 IUSE=""
diff --git a/dev-dotnet/mono/mono-0.31.ebuild b/dev-dotnet/mono/mono-0.31.ebuild
index 8586a6d09d47..1b4dca9b3b1e 100644
--- a/dev-dotnet/mono/mono-0.31.ebuild
+++ b/dev-dotnet/mono/mono-0.31.ebuild
@@ -1,6 +1,6 @@
 # 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-0.31.ebuild,v 1.6 2004/06/29 14:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.31.ebuild,v 1.7 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/${P}.tar.gz
 	http://www.go-mono.com/archive/${MCS_P}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2 | X11"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 -ppc"
 IUSE="nptl"
diff --git a/dev-dotnet/mono/mono-0.91.ebuild b/dev-dotnet/mono/mono-0.91.ebuild
index 9c2d29393971..cb3b9ffb55dd 100644
--- a/dev-dotnet/mono/mono-0.91.ebuild
+++ b/dev-dotnet/mono/mono-0.91.ebuild
@@ -1,6 +1,6 @@
 # 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-0.91.ebuild,v 1.7 2004/06/29 14:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.91.ebuild,v 1.8 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -11,7 +11,7 @@ DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/beta1/${P}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2 | X11"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"
diff --git a/dev-dotnet/mono/mono-0.95.ebuild b/dev-dotnet/mono/mono-0.95.ebuild
index 13cb5affa7dc..491fb9079f7e 100644
--- a/dev-dotnet/mono/mono-0.95.ebuild
+++ b/dev-dotnet/mono/mono-0.95.ebuild
@@ -1,6 +1,6 @@
 # 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-0.95.ebuild,v 1.6 2004/06/29 14:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.95.ebuild,v 1.7 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/beta2/${P}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2 | X11"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"
diff --git a/dev-dotnet/mono/mono-0.96.ebuild b/dev-dotnet/mono/mono-0.96.ebuild
index 00e692494433..eb93b888ef06 100644
--- a/dev-dotnet/mono/mono-0.96.ebuild
+++ b/dev-dotnet/mono/mono-0.96.ebuild
@@ -1,6 +1,6 @@
 # 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-0.96.ebuild,v 1.3 2004/06/29 14:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.96.ebuild,v 1.4 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/beta3/${P}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2 | X11"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"
diff --git a/dev-dotnet/mono/mono-0.97.ebuild b/dev-dotnet/mono/mono-0.97.ebuild
index a38d0efaeea5..928f3029c322 100644
--- a/dev-dotnet/mono/mono-0.97.ebuild
+++ b/dev-dotnet/mono/mono-0.97.ebuild
@@ -1,6 +1,6 @@
 # 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-0.97.ebuild,v 1.4 2004/06/29 17:08:56 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-0.97.ebuild,v 1.5 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com/"
 SRC_URI="http://www.go-mono.com/archive/rc/${P}.tar.gz"
 
-LICENSE="GPL-2 | LGPL-2 | X11"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"
diff --git a/dev-dotnet/mono/mono-1.0.1-r1.ebuild b/dev-dotnet/mono/mono-1.0.1-r1.ebuild
index 5d2f4ce73994..7a83392354be 100644
--- a/dev-dotnet/mono/mono-1.0.1-r1.ebuild
+++ b/dev-dotnet/mono/mono-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2004/08/18 18:55:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.1-r1.ebuild,v 1.4 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -8,7 +8,7 @@ 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"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"
diff --git a/dev-dotnet/mono/mono-1.0.1-r2.ebuild b/dev-dotnet/mono/mono-1.0.1-r2.ebuild
index e1f2b1bbff2e..e30e49c5bd44 100644
--- a/dev-dotnet/mono/mono-1.0.1-r2.ebuild
+++ b/dev-dotnet/mono/mono-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.1-r2.ebuild,v 1.2 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -8,7 +8,7 @@ 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"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"
diff --git a/dev-dotnet/mono/mono-1.0.1.ebuild b/dev-dotnet/mono/mono-1.0.1.ebuild
index 887cf8a32770..c9b6a01025cd 100644
--- a/dev-dotnet/mono/mono-1.0.1.ebuild
+++ b/dev-dotnet/mono/mono-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2004/08/06 00:47:53 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.1.ebuild,v 1.2 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -8,7 +8,7 @@ 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"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"
diff --git a/dev-dotnet/mono/mono-1.0.2-r1.ebuild b/dev-dotnet/mono/mono-1.0.2-r1.ebuild
index 250af99ff42d..d3b7a9a78ab4 100644
--- a/dev-dotnet/mono/mono-1.0.2-r1.ebuild
+++ b/dev-dotnet/mono/mono-1.0.2-r1.ebuild
@@ -1,14 +1,14 @@
 # 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.2-r1.ebuild,v 1.1 2004/09/22 14:35:44 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.2-r1.ebuild,v 1.2 2004/10/29 17:08:48 latexer Exp $
 
-inherit eutils mono flag-o-matic debug
+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"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"
@@ -17,8 +17,12 @@ 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 )"
+	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"
@@ -29,11 +33,25 @@ src_compile() {
 	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"
+		# 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
 
diff --git a/dev-dotnet/mono/mono-1.0.2.ebuild b/dev-dotnet/mono/mono-1.0.2.ebuild
index 00acec30325f..79d69722cbae 100644
--- a/dev-dotnet/mono/mono-1.0.2.ebuild
+++ b/dev-dotnet/mono/mono-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2004/09/23 14:38:52 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.2.ebuild,v 1.3 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -8,7 +8,7 @@ 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"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
diff --git a/dev-dotnet/mono/mono-1.0.ebuild b/dev-dotnet/mono/mono-1.0.ebuild
index f7eeddbc7d57..0fb86fc6e0e8 100644
--- a/dev-dotnet/mono/mono-1.0.ebuild
+++ b/dev-dotnet/mono/mono-1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2004/07/10 06:05:17 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.ebuild,v 1.3 2004/10/29 17:08:48 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -8,7 +8,7 @@ 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"
+LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="nptl"