8 files changed, 29 insertions, 4 deletions
diff --git a/profiles/hardened/amd64/deprecated b/profiles/hardened/amd64/deprecated
index 2ec537be..401f688e 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 a4054a37..23335761 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/10.0/deprecated b/profiles/hardened/linux/amd64/10.0/deprecated
new file mode 100644
index 00000000..23335761
--- /dev/null
+++ b/profiles/hardened/linux/amd64/10.0/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/amd64
+# Check 'eselect profile list'.
+# 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
+# See: "General instructions" in Section 3. "Profile updating instructions"
diff --git a/profiles/hardened/linux/amd64/desktop/parent b/profiles/hardened/linux/amd64/desktop/parent
new file mode 100644
index 00000000..8bd86303
--- /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 00000000..b558d905
--- /dev/null
+++ b/profiles/hardened/linux/amd64/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/developer
diff --git a/profiles/hardened/linux/amd64/no-multilib/make.defaults b/profiles/hardened/linux/amd64/no-multilib/make.defaults
new file mode 100644
index 00000000..91d933df
--- /dev/null
+++ b/profiles/hardened/linux/amd64/no-multilib/make.defaults
@@ -0,0 +1,10 @@
+# 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/no-multilib/make.defaults,v 1.1 2009/08/06 07:50:49 ssuominen Exp $
+
+ARCH="amd64"
+ACCEPT_KEYWORDS="${ARCH}"
+
+MULTILIB_ABIS="amd64"
+
+STAGE1_USE="hardened nptl nptlonly pic"
diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent
new file mode 100644
index 00000000..8305c355
--- /dev/null
+++ b/profiles/hardened/linux/amd64/no-multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../features/64bit-native
diff --git a/profiles/hardened/linux/amd64/server/parent b/profiles/hardened/linux/amd64/server/parent
new file mode 100644
index 00000000..9c7a1951
--- /dev/null
+++ b/profiles/hardened/linux/amd64/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/server