diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index ad7fddd26..1d687a22f 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -130,18 +130,18 @@ EBUILD nvidia-drivers-100.14.11-r11.ebuild 14288 RMD160 d9d6e0ca514c2f52f87ef269
 MD5 c75aab0d5b7f1c449f6206b4b606a41e nvidia-drivers-100.14.11-r11.ebuild 14288
 RMD160 d9d6e0ca514c2f52f87ef2696732058cb610889c nvidia-drivers-100.14.11-r11.ebuild 14288
 SHA256 53bdb4e13397356b6d0fc772eca06b8d50fd05458e7186061d7fd85ea2f07695 nvidia-drivers-100.14.11-r11.ebuild 14288
-EBUILD nvidia-drivers-100.14.19-r10.ebuild 12224 RMD160 70741565ecd62e73c976f50d5239122404fc765b SHA1 e001de6727d02d75d353eb48d14e7360380f9fd6 SHA256 d2bf16c2cb607e647ad53567455e9d142b25491788c8d5caf4a1e0cad1518a39
-MD5 fa455d27fd09640876229f59c0c941af nvidia-drivers-100.14.19-r10.ebuild 12224
-RMD160 70741565ecd62e73c976f50d5239122404fc765b nvidia-drivers-100.14.19-r10.ebuild 12224
-SHA256 d2bf16c2cb607e647ad53567455e9d142b25491788c8d5caf4a1e0cad1518a39 nvidia-drivers-100.14.19-r10.ebuild 12224
-EBUILD nvidia-drivers-71.86.01-r10.ebuild 16600 RMD160 577d86da2f7de3537c6d79a5ada78c38c7c79636 SHA1 1be2287d742154090b4cb46cb7bbe3b4df7ae53e SHA256 1bf091cdceddc3117bd54b1657a6f15a8a3ce67c01cb49a5b6199bdb156656a4
-MD5 e902e17820373f20e5807eaad06c393d nvidia-drivers-71.86.01-r10.ebuild 16600
-RMD160 577d86da2f7de3537c6d79a5ada78c38c7c79636 nvidia-drivers-71.86.01-r10.ebuild 16600
-SHA256 1bf091cdceddc3117bd54b1657a6f15a8a3ce67c01cb49a5b6199bdb156656a4 nvidia-drivers-71.86.01-r10.ebuild 16600
-EBUILD nvidia-drivers-96.43.01-r10.ebuild 16600 RMD160 577d86da2f7de3537c6d79a5ada78c38c7c79636 SHA1 1be2287d742154090b4cb46cb7bbe3b4df7ae53e SHA256 1bf091cdceddc3117bd54b1657a6f15a8a3ce67c01cb49a5b6199bdb156656a4
-MD5 e902e17820373f20e5807eaad06c393d nvidia-drivers-96.43.01-r10.ebuild 16600
-RMD160 577d86da2f7de3537c6d79a5ada78c38c7c79636 nvidia-drivers-96.43.01-r10.ebuild 16600
-SHA256 1bf091cdceddc3117bd54b1657a6f15a8a3ce67c01cb49a5b6199bdb156656a4 nvidia-drivers-96.43.01-r10.ebuild 16600
+EBUILD nvidia-drivers-100.14.19-r10.ebuild 12124 RMD160 a3b8a531ce0edc98496b484cd22828b93fcf107b SHA1 a98a12c5aaf2dde10170d94e487e38bc7a0f8be6 SHA256 48d02fa11ba962646cb2ca7825d30d6e9cb7211d0e7f353256bac42369a9a42c
+MD5 887fa8b74cac4633c0120aff77d302b4 nvidia-drivers-100.14.19-r10.ebuild 12124
+RMD160 a3b8a531ce0edc98496b484cd22828b93fcf107b nvidia-drivers-100.14.19-r10.ebuild 12124
+SHA256 48d02fa11ba962646cb2ca7825d30d6e9cb7211d0e7f353256bac42369a9a42c nvidia-drivers-100.14.19-r10.ebuild 12124
+EBUILD nvidia-drivers-71.86.01-r10.ebuild 16501 RMD160 934ddfd7e5d864a6762a75642fabccfacf226c82 SHA1 28d0fe887d2396ccd0709e1f7f171b0f7c0a4ad1 SHA256 daae6b2cb9b1e438bc9e4797d1f2b055846e93047bba4cf7b3944d66cb0ffdb9
+MD5 2bc22a5c7790a99327fa1deec761f7e2 nvidia-drivers-71.86.01-r10.ebuild 16501
+RMD160 934ddfd7e5d864a6762a75642fabccfacf226c82 nvidia-drivers-71.86.01-r10.ebuild 16501
+SHA256 daae6b2cb9b1e438bc9e4797d1f2b055846e93047bba4cf7b3944d66cb0ffdb9 nvidia-drivers-71.86.01-r10.ebuild 16501
+EBUILD nvidia-drivers-96.43.01-r10.ebuild 16501 RMD160 934ddfd7e5d864a6762a75642fabccfacf226c82 SHA1 28d0fe887d2396ccd0709e1f7f171b0f7c0a4ad1 SHA256 daae6b2cb9b1e438bc9e4797d1f2b055846e93047bba4cf7b3944d66cb0ffdb9
+MD5 2bc22a5c7790a99327fa1deec761f7e2 nvidia-drivers-96.43.01-r10.ebuild 16501
+RMD160 934ddfd7e5d864a6762a75642fabccfacf226c82 nvidia-drivers-96.43.01-r10.ebuild 16501
+SHA256 daae6b2cb9b1e438bc9e4797d1f2b055846e93047bba4cf7b3944d66cb0ffdb9 nvidia-drivers-96.43.01-r10.ebuild 16501
 MD5 fcff067dada7b244828ecf8678f034a6 files/digest-nvidia-drivers-1.0.9626-r99 712
 RMD160 a0907b550dd7e232ed45607bb5716ee106aa7cb1 files/digest-nvidia-drivers-1.0.9626-r99 712
 SHA256 7fa90bcaccc1f37cbbd7ee6a2416c7ce2147d359cae9e327c6592ae480ef992b files/digest-nvidia-drivers-1.0.9626-r99 712
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19-r10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19-r10.ebuild
index e158866f1..448e2d6b0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19-r10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.19-r10.ebuild
@@ -382,9 +382,6 @@ want_tls() {
 
 	[[ ${valid_chost} == "false" ]] && return 1
 
-	# 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.01-r10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.01-r10.ebuild
index e747a85c7..e3c4ef53d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.01-r10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.01-r10.ebuild
@@ -431,9 +431,6 @@ want_tls() {
 
         [[ ${valid_chost} == "false" ]] && return 1
 
-        # If we've got nptl, we've got tls
-        built_with_use 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.01-r10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.01-r10.ebuild
index e747a85c7..e3c4ef53d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.01-r10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.01-r10.ebuild
@@ -431,9 +431,6 @@ want_tls() {
 
         [[ ${valid_chost} == "false" ]] && return 1
 
-        # If we've got nptl, we've got tls
-        built_with_use 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