Avoid duplication of USE flags in hardened profiles.

7 files changed, 17 insertions, 25 deletions

diff --git a/profiles/hardened/linux/amd64/make.defaults b/profiles/hardened/linux/amd64/make.defaults
index fe0df3240bb3..e1024b229acd 100644
--- a/profiles/hardened/linux/amd64/make.defaults
+++ b/profiles/hardened/linux/amd64/make.defaults
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v 1.3 2010/11/25 13:22:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v 1.4 2011/02/13 18:09:39 arfrever Exp $
 
-USE="justify -unicode"
+USE="justify"
 
 CFLAGS="-O2 -pipe"
 CXXFLAGS="${CFLAGS}"
diff --git a/profiles/hardened/linux/ia64/make.defaults b/profiles/hardened/linux/ia64/make.defaults
index b7fa91e9f085..474b60d90c0e 100644
--- a/profiles/hardened/linux/ia64/make.defaults
+++ b/profiles/hardened/linux/ia64/make.defaults
@@ -1,8 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v 1.1 2010/11/13 12:39:32 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $
 
 # STAGE1_USE does not stack
 STAGE1_USE="hardened nptl nptlonly pic"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/make.defaults b/profiles/hardened/linux/make.defaults
index 2938f06655ab..467274f0fbf1 100644
--- a/profiles/hardened/linux/make.defaults
+++ b/profiles/hardened/linux/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v 1.10 2010/12/07 16:01:42 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/make.defaults,v 1.11 2011/02/13 18:09:39 arfrever Exp $
 
 STAGE1_USE="hardened nptl nptlonly pic -jit"
 
-USE="-fortran -ipv6 hardened pic sysfs urandom -jit"
+USE="-fortran hardened -ipv6 -jit pic sysfs -unicode urandom"
diff --git a/profiles/hardened/linux/powerpc/ppc32/make.defaults b/profiles/hardened/linux/powerpc/ppc32/make.defaults
index ab785cf007c3..be4815fd1ba6 100644
--- a/profiles/hardened/linux/powerpc/ppc32/make.defaults
+++ b/profiles/hardened/linux/powerpc/ppc32/make.defaults
@@ -1,8 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v 1.1 2010/11/14 15:44:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $
 
 # STAGE1_USE does not stack
 STAGE1_USE="hardened nptl nptlonly pic"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/powerpc/ppc64/make.defaults b/profiles/hardened/linux/powerpc/ppc64/make.defaults
index 8f514b951f79..f719aa77e7f9 100644
--- a/profiles/hardened/linux/powerpc/ppc64/make.defaults
+++ b/profiles/hardened/linux/powerpc/ppc64/make.defaults
@@ -1,8 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v 1.1 2010/11/14 15:44:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $
 
 # STAGE1_USE does not stack
 STAGE1_USE="hardened nptl nptlonly pic"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/x86/10.0/make.defaults b/profiles/hardened/linux/x86/10.0/make.defaults
index 5d1c665e8ffd..140f13a22ac2 100644
--- a/profiles/hardened/linux/x86/10.0/make.defaults
+++ b/profiles/hardened/linux/x86/10.0/make.defaults
@@ -1,8 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/10.0/make.defaults,v 1.1 2009/08/06 07:58:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/10.0/make.defaults,v 1.2 2011/02/13 18:09:39 arfrever Exp $
 
 # STAGE1_USE does not stack
 STAGE1_USE="hardened nptl nptlonly pic"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/x86/make.defaults b/profiles/hardened/linux/x86/make.defaults
index 6fe6a190a13f..4b02ea4d5296 100644
--- a/profiles/hardened/linux/x86/make.defaults
+++ b/profiles/hardened/linux/x86/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/make.defaults,v 1.8 2010/11/20 00:29:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/make.defaults,v 1.9 2011/02/13 18:09:39 arfrever Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
@@ -12,7 +12,7 @@ CXXFLAGS="${CFLAGS}"
 # STAGE1_USE does not stack
 STAGE1_USE="hardened nptl nptlonly pic"
 
-USE="berkdb crypt hardened nptl nptlonly pam pic readline ssl tcpd zlib -unicode"
+USE="nptl nptlonly"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers