Update hardened/linux/amd64 profile, bug #344861

29 files changed, 40 insertions, 76 deletions

diff --git a/profiles/hardened/amd64/deprecated b/profiles/hardened/amd64/deprecated
index 2ec537beaf40..401f688eb4d6 100644
--- a/profiles/hardened/amd64/deprecated
+++ b/profiles/hardened/amd64/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64/10.0/no-multilib
+hardened/linux/amd64/no-multilib
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/10.0/no-multilib profile.
+# Find the number that corresponds with the hardened/linux/amd64/no-multilib profile.
 # Use 'eselect profile set <number>' to set a new /etc/make.profile symlink.
 #
 # Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/hardened/amd64/multilib/deprecated b/profiles/hardened/amd64/multilib/deprecated
index a4054a372afd..233357615b28 100644
--- a/profiles/hardened/amd64/multilib/deprecated
+++ b/profiles/hardened/amd64/multilib/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64/10.0
+hardened/linux/amd64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/amd64 profile.
 # Use 'eselect profile set <number>' to set a new /etc/make.profile symlink.
 #
 # Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/hardened/linux/amd64/2008.0/developer/deprecated b/profiles/hardened/linux/amd64/10.0/deprecated
index a4054a372afd..233357615b28 100644
--- a/profiles/hardened/linux/amd64/2008.0/developer/deprecated
+++ b/profiles/hardened/linux/amd64/10.0/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64/10.0
+hardened/linux/amd64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/amd64 profile.
 # Use 'eselect profile set <number>' to set a new /etc/make.profile symlink.
 #
 # Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/hardened/linux/amd64/2008.0/server/deprecated b/profiles/hardened/linux/amd64/10.0/desktop/deprecated
index a4054a372afd..233357615b28 100644
--- a/profiles/hardened/linux/amd64/2008.0/server/deprecated
+++ b/profiles/hardened/linux/amd64/10.0/desktop/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64/10.0
+hardened/linux/amd64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/amd64 profile.
 # Use 'eselect profile set <number>' to set a new /etc/make.profile symlink.
 #
 # Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/hardened/linux/amd64/10.0/desktop/parent b/profiles/hardened/linux/amd64/10.0/desktop/parent
index ad6c5e126fbb..322001d09da5 100644
--- a/profiles/hardened/linux/amd64/10.0/desktop/parent
+++ b/profiles/hardened/linux/amd64/10.0/desktop/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/desktop
+../../desktop
diff --git a/profiles/hardened/linux/amd64/2008.0/deprecated b/profiles/hardened/linux/amd64/10.0/developer/deprecated
index a4054a372afd..233357615b28 100644
--- a/profiles/hardened/linux/amd64/2008.0/deprecated
+++ b/profiles/hardened/linux/amd64/10.0/developer/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64/10.0
+hardened/linux/amd64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/amd64 profile.
 # Use 'eselect profile set <number>' to set a new /etc/make.profile symlink.
 #
 # Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/hardened/linux/amd64/10.0/developer/parent b/profiles/hardened/linux/amd64/10.0/developer/parent
index 4c893748ce71..0d57019c243b 100644
--- a/profiles/hardened/linux/amd64/10.0/developer/parent
+++ b/profiles/hardened/linux/amd64/10.0/developer/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/developer
+../../developer
diff --git a/profiles/hardened/linux/amd64/10.0/make.defaults b/profiles/hardened/linux/amd64/10.0/make.defaults
deleted file mode 100644
index 1f2ae9f229bf..000000000000
--- a/profiles/hardened/linux/amd64/10.0/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/10.0/make.defaults,v 1.2 2009/09/30 03:08:31 gengor Exp $
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened multilib nptl nptlonly pic"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/amd64/10.0/no-multilib/deprecated b/profiles/hardened/linux/amd64/10.0/no-multilib/deprecated
new file mode 100644
index 000000000000..401f688eb4d6
--- /dev/null
+++ b/profiles/hardened/linux/amd64/10.0/no-multilib/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/amd64/no-multilib
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/amd64/no-multilib profile.
+# Use 'eselect profile set <number>' to set a new /etc/make.profile symlink.
+#
+# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml
+# See: "General instructions" in Section 3. "Profile updating instructions"
diff --git a/profiles/hardened/linux/amd64/10.0/no-multilib/parent b/profiles/hardened/linux/amd64/10.0/no-multilib/parent
index 52bcba73e7a5..a49e407692c8 100644
--- a/profiles/hardened/linux/amd64/10.0/no-multilib/parent
+++ b/profiles/hardened/linux/amd64/10.0/no-multilib/parent
@@ -1,2 +1 @@
-..
-../../../../../features/64bit-native
+../../no-multilib
diff --git a/profiles/hardened/linux/amd64/10.0/parent b/profiles/hardened/linux/amd64/10.0/parent
index 605d0438e49e..f3229c5b9876 100644
--- a/profiles/hardened/linux/amd64/10.0/parent
+++ b/profiles/hardened/linux/amd64/10.0/parent
@@ -1,2 +1 @@
 ..
-../../../../releases/10.0
diff --git a/profiles/hardened/linux/amd64/2008.0/desktop/deprecated b/profiles/hardened/linux/amd64/10.0/server/deprecated
index a4054a372afd..233357615b28 100644
--- a/profiles/hardened/linux/amd64/2008.0/desktop/deprecated
+++ b/profiles/hardened/linux/amd64/10.0/server/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64/10.0
+hardened/linux/amd64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/amd64 profile.
 # Use 'eselect profile set <number>' to set a new /etc/make.profile symlink.
 #
 # Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/hardened/linux/amd64/10.0/server/parent b/profiles/hardened/linux/amd64/10.0/server/parent
