Replace built_with_use (bug #286961), go EAPI=2 compliant.

Package-Manager: portage-2.2_rc44/cvs/Linux i686

19 files changed, 150 insertions, 104 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 38b024176dd1..5c4928a7d1dd 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.174 2009/09/27 11:15:17 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.175 2009/10/06 16:58:13 jer Exp $
+
+  06 Oct 2009; Jeroen Roovers <jer@gentoo.org>
+  nvidia-drivers-71.86.09.ebuild, nvidia-drivers-71.86.11.ebuild,
+  nvidia-drivers-96.43.09.ebuild, nvidia-drivers-96.43.11.ebuild,
+  nvidia-drivers-96.43.13.ebuild, nvidia-drivers-173.14.15.ebuild,
+  nvidia-drivers-173.14.18.ebuild, nvidia-drivers-173.14.20.ebuild,
+  nvidia-drivers-180.29.ebuild, nvidia-drivers-180.60.ebuild,
+  nvidia-drivers-185.18.14.ebuild, nvidia-drivers-185.18.29.ebuild,
+  nvidia-drivers-185.18.31.ebuild, nvidia-drivers-190.18.ebuild,
+  nvidia-drivers-190.25.ebuild, nvidia-drivers-190.32.ebuild,
+  nvidia-drivers-190.36.ebuild:
+  Replace built_with_use (bug #286961), go EAPI=2 compliant.
 
 *nvidia-drivers-190.36 (27 Sep 2009)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d920f5b750a6..d175bf5ad02a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -57,22 +57,22 @@ DIST NVIDIA-Linux-x86_64-71.86.11-pkg2.run 8390675 RMD160 5ce5f01f70901e9fa711d1
 DIST NVIDIA-Linux-x86_64-96.43.09-pkg2.run 10940888 RMD160 9dfb6264fdd932cb8dd45a6738207593080e67a8 SHA1 6e3061afa0d8424c86a4ebd86e0505233fd4c3a6 SHA256 e5fc926178231a2c4677dc007358e79ebcbdb2ce0def4ec4cc9d5732f3000d54
 DIST NVIDIA-Linux-x86_64-96.43.11-pkg2.run 11586549 RMD160 80fb00aa2e21d720750a590b521d88fd54d70f7e SHA1 3a3103319b184af04341da877049584f4db52130 SHA256 67e67dba8d307c951e5060df68a25bf71b20e77d7b48a9ff1be060258004ac21
 DIST NVIDIA-Linux-x86_64-96.43.13-pkg2.run 11589938 RMD160 a0e67350b951ad7020eda7cb6db9582325224739 SHA1 20a2a09e1f2083f0967e60f71faeb680f5bca5f4 SHA256 dccc366a876ed9243354958f1f090279c6ec4f61f7240b1d7cdca572aad5f332
-EBUILD nvidia-drivers-173.14.15.ebuild 14974 RMD160 3cf0d9202efa62ffbebcfa9f1be4b7309bdb9bd8 SHA1 850f85548989d33ee3070ed6a3fea99b8f5d4311 SHA256 634f44e53daef08e20df726d224983bcd2eea1600c96dd0f8350d23d9785606a
-EBUILD nvidia-drivers-173.14.18.ebuild 14988 RMD160 da23bfb8562285e8ddb7ffa219dfdd869c350a74 SHA1 f60602a91a25f4f599856958cbaa7a415c9ca28e SHA256 091bbd174dbd4a63bc655ba23a31e31bc332970fbc231f74e93a6378211396f3
-EBUILD nvidia-drivers-173.14.20.ebuild 14988 RMD160 fe14422c61f1ccc996fd075a751e5f77724e74d9 SHA1 fdbdb2a3feac1daf7fff3067e9bdbac488d59ce9 SHA256 d9891c6bb11b8a8733f3746c02f954d186dde008b3b0926aec4a09c05b137372
-EBUILD nvidia-drivers-180.29.ebuild 14871 RMD160 14c7b5ccc7fc7ad1035e1e1d6171f4287bdd795c SHA1 8acac0df5bcbeec8e191b060aa6fbdba4140886a SHA256 53db1d3fda12a082e9a2d73c4092b1f191e183b6d9d7a459eedc95b74eba6574
-EBUILD nvidia-drivers-180.60.ebuild 16551 RMD160 fbc167313887852e25eb1a73d3393a0549bcaaee SHA1 33b04e5e206ca699445220f3b1d9251bb3ad9e8b SHA256 8d022a71492227914be379964a6e45e7aa0f3fe23f39deb9ac7adc111d9072f9
-EBUILD nvidia-drivers-185.18.14.ebuild 16326 RMD160 5a648836d149339036a30ead564a613115603357 SHA1 36333162c777b4e581cc2933679a0b51dfadb0aa SHA256 881dbf6ca485122a07c36b3ee2815ba3c66dc7be02d80ff76ff5be4481184ba3
-EBUILD nvidia-drivers-185.18.29.ebuild 16848 RMD160 663b782ed23d9bcf25d444c743023350081f7e57 SHA1 d8d7978ced932d06058425a87bc190a626f90d63 SHA256 306a83c27c2ecadbdf187bea5813feab62567eff61d66034eb0dbde7320bac0e
-EBUILD nvidia-drivers-185.18.31.ebuild 17089 RMD160 f505126c0cf5ca4bdf6ec55cb82220457b6d72df SHA1 261bac63f262fd03980ada3d0ebf62da23b49501 SHA256 ecf0b6ccc573fddf8395a0fd8d2ca1d12daf0585f1677255aa5e09f5ccf93d67
-EBUILD nvidia-drivers-190.18.ebuild 16323 RMD160 04c3652de439f9d30554a4e402422d0c4c3b33ee SHA1 863411ca27a0700cdeb9ac7aebbba7c647d5d1d6 SHA256 244872967960e1a71a43073357362e7697d16225f18d5d422d03a6e75f41c32c
-EBUILD nvidia-drivers-190.25.ebuild 16322 RMD160 ed260b5504248c6403b55bba388a040521da7911 SHA1 39624eb75105bea4e1eb8905244cf092e8050952 SHA256 ae8340d3b1389cd6ff4894f9b4bf902cb82bad50dfc693685ee6ae7b1bebce05
-EBUILD nvidia-drivers-190.32.ebuild 17847 RMD160 5c148dd6a7819ca716c6b764d6d789ddaecf27e5 SHA1 30b2b9749957d361a48492845d925e7092d4c1fe SHA256 7432d1b5da702b0c0038411f1023990a9942610fb57e89245716561ba11d8d69
-EBUILD nvidia-drivers-190.36.ebuild 17847 RMD160 c412cee3b291155bc5283f9dc5cb95ac18379f8e SHA1 ccbf9fa4fd5d3d181e7c2a145fc60fd404fc65dc SHA256 a997f92ed2aee668620baa253af94ee9bb4be95b18fa847f09f493235ebc9188
-EBUILD nvidia-drivers-71.86.09.ebuild 14200 RMD160 1208de3e64a596b6a464e4e979f28a6f5d6490ea SHA1 6f842c11dbc3162bcbe677b31fb79c768d6bb037 SHA256 a0942d2961d8bcc28c42adbbac7bc270fe5c3e6d03adba0ba42e44fe377b5c5c
-EBUILD nvidia-drivers-71.86.11.ebuild 14197 RMD160 e63d489ae1524810f2556c6f515856f7e5ce3813 SHA1 489180c36806b4238dc39cf84566c9351938c060 SHA256 6a4f31d5e46e023830e8908b456d3cb99fb8aa4ba2a8f84daa91497c63c5a708
-EBUILD nvidia-drivers-96.43.09.ebuild 14525 RMD160 4b99d2295e5f00081c8298a1dbf2838167d23510 SHA1 f50696adc9dd29bd9ea5baa3c4aa6f3252e1c43d SHA256 a16ddbacb31c494ab08ca5f98504c8e1aec7c513da0c0d4e3d0308a2c56237ca
-EBUILD nvidia-drivers-96.43.11.ebuild 14527 RMD160 8f6adaf8922b2b89c47f5d5a24cda85d35cf927b SHA1 c4896e8b739e1ebe43a6ade3c50a154eb1b292be SHA256 77645f44da6bb71791ec39976bd0d3967c58c811fb8a1b0f7975fa553d95b5d9
-EBUILD nvidia-drivers-96.43.13.ebuild 14523 RMD160 05c1abee2a37582d4c6a15a384ada627c872fffd SHA1 ccec82fdd34de6e6f1562a120257e9d68a6b6686 SHA256 2289a2cae34300952692fb7f9145bdd7f67f3bfe472fc569121436beacc0b3be
-MISC ChangeLog 39118 RMD160 88882e000c85e1af20b83f32d65c156b4064ec04 SHA1 dbf2ed89bda32adf67fb52fb9f632d4a382f48d4 SHA256 63ea8e5826a5852f50f738b430fbd0bc3b138c8c1a005dc4ca26c128d921a64f
+EBUILD nvidia-drivers-173.14.15.ebuild 14952 RMD160 e4bee01f5a0091a141bf52aa4b8fbb7986879be2 SHA1 f60a694110cf1d753e101c2386fccabdcbeee848 SHA256 bd82a183845e27d303af2e9e6096c65c70c66229dbba6848c524fa33d523b369
+EBUILD nvidia-drivers-173.14.18.ebuild 14964 RMD160 0bd57ecd87e9c32adf49d48459c505dc00df8e8a SHA1 a3d11a43a870f2438a01b524bbd21d00b73f1032 SHA256 93cf5ce1cb513e5daae0526f0a2c9c48bdddaaf80722a47aead3e50b9fa1592f
+EBUILD nvidia-drivers-173.14.20.ebuild 14965 RMD160 78986856d3293f54a1aa7c9e965afb59da176b61 SHA1 d8d4788b7065d8698418caf677e012365ae5d320 SHA256 4a7708557978d36944388280389ebd3fbf50418628f49336bfebbd0733f603ba
+EBUILD nvidia-drivers-180.29.ebuild 14849 RMD160 a301ac896b82dc824a1afb911ba8bb8a44528179 SHA1 6badfe0fe784ae144074a24c0c25ddc6a2ebdfad SHA256 c1402333f3474aa9fe0ddf3decefe4c17f28a85fdfca20fab76ede9752cf1dc3
+EBUILD nvidia-drivers-180.60.ebuild 16529 RMD160 f1a04df08f3653b3c7a18cb07ea15dcb7ace9d16 SHA1 3f5c7d2bce5207f808ab8e0f98266708e531932a SHA256 c5811f59d1f83af5891de95294c193772d9ea9139d83b9d6f323dcaa004e901e
+EBUILD nvidia-drivers-185.18.14.ebuild 16304 RMD160 58ea4c1c389c716f45b1f308dcb7aef912be11d3 SHA1 2dd8c534ea99cc9152f89ab5050655b707c94b7e SHA256 3f0b634ae02c0d1ecc938fafe24bd70cebde8155cb7bc95bfe98e8a06a7bbd94
+EBUILD nvidia-drivers-185.18.29.ebuild 16827 RMD160 0e73994a8c1593efb854f02e5ee7f438864091c9 SHA1 8cc3af56329f7cd793656caeb6d56ec079db327c SHA256 6cc84d502c8b3bc6a2845e280b7b5e4ef86056be7ba1d2437af84d2bd764dfc0
+EBUILD nvidia-drivers-185.18.31.ebuild 17068 RMD160 81314083723c95c1fa3ac2051e512c142de8636c SHA1 5a6c0ee091802b0614110d98a249e4543a4beb99 SHA256 9e233fba735fa3a81a1e039ab74682471881600b85bb206d70670391cc3c729c
+EBUILD nvidia-drivers-190.18.ebuild 16301 RMD160 469b45dc9199a3f1aaf653f8258a14dcf53ddc0d SHA1 55f7e7bd80d0c668a73d6f29de9510d6d36d137d SHA256 4aaaf94ea4436ffc8f876dbac6bde62183f521fca3da2344177024dbd1b32b6d
+EBUILD nvidia-drivers-190.25.ebuild 16301 RMD160 168b3023e102c2bd77754692d74d7ba7cd6526b6 SHA1 133442331c1ab9c5a7ceac844515754942238a1a SHA256 abaf977777a05fabe83a2c55acaab4136cf92a8790525b7872b25a21a5fe8f8b
+EBUILD nvidia-drivers-190.32.ebuild 17826 RMD160 b5304c0ebace4005f0612c341f3bed48e9f3e832 SHA1 dd61e58fe9e98a78fa3a2e644b4170acb73b72c5 SHA256 b7945d1a2c0a982578cf511382131d171ce8ce1d0b7a6d99716aa4b12d9c32c2
+EBUILD nvidia-drivers-190.36.ebuild 17826 RMD160 2184e78c683b194742a37f6ba702462651f1eff0 SHA1 4256fd5df3af04bf1207673e2d32a4e56b7f762f SHA256 c04884a621d7b58836215d2294d3cf1861adbaab605b5ede0543c2cd58d8c303
+EBUILD nvidia-drivers-71.86.09.ebuild 14176 RMD160 0a93365d55d36f68604d1731fd9f26e5761a336d SHA1 864ec7e3761adf3e62d6e5d5fe0b62a620151144 SHA256 f9d40538272b8d812c2eac7ccbae89b990676935e6639fd1b5453671dd483555
+EBUILD nvidia-drivers-71.86.11.ebuild 14178 RMD160 3f1ec0266e21bf1049176c12289c4a2ef63e68be SHA1 6547c4abd1fab8db5c1f4ef5660391cf8e750546 SHA256 67d01071182c1557899e0388ec35c065706275b38e2b43d7b3220130581c7609
+EBUILD nvidia-drivers-96.43.09.ebuild 14503 RMD160 7193bacc2f636f0b61b8339e45d783de6c2a54e6 SHA1 a793d7049fdd5b8e1ed2694a6f29e8dcc468a1a0 SHA256 eee7e688584be63aafa1f604f29a4768f2b73125c9fa0ff85b8d184efe6390e4
+EBUILD nvidia-drivers-96.43.11.ebuild 14503 RMD160 7de133bccdd5361954dc35f6c0d1e18b0e43be83 SHA1 7b88c12fa3c7a13d74be017325b13004e2c14c99 SHA256 588b3c30abef38758727e9c4a33d3b9e690f18e5cccd6f41b6daec9c45a4bd49
+EBUILD nvidia-drivers-96.43.13.ebuild 14504 RMD160 edc1b835051dda8ba9e424c0b21e7491fdbe8d67 SHA1 95f1d9905fc921413e3c76079d7a929e0e93c333 SHA256 4726674953a2fa3ee97734ca8669d6a9700f70ae5d49b805fa16cc7b5c581fdb
+MISC ChangeLog 39781 RMD160 0b3a88b3fbb40d467efb003b138804dd0df0e38a SHA1 5e46ab4f9d51fc38d55d3ace270d3aaef9cf332e SHA256 6bf58715239103f0af8ab30168d392693c2bcf5fa4aca5cc5f17ade822cb8824
 MISC metadata.xml 608 RMD160 69923c951a3b11d3632338cd673430c1335f78cd SHA1 febe635634c122bf9fb5fd83fd486ab5a25282b3 SHA256 6b13dc244ff827b23a6f1de01eef3a7f607917573fb36b7316a1a629c78cc6bd
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild
index 1e50d33122c0..2af199fa3685 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild,v 1.5 2009/06/12 19:53:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild,v 1.6 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.5.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -192,8 +195,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -485,9 +490,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild
index 2b6100f724b4..1f182d69545d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild,v 1.6 2009/07/31 15:14:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild,v 1.7 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -192,8 +195,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -485,9 +490,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.20.ebuild
index 73dac7fb6ff3..99f15c8b6066 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.20.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.20.ebuild,v 1.2 2009/08/27 14:38:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.20.ebuild,v 1.3 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -192,8 +195,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -485,9 +490,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild
index f1ea1100e1f0..e2d6ba90f628 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild,v 1.6 2009/08/03 00:47:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild,v 1.7 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -176,8 +179,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -480,9 +485,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild
index e68d248c2d6e..784b06ef2f3d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild,v 1.6 2009/08/03 00:47:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild,v 1.7 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -220,8 +223,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -524,9 +529,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.14.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.14.ebuild
index 5bbc1cec498b..20b06af628e1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.14.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.14.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.14.ebuild,v 1.2 2009/08/03 00:47:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.14.ebuild,v 1.3 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -220,8 +223,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -518,9 +523,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.29.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.29.ebuild
index f150cf25c1c0..bfc23fd5f11e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.29.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.29.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.29.ebuild,v 1.3 2009/08/03 03:58:20 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.29.ebuild,v 1.4 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -237,8 +240,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -535,9 +540,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild
index 9ca9ed63849d..d7b29a6b3dfb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild,v 1.4 2009/09/26 18:48:10 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild,v 1.5 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -240,8 +243,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -546,9 +551,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.18.ebuild
index 0a53d8fc7d49..c1f4824c8130 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.18.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.18.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.18.ebuild,v 1.2 2009/08/03 00:47:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.18.ebuild,v 1.3 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -220,8 +223,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -518,9 +523,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.25.ebuild
index 7207d624bb4d..1115d5b9a1cf 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.25.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.25.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.25.ebuild,v 1.1 2009/09/02 21:49:40 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.25.ebuild,v 1.2 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -220,8 +223,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -518,9 +523,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild
index 8417eaaa83b1..289460414502 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild,v 1.3 2009/09/26 19:11:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.32.ebuild,v 1.4 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -242,8 +245,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -564,9 +569,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild
index 9b6c17d9ed04..42da8dbcdb3c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild,v 1.1 2009/09/27 11:15:17 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.36.ebuild,v 1.2 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -22,6 +24,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -242,8 +245,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	cd "${S}"
 	use x86-fbsd && cd doc
 
@@ -564,9 +569,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild
index 5fa58ed1208d..4db89bf2b210 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild,v 1.5 2009/08/02 20:59:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.09.ebuild,v 1.6 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -24,6 +26,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -187,8 +190,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	use x86-fbsd \
 		&& cd "${NV_DOC}" \
 		|| cd "${WORKDIR}/${NV_PACKAGE}"
@@ -447,9 +452,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild
index c7176a5bcab9..a781dca5b1c5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild,v 1.1 2009/08/23 23:29:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild,v 1.2 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -24,6 +26,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -187,8 +190,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	use x86-fbsd \
 		&& cd "${NV_DOC}" \
 		|| cd "${WORKDIR}/${NV_PACKAGE}"
@@ -447,9 +452,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
index f1260896da78..15fb3e6b150f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild,v 1.8 2009/06/12 19:53:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild,v 1.9 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -25,6 +27,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.5.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -188,8 +191,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	use x86-fbsd \
 		&& cd "${NV_DOC}" \
 		|| cd "${WORKDIR}/${NV_PACKAGE}"
@@ -456,9 +461,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild
index 065b2b8e1a25..f55cd224b114 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild,v 1.6 2009/08/02 20:59:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild,v 1.7 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -25,6 +27,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -188,8 +191,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	use x86-fbsd \
 		&& cd "${NV_DOC}" \
 		|| cd "${WORKDIR}/${NV_PACKAGE}"
@@ -456,9 +461,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.ebuild
index c96e1e2088cd..68ca139164e0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.ebuild,v 1.2 2009/08/29 04:21:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.13.ebuild,v 1.3 2009/10/06 16:58:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -25,6 +27,7 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.6.99
+	elibc_glibc? ( >=sys-libs/glibc-2.3[nptl] )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
@@ -188,8 +191,10 @@ src_unpack() {
 	else
 		unpack ${A}
 	fi
+}
 
-	# Patches go below here, add brief description
+src_prepare() {
+	# Please add a brief description for every added patch
 	use x86-fbsd \
 		&& cd "${NV_DOC}" \
 		|| cd "${WORKDIR}/${NV_PACKAGE}"
@@ -456,9 +461,6 @@ want_tls() {
 		esac
 	fi
 
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
 	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
 	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
 		case ${CHOST/-*} in