Make sure that nvidia driver useflags are not enabled, as nvidia-glx was masked.

4 files changed, 7 insertions, 17 deletions

diff --git a/profiles/hardened/amd64/use.mask b/profiles/hardened/amd64/use.mask
index 9be228e10221..d48794c04241 100644
--- a/profiles/hardened/amd64/use.mask
+++ b/profiles/hardened/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 2006 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.10 2006/06/13 13:29:25 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/use.mask,v 1.11 2006/06/30 21:58:24 flameeyes Exp $
 
 # 2006/06/13 - Danny van Dyk <kugelfang@gentoo.org>
 # Mask clvm on amd64, as it isn't keyworded at all.
@@ -19,10 +19,6 @@ drac
 # which deps on libemf
 plugin
 
-# 2005/09/14 - Diego Pettenò <flameeyes@gentoo.org>
-# nVidia XvMC support works on amd64
--nvidia
-
 # 2005/12/01 - Daniel Gryniewicz <dang@gentoo.org>
 # There is now a kqemu that works and is stable on amd64
 -kqemu
@@ -43,7 +39,6 @@ video_cards_nsc
 -input_devices_synaptics
 -input_devices_vmmouse
 -input_devices_wacom
--video_cards_nvidia
 -video_cards_fglrx
 -video_cards_vmware
 
diff --git a/profiles/hardened/use.mask b/profiles/hardened/use.mask
index 3bd7a5477306..e420f7570fc8 100644
--- a/profiles/hardened/use.mask
+++ b/profiles/hardened/use.mask
@@ -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/profiles/hardened/use.mask,v 1.9 2006/06/03 18:32:13 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.10 2006/06/30 21:58:24 flameeyes Exp $
 
 # uclibc only in uclibc profiles.
 uclibc
@@ -13,3 +13,6 @@ emul-linux-x86
 
 # suggested by GMsoft
 pbbuttonsd
+
+# nvidia-glx is masked, this has to be too
+video_cards_nvidia
diff --git a/profiles/hardened/x86/2.6/use.mask b/profiles/hardened/x86/2.6/use.mask
index fd9cc814a09e..5574ef12aaad 100644
--- a/profiles/hardened/x86/2.6/use.mask
+++ b/profiles/hardened/x86/2.6/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/use.mask,v 1.9 2006/06/27 20:06:24 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/use.mask,v 1.10 2006/06/30 21:58:24 flameeyes Exp $
 
 
 altivec
@@ -14,14 +14,10 @@ altivec
 -win32codecs
 -real
 
-# nVidia XvMC support
--nvidia
-
 # Copied from default-linux/x86 2006-04-02; bug #128490
 # Modular X: unmask for architectures on which they are available
 -input_devices_synaptics
 -input_devices_vmmouse
--video_cards_nvidia
 -video_cards_fglrx
 -video_cards_vmware
 # Modular X: mask for architectures on which they aren't available
diff --git a/profiles/hardened/x86/use.mask b/profiles/hardened/x86/use.mask
index ddc4bfbde4eb..add2e73ba52a 100644
--- a/profiles/hardened/x86/use.mask
+++ b/profiles/hardened/x86/use.mask
@@ -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/profiles/hardened/x86/use.mask,v 1.19 2006/06/27 20:07:14 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.mask,v 1.20 2006/06/30 21:58:24 flameeyes Exp $
 
 # We don't have any ppc sub profiles yet. bug #74103
 altivec
@@ -14,14 +14,10 @@ altivec
 -win32codecs
 -real
 
-# nVidia XvMC support
--nvidia
-
 # Copied from default-linux/x86 2006-04-02; bug #128490
 # Modular X: unmask for architectures on which they are available
 -input_devices_synaptics
 -input_devices_vmmouse
--video_cards_nvidia
 -video_cards_fglrx
 -video_cards_vmware
 # Modular X: mask for architectures on which they aren't available