6 files changed, 29 insertions, 38 deletions
diff --git a/profiles/hardened/linux/amd64/use.mask b/profiles/hardened/linux/amd64/use.mask
index 201a16061173..f19fa1af6f7f 100644
--- a/profiles/hardened/linux/amd64/use.mask
+++ b/profiles/hardened/linux/amd64/use.mask
@@ -1,8 +1,4 @@
-# Copyright 1999-2004 Gentoo Foundation.
+# 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.2 2009/03/19 03:07:23 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/use.mask,v 1.3 2009/08/05 15:22:54 gengor Exp $
 
-# nvidia-drivers are masked, this has to be too
-video_cards_nvidia
-nvidia
-vdpau
diff --git a/profiles/hardened/linux/package.use.mask b/profiles/hardened/linux/package.use.mask
index f211fe5117d1..d51ce4040b02 100644
--- a/profiles/hardened/linux/package.use.mask
+++ b/profiles/hardened/linux/package.use.mask
@@ -1,12 +1,11 @@
 # 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.use.mask,v 1.3 2009/07/31 08:34:09 ssuominen Exp $
-
-# Note that this requires portage-2.1.1+ so if you need this functionality,
-# make sure your package forces a new-enough portage.
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.use.mask,v 1.4 2009/08/05 15:22:54 gengor Exp $
 
 sys-devel/gcc -hardened
-www-apps/mediawiki math
+sys-libs/glibc -hardened
 
 # No -z now support?  Bug #269288.
 sys-devel/binutils gold
+
+www-apps/mediawiki math
diff --git a/profiles/hardened/linux/use.mask b/profiles/hardened/linux/use.mask
index 20d7a70283ed..8dcf6bfba92a 100644
--- a/profiles/hardened/linux/use.mask
+++ b/profiles/hardened/linux/use.mask
@@ -1,11 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation.
+# 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.5 2009/03/26 03:03:23 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/use.mask,v 1.6 2009/08/05 15:22:54 gengor Exp $
+
+-hardened
+
+emul-linux-x86
 
 # supported only by gcc-4, unmask when it's stable wrt #217927
 raw
 
-emul-linux-x86
+# nvidia-drivers are masked, this has to be too
+video_cards_nvidia
+nvidia
+vdpau
 
 x264
 
@@ -14,7 +21,3 @@ tcc
 
 # precompiled headers are not compat with ASLR.
 pch
-
-# we love this stuff
--hardened
-
diff --git a/profiles/hardened/linux/x86/use.mask b/profiles/hardened/linux/x86/use.mask
index 38837a5daee8..6d88117829b0 100644
--- a/profiles/hardened/linux/x86/use.mask
+++ b/profiles/hardened/linux/x86/use.mask
@@ -1,9 +1,4 @@
-# Copyright 1999-2004 Gentoo Foundation.
+# 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.2 2009/03/19 03:07:25 gengor Exp $
-
-# nvidia-drivers are masked, this has to be too
-video_cards_nvidia
-nvidia
-vdpau
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/use.mask,v 1.3 2009/08/05 15:22:54 gengor Exp $
 
diff --git a/profiles/hardened/package.use.mask b/profiles/hardened/package.use.mask
index 7a0363766bc2..eef88f682838 100644
--- a/profiles/hardened/package.use.mask
+++ b/profiles/hardened/package.use.mask
@@ -1,12 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.use.mask,v 1.20 2009/07/31 08:11:12 ssuominen Exp $
-
-# Note that this requires portage-2.1.1+ so if you need this functionality,
-# make sure your package forces a new-enough portage.
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.use.mask,v 1.21 2009/08/05 15:22:54 gengor Exp $
 
 sys-devel/gcc -hardened
-www-apps/mediawiki math
+sys-libs/glibc -hardened
 
 # No -z now support?  Bug #269288.
 sys-devel/binutils gold
+
+www-apps/mediawiki math
diff --git a/profiles/hardened/use.mask b/profiles/hardened/use.mask
index 8cb24267de78..32ea2834d53d 100644
--- a/profiles/hardened/use.mask
+++ b/profiles/hardened/use.mask
@@ -1,13 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation.
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.23 2009/03/19 03:07:05 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/use.mask,v 1.24 2009/08/05 15:22:54 gengor Exp $
 
-# supported only by gcc-4, unmask when it's stable wrt #217927
-raw
+-hardened
 
 emul-linux-x86
 
-# nvidia-drivers/nvidia-legacy-drivers are masked, this has to be too
+# 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
@@ -19,6 +21,3 @@ tcc
 
 # precompiled headers are not compat with ASLR.
 pch
-
-# we love this stuff
--hardened