unmask >=nvidia-drivers-300 on hardened

3 files changed, 22 insertions, 10 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 4767135252e1..1fad4594970f 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7162 2012/11/18 18:20:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7163 2012/11/20 04:18:17 zorry Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  20 Nov 2012; Magnus Granberg <zorry@gentoo.org>
+  hardened/linux/amd64/package.mask, hardened/linux/amd64/package.use.mask:
+  unmask >=nvidia-drivers-300.00 on amd64 but mask use X on it. Bug#433121
+
   18 Nov 2012; Jeroen Roovers <jer@gentoo.org> package.mask:
   Unmask www-client/opera-12.11.
 
diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
index 6e4777bcee16..60a4b1f855ea 100644
--- a/profiles/hardened/linux/amd64/package.mask
+++ b/profiles/hardened/linux/amd64/package.mask
@@ -1,13 +1,15 @@
 # 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.3 2012/08/07 03:42:19 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.mask,v 1.4 2012/11/20 04:18:17 zorry Exp $
 
-# Although it may build, these packages do more harm than good on hardened.
-# X almost certainly will not load, same with anything related to opengl.
-# 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
+# Magnus Granberg <zorry@gentoo.org> (20 Nov 2012)
+# Newer then 300.00 is patched but we still have RWX in the libs.
+# We mask X for we still need to make the doc for revdep-pax else
+# hell will rule.
+# Bug 433121
+<=x11-drivers/nvidia-drivers-300.00
+#media-video/nvidia-settings
+#dev-util/nvidia-cuda-sdk
 
 # Depends on x11-drivers/nvidia-drivers
-dev-python/pyopencl
+#dev-python/pyopencl
diff --git a/profiles/hardened/linux/amd64/package.use.mask b/profiles/hardened/linux/amd64/package.use.mask
index 9a4cad2a3369..6ad39f35226f 100644
--- a/profiles/hardened/linux/amd64/package.use.mask
+++ b/profiles/hardened/linux/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.use.mask,v 1.20 2012/03/22 16:57:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.use.mask,v 1.21 2012/11/20 04:18:17 zorry Exp $
 
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -18,3 +18,9 @@
 # Kacper Kowalik <xarthisius@gentoo.org> (29 Jul 2011)
 # mask assembler as it currently doesn't work
 dev-lang/path64 assembler
+
+# Magnus Granberg <zorry@gentoo.org> (20 Nov 2012)
+# mask X for we still mis the docs for revdep-pax
+# else hell will rule. (RWX in the libs)
+# Bug 433121
+x11-drivers/nvidia-drivers X