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

diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog
index 2f0f2d012b6de3059664e8b13e13398f1b156355..9e75faf4c6dba31471a853aab401abaacb7d8a71 100644 (file)
--- 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/Manifest b/dev-dotnet/mono/Manifest
index 5a1580ebfa1d7faa939a0a4ae3a4ee8457475be6..6fc1291a4ce167616cbe884516455561c37744b2 100644 (file)
--- a/dev-dotnet/mono/Manifest
+++ b/dev-dotnet/mono/Manifest
@@ -1,18 +1,18 @@
-MD5 de817ad14d90fef65c03391539be73ec mono-1.0.2.ebuild 1713
-MD5 7f623e3d72ea41ebb83e53f79fc5a537 mono-1.0.1-r1.ebuild 1732
-MD5 f7e22e6411bbcd37bf830d576b10e66a mono-0.96.ebuild 1557
-MD5 320ce3e4c19a4e80c41ee9400a39f23c mono-0.30.ebuild 2392
-MD5 0569a7578a0082a433223c7dad460a6e mono-0.91.ebuild 1661
-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 91a95e0164303af03ef0a2e0596c6087 mono-1.0.2-r1.ebuild 1678
-MD5 69116891173f6b0bf05e60e992cc86ec ChangeLog 9259
-MD5 17c5779bfef6d1e1415ec71550d175ea mono-1.0.ebuild 1656
+MD5 79d9a2421c3661e23289dd94b0a379ba mono-1.0.2.ebuild 1715
+MD5 0328c1f3926b56cbd653e0c453901122 mono-1.0.1-r1.ebuild 1734
+MD5 fd4714e0bb891037632920b15e7af092 mono-0.96.ebuild 1560
+MD5 a9c0950d998a9c703fa103dad6ca0852 mono-0.30.ebuild 2395
+MD5 bf1cb54e6b1538a8b171acc7c22e3960 mono-0.91.ebuild 1664
+MD5 89cb74a4e734de56f04e2ab38772fdfb mono-0.30.1.ebuild 2397
+MD5 5d0b32410408e9e4f2418dc17eaaacb4 mono-0.28.ebuild 2100
+MD5 b92843896a3417a8aa46a8638c029cdb mono-1.0.1.ebuild 1480
+MD5 271befb09aa1c005b1ea442f98c760b8 mono-0.95.ebuild 1560
+MD5 c2d21e85729c9e588425689c41ef999e mono-1.0.1-r2.ebuild 1680
+MD5 132ee0ae420e55ffa4ee8453013cb0d3 mono-0.97.ebuild 1786
+MD5 ad2ef8ace1f00cd69b9d393cc4686470 mono-0.31.ebuild 2549
+MD5 7e241ab7225841b6eaecdc13b9e388c0 mono-1.0.2-r1.ebuild 2105
+MD5 7ad705211b8f841a74ac280af5f61aa3 ChangeLog 9697
+MD5 936c1600c91761a4774629267f6dda20 mono-1.0.ebuild 1658
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 9f4b4eb6a1555ed574dbdd359cae3070 files/dotnet.conf 573
 MD5 f33c78b627cbbc1db2ab5f6cc5299e70 files/dotnet.init 1034

diff --git a/dev-dotnet/mono/mono-0.28.ebuild b/dev-dotnet/mono/mono-0.28.ebuild
index e3b4703727c250950ff0c95f3585e800704a179b..535e0528e532fbee96acfe179b453b0459f4b3f7 100644 (file)
--- 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 ad26fbac8b6800eefe30ebb6ebe1482202ad2b54..f3e192d1d2bc7bcffa30ab0356836a6d064c3452 100644 (file)
--- 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 311293a816d2108d086f3831e612ba7e7243303d..778d95600394ff83d02624aa4d8cce71b4a28d94 100644 (file)
--- 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 8586a6d09d47d4b4bd00d532932fb7d3aab12c52..1b4dca9b3b1ef16508d4e2f84b8092aa9582d17e 100644 (file)
--- 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 9c2d29393971cc70fe391ec37158536ecfc049a3..cb3b9ffb55dd74022f82e2bb97388acd0cf6d867 100644 (file)
--- 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 13cb5affa7dc2c7be153f9a789458fcbeaba2503..491fb9079f7eaf8e5d203b2eb7682574d3312d20 100644 (file)
--- 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 00e692494433de1ebd2673941f47c3a9ef43921a..eb93b888ef06c4350a057ce7ac7eacd4149afaf1 100644 (file)
--- 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 a38d0efaeea57bab8703d1d8db9df1a6ed713f98..928f3029c322a17cfc7b5f7589a0ff8cc9ad3a02 100644 (file)
--- 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 5d2f4ce739940ab2604b9334820c76b2b93fc348..7a83392354be84924edea62ccf670b9cafeed96b 100644 (file)
--- 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 e1f2b1bbff2e53ef18bfee7e4f07b3fcc1bb0e7e..e30e49c5bd44aa88aebdd62e90d2f0abf8dd1dac 100644 (file)
--- 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 887cf8a327708fbc29a1740837665dd14f6e7f79..c9b6a01025cded47080b383b50868f9a76f4fda7 100644 (file)
--- 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 250af99ff42d1057b08675f69ece6963c81618c7..d3b7a9a78ab42242193c3a7a0e81b1f61f80c36f 100644 (file)
--- 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 00acec30325f6de775050772da36b443d5263904..79d69722cbae4110599a760f4f427a8e30dbc266 100644 (file)
--- 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 f7eeddbc7d57a16876f68d433bb3a0aecbbb99fd..0fb86fc6e0e8d940e40a8072f6694c50c1fd0a5c 100644 (file)
--- 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"