have_NPTL is going the way of the dodo.

Package-Manager: portage-2.0.51.21-r1

9 files changed, 28 insertions, 37 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 7624107da1e4..1e1d549003d1 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.44 2005/05/06 14:28:48 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.45 2005/05/13 00:29:15 latexer Exp $
+
+  13 May 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r5.ebuild,
+  mono-1.0.6.ebuild, mono-1.1.4.ebuild, mono-1.1.5-r1.ebuild,
+  mono-1.1.6.ebuild, mono-1.1.6-r1.ebuild, mono-1.1.7.ebuild:
+  have_NPTL is going the way of the dodo.
 
   06 May 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.7.ebuild:
   Force tls=__thread on amd64. See bug #83770.
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index bde610f8802c..3bcdbab701ff 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,12 +1,12 @@
-MD5 921a54bac5f3a9e89db2fa1360630a7c mono-1.1.6-r1.ebuild 2393
-MD5 e7ea4829bcf8c5553c4a56e8d31fa896 mono-1.1.5-r1.ebuild 2350
-MD5 c69ad4a401355c5a7f29cb0f2de55ae2 mono-1.0.5-r5.ebuild 3931
-MD5 e4d80474cce3145601e84a16325b3aaa mono-1.0.6.ebuild 3908
-MD5 7df1ece1ffd1bacb0be1d2a46737f42f mono-1.1.4.ebuild 1827
-MD5 fe6279ea5449f9f4067f543dce346af8 mono-1.1.6.ebuild 2314
-MD5 4304231d9b0f43ac5271c5f554304acf ChangeLog 16241
+MD5 bea6063cb98c57485b56620cf44d8fd7 mono-1.1.6-r1.ebuild 2380
+MD5 4e16b52b8c8eefc7a83f3ab7fdf29fe2 mono-1.1.5-r1.ebuild 2337
+MD5 10c58186e6ce0ab643d16c883f2071ff mono-1.0.5-r5.ebuild 3718
+MD5 b9e80f65b4235c829ff1d67b5b1740f8 mono-1.0.6.ebuild 3693
+MD5 ae74f5e6c316dc24e6d030620b55a472 mono-1.1.4.ebuild 1814
+MD5 96f6b6f000e333464d07011f936b9124 mono-1.1.6.ebuild 2301
+MD5 d25827662b31865fb388153dfc564916 ChangeLog 16481
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
-MD5 6541e3b8acc93e616f4dc92caf0936c2 mono-1.1.7.ebuild 2195
+MD5 64ddcfdc8018ae85663194b3628db813 mono-1.1.7.ebuild 2182
 MD5 e8acd8bc997d82f676be5cf2057d3d25 files/dotnet.conf 570
 MD5 6e11372f48bd32e76012be8aae54e594 files/dotnet.init 1031
 MD5 d7752110175a6157ea42e6528c791fbb files/mono-1.1.5-pathfix.diff 648
