Move nvidia maskings after arch-specific inheritance

6 files changed, 27 insertions, 20 deletions

diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
new file mode 100644
index 000000000000..cf25cf161e72
--- /dev/null
+++ b/profiles/hardened/linux/amd64/package.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.mask,v 1.1 2009/09/12 02:42:33 gengor Exp $
+
+# These packages do more harm than good on hardened.
+# Users with nVidia GPUs must use the OSS "nouveau" or "nv" Xorg drivers.
+x11-drivers/nvidia-drivers
+media-video/nvidia-settings
+dev-util/nvidia-cuda-sdk
diff --git a/profiles/hardened/linux/amd64/use.mask b/profiles/hardened/linux/amd64/use.mask
index f19fa1af6f7f..772f83898f88 100644
--- a/profiles/hardened/linux/amd64/use.mask
+++ b/profiles/hardened/linux/amd64/use.mask
@@ -1,4 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/use.mask,v 1.3 2009/08/05 15:22:54 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/use.mask,v 1.4 2009/09/12 02:42:33 gengor Exp $
 
+# Binary nvidia drivers are masked, USE flags must be too.
+video_cards_nvidia
+nvidia
+vdpau
diff --git a/profiles/hardened/linux/package.mask b/profiles/hardened/linux/package.mask
index 0fbfc324db7b..654e032f2855 100644
--- a/profiles/hardened/linux/package.mask
+++ b/profiles/hardened/linux/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.mask,v 1.23 2009/08/20 03:23:19 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.mask,v 1.24 2009/09/12 02:42:32 gengor Exp $
 
 # Hardened versions of gcc-4.0* through gcc-4.2* are not available.
 =sys-devel/gcc-4.0*
@@ -42,13 +42,3 @@ net-im/skysentials
 # Requires >=sys-libs/glibc-2.10
 =x11-libs/fltk-1.1.9-r1
 =x11-libs/fltk-2.0_pre6786-r1
-
-
-# These packages do more harm than good w/ hardened.
-# Users must now the opensource xorg nv driver with nvidia cards
-# by placing Driver "nv" in xorg.conf.
-# 2006-06-29 solar
-# 2009-08-07 chainsaw
-x11-drivers/nvidia-drivers
-media-video/nvidia-settings
-dev-util/nvidia-cuda-sdk
diff --git a/profiles/hardened/linux/use.mask b/profiles/hardened/linux/use.mask
index 841fce4c957f..6344e525d417 100644
--- a/profiles/hardened/linux/use.mask
+++ b/profiles/hardened/linux/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/use.mask,v 1.7 2009/09/12 00:21:46 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/use.mask,v 1.8 2009/09/12 02:42:32 gengor Exp $
 
 -hardened
 
@@ -9,11 +9,6 @@ emul-linux-x86
 # supported only by gcc-4, unmask when it's stable wrt #217927
 raw
 
-# nvidia-drivers are masked, this has to be too
-video_cards_nvidia
-nvidia
-vdpau
-
 # tcc is x86-only
 tcc
 
diff --git a/profiles/hardened/linux/x86/package.mask b/profiles/hardened/linux/x86/package.mask
index 567a18c2d26c..9a49c4ca3709 100644
--- a/profiles/hardened/linux/x86/package.mask
+++ b/profiles/hardened/linux/x86/package.mask
@@ -1,4 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/package.mask,v 1.4 2009/09/11 17:45:04 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/package.mask,v 1.5 2009/09/12 02:42:34 gengor Exp $
 
+# These packages do more harm than good on hardened.
+# Users with nVidia GPUs must use the OSS "nouveau" or "nv" Xorg drivers.
+x11-drivers/nvidia-drivers
+media-video/nvidia-settings
+dev-util/nvidia-cuda-sdk
diff --git a/profiles/hardened/linux/x86/use.mask b/profiles/hardened/linux/x86/use.mask
index 6d88117829b0..c1122d535d4e 100644
--- a/profiles/hardened/linux/x86/use.mask
+++ b/profiles/hardened/linux/x86/use.mask
@@ -1,4 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/use.mask,v 1.3 2009/08/05 15:22:54 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/use.mask,v 1.4 2009/09/12 02:42:34 gengor Exp $
 
+# Binary nvidia drivers are masked, USE flags must be too.
+video_cards_nvidia
+nvidia
+vdpau