index c39901657c87..375b20d80d4a 100644
--- a/profiles/hardened/linux/amd64/10.0/server/parent
+++ b/profiles/hardened/linux/amd64/10.0/server/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/server
+../../server
diff --git a/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults b/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults
deleted file mode 100644
index b11f236c7bf8..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/2008.0/desktop/make.defaults,v 1.1 2009/08/06 17:58:48 ssuominen Exp $
-
-# Samuli Suominen <ssuominen@gentoo.org> (06 Aug 2009)
-# Deprecated since 10.0 profiles.
-USE="esd qt3"
diff --git a/profiles/hardened/linux/amd64/2008.0/desktop/parent b/profiles/hardened/linux/amd64/2008.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/hardened/linux/amd64/2008.0/developer/parent b/profiles/hardened/linux/amd64/2008.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/hardened/linux/amd64/2008.0/make.defaults b/profiles/hardened/linux/amd64/2008.0/make.defaults
deleted file mode 100644
index 09a9483e6ac6..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/2008.0/make.defaults,v 1.2 2009/09/30 03:08:32 gengor Exp $
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened multilib nptl nptlonly pic"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated b/profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated
deleted file mode 100644
index 2ec537beaf40..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/amd64/10.0/no-multilib
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/10.0/no-multilib profile.
-# Use 'eselect profile set <number>' to set a new /etc/make.profile symlink.
-#
-# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml
-# See: "General instructions" in Section 3. "Profile updating instructions"
diff --git a/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults b/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults
deleted file mode 100644
index b4d6e38047f7..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults,v 1.1 2008/04/01 17:41:13 wolf31o2 Exp $
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
-
-MULTILIB_ABIS="amd64"
-
-STAGE1_USE="hardened nptl nptlonly pic"
diff --git a/profiles/hardened/linux/amd64/2008.0/no-multilib/parent b/profiles/hardened/linux/amd64/2008.0/no-multilib/parent
deleted file mode 100644
index 52bcba73e7a5..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/no-multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/64bit-native
diff --git a/profiles/hardened/linux/amd64/2008.0/parent b/profiles/hardened/linux/amd64/2008.0/parent
deleted file mode 100644
index 3c71bf2b8ea0..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/2008.0
diff --git a/profiles/hardened/linux/amd64/2008.0/server/parent b/profiles/hardened/linux/amd64/2008.0/server/parent
deleted file mode 100644
index c39901657c87..000000000000
--- a/profiles/hardened/linux/amd64/2008.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/hardened/linux/amd64/desktop/parent b/profiles/hardened/linux/amd64/desktop/parent
new file mode 100644
index 000000000000..8bd863038bbe
--- /dev/null
+++ b/profiles/hardened/linux/amd64/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/desktop
diff --git a/profiles/hardened/linux/amd64/developer/parent b/profiles/hardened/linux/amd64/developer/parent
new file mode 100644
index 000000000000..b558d90594ab
--- /dev/null
+++ b/profiles/hardened/linux/amd64/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/developer
diff --git a/profiles/hardened/linux/amd64/make.defaults b/profiles/hardened/linux/amd64/make.defaults
index 51e59c6cdc11..fe0df3240bb3 100644
--- a/profiles/hardened/linux/amd64/make.defaults
+++ b/profiles/hardened/linux/amd64/make.defaults
@@ -1,8 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation.
+# Copyright 1999-2010 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.2 2009/07/09 00:47:47 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v 1.3 2010/11/25 13:22:11 blueness Exp $
 
-USE="justify"
+USE="justify -unicode"
 
 CFLAGS="-O2 -pipe"
 CXXFLAGS="${CFLAGS}"
+
+# STAGE1_USE does not stack
+STAGE1_USE="hardened multilib nptl nptlonly pic"
diff --git a/profiles/hardened/linux/amd64/10.0/no-multilib/make.defaults b/profiles/hardened/linux/amd64/no-multilib/make.defaults
index 91d933dfd5c5..297baf431ce8 100644
--- a/profiles/hardened/linux/amd64/10.0/no-multilib/make.defaults
+++ b/profiles/hardened/linux/amd64/no-multilib/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/10.0/no-multilib/make.defaults,v 1.1 2009/08/06 07:50:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/make.defaults,v 1.1 2010/11/25 13:22:12 blueness Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent
new file mode 100644
index 000000000000..8305c3556463
--- /dev/null
+++ b/profiles/hardened/linux/amd64/no-multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../features/64bit-native
diff --git a/profiles/hardened/linux/amd64/parent b/profiles/hardened/linux/amd64/parent
index 158dd88c5c69..376245ae2fd9 100644
--- a/profiles/hardened/linux/amd64/parent
+++ b/profiles/hardened/linux/amd64/parent
@@ -1,3 +1,4 @@
 ../../../base
 ..
 ../../../arch/amd64
+../../../releases/10.0
diff --git a/profiles/hardened/linux/amd64/server/parent b/profiles/hardened/linux/amd64/server/parent
new file mode 100644
index 000000000000..9c7a195197bd
--- /dev/null
+++ b/profiles/hardened/linux/amd64/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/server