diff --git a/dev-lang/mono/mono-1.0.5-r5.ebuild b/dev-lang/mono/mono-1.0.5-r5.ebuild
index ea9f36de28f1..53e26af3bae1 100644
--- a/dev-lang/mono/mono-1.0.5-r5.ebuild
+++ b/dev-lang/mono/mono-1.0.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.0.5-r5.ebuild,v 1.3 2005/03/21 19:51:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.0.5-r5.ebuild,v 1.4 2005/05/13 00:29:15 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -68,18 +68,11 @@ src_compile() {
 	strip-flags
 
 	local myconf="--with-sigaltstack=yes"
-	if use nptl && have_NPTL
+	if use 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
 
diff --git a/dev-lang/mono/mono-1.0.6.ebuild b/dev-lang/mono/mono-1.0.6.ebuild
index d7e95e8ea1d6..3b46468a1058 100644
--- a/dev-lang/mono/mono-1.0.6.ebuild
+++ b/dev-lang/mono/mono-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.0.6.ebuild,v 1.1 2005/03/11 03:14:01 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.0.6.ebuild,v 1.2 2005/05/13 00:29:15 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -69,18 +69,11 @@ src_compile() {
 	strip-flags
 
 	local myconf="--with-sigaltstack=yes"
-	if use nptl && have_NPTL
+	if use 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
 
diff --git a/dev-lang/mono/mono-1.1.4.ebuild b/dev-lang/mono/mono-1.1.4.ebuild
index 3a9c6ff68c0a..0c54ae57d4dc 100644
--- a/dev-lang/mono/mono-1.1.4.ebuild
+++ b/dev-lang/mono/mono-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.4.ebuild,v 1.4 2005/04/29 01:59:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.4.ebuild,v 1.5 2005/05/13 00:29:15 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -39,7 +39,7 @@ src_compile() {
 	strip-flags
 	local myconf="--with-sigaltstack=yes --with-preview=yes"
 
-	if use nptl && have_NPTL
+	if use nptl
 	then
 		myconf="${myconf} --with-tls=__thread"
 	else
diff --git a/dev-lang/mono/mono-1.1.5-r1.ebuild b/dev-lang/mono/mono-1.1.5-r1.ebuild
index 9f3cb7755666..ef3636c82bd3 100644
--- a/dev-lang/mono/mono-1.1.5-r1.ebuild
+++ b/dev-lang/mono/mono-1.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5-r1.ebuild,v 1.4 2005/04/29 01:59:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5-r1.ebuild,v 1.5 2005/05/13 00:29:15 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -63,7 +63,7 @@ src_compile() {
 	strip-flags
 	local myconf="--with-preview=yes"
 
-	if use nptl && have_NPTL
+	if use nptl
 	then
 		myconf="${myconf} --with-tls=__thread"
 	else
diff --git a/dev-lang/mono/mono-1.1.6-r1.ebuild b/dev-lang/mono/mono-1.1.6-r1.ebuild
index 6f3a024e0069..3923e63d4054 100644
--- a/dev-lang/mono/mono-1.1.6-r1.ebuild
+++ b/dev-lang/mono/mono-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.6-r1.ebuild,v 1.2 2005/04/29 01:59:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.6-r1.ebuild,v 1.3 2005/05/13 00:29:15 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -65,7 +65,7 @@ src_compile() {
 	strip-flags
 	local myconf="--with-preview=yes"
 
-	if use nptl && have_NPTL
+	if use nptl
 	then
 		myconf="${myconf} --with-tls=__thread"
 	else
diff --git a/dev-lang/mono/mono-1.1.6.ebuild b/dev-lang/mono/mono-1.1.6.ebuild
index 7604a88b02e1..0e00a1986c0c 100644
--- a/dev-lang/mono/mono-1.1.6.ebuild
+++ b/dev-lang/mono/mono-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.6.ebuild,v 1.3 2005/04/29 01:59:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.6.ebuild,v 1.4 2005/05/13 00:29:15 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -62,7 +62,7 @@ src_compile() {
 	strip-flags
 	local myconf="--with-preview=yes"
 
-	if use nptl && have_NPTL
+	if use nptl
 	then
 		myconf="${myconf} --with-tls=__thread"
 	else
diff --git a/dev-lang/mono/mono-1.1.7.ebuild b/dev-lang/mono/mono-1.1.7.ebuild
index dc1a6cd7819f..d061c9a6516c 100644
--- a/dev-lang/mono/mono-1.1.7.ebuild
+++ b/dev-lang/mono/mono-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.7.ebuild,v 1.2 2005/05/06 14:28:48 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.7.ebuild,v 1.3 2005/05/13 00:29:15 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -59,7 +59,7 @@ src_compile() {
 	then
 		myconf="${myconf} --with-tls=__thread"
 	else
-		if use nptl && have_NPTL
+		if use nptl
 		then
 			myconf="${myconf} --with-tls=__thread"
 		else