aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/hardened')
-rw-r--r--profiles/hardened/amd64/deprecated4
-rw-r--r--profiles/hardened/amd64/multilib/deprecated4
-rw-r--r--profiles/hardened/linux/amd64/10.0/desktop/parent3
-rw-r--r--profiles/hardened/linux/amd64/10.0/developer/parent3
-rw-r--r--profiles/hardened/linux/amd64/10.0/no-multilib/parent3
-rw-r--r--profiles/hardened/linux/amd64/10.0/parent1
-rw-r--r--profiles/hardened/linux/amd64/10.0/server/parent3
-rw-r--r--profiles/hardened/linux/amd64/2008.0/deprecated (renamed from profiles/hardened/linux/amd64/10.0/deprecated)4
-rw-r--r--profiles/hardened/linux/amd64/2008.0/desktop/deprecated (renamed from profiles/hardened/linux/amd64/10.0/desktop/deprecated)4
-rw-r--r--profiles/hardened/linux/amd64/2008.0/desktop/make.defaults7
-rw-r--r--profiles/hardened/linux/amd64/2008.0/desktop/parent (renamed from profiles/hardened/linux/powerpc/ppc32/desktop/parent)0
-rw-r--r--profiles/hardened/linux/amd64/2008.0/developer/deprecated (renamed from profiles/hardened/linux/amd64/10.0/developer/deprecated)4
-rw-r--r--profiles/hardened/linux/amd64/2008.0/developer/parent (renamed from profiles/hardened/linux/powerpc/ppc32/developer/parent)0
-rw-r--r--profiles/hardened/linux/amd64/2008.0/make.defaults8
-rw-r--r--profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated (renamed from profiles/hardened/linux/amd64/10.0/no-multilib/deprecated)4
-rw-r--r--profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults (renamed from profiles/hardened/linux/amd64/no-multilib/make.defaults)2
-rw-r--r--profiles/hardened/linux/amd64/2008.0/no-multilib/parent (renamed from profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent)0
-rw-r--r--profiles/hardened/linux/amd64/2008.0/parent2
-rw-r--r--profiles/hardened/linux/amd64/2008.0/server/deprecated (renamed from profiles/hardened/linux/amd64/10.0/server/deprecated)4
-rw-r--r--profiles/hardened/linux/amd64/2008.0/server/parent (renamed from profiles/hardened/linux/powerpc/ppc32/server/parent)0
-rw-r--r--profiles/hardened/linux/amd64/desktop/parent2
-rw-r--r--profiles/hardened/linux/amd64/developer/parent2
-rw-r--r--profiles/hardened/linux/amd64/make.defaults5
-rw-r--r--profiles/hardened/linux/amd64/no-multilib/parent2
-rw-r--r--profiles/hardened/linux/amd64/package.mask2
-rw-r--r--profiles/hardened/linux/amd64/parent1
-rw-r--r--profiles/hardened/linux/amd64/server/parent2
-rw-r--r--profiles/hardened/linux/ia64/10.0/deprecated7
-rw-r--r--profiles/hardened/linux/ia64/desktop/parent2
-rw-r--r--profiles/hardened/linux/ia64/developer/parent2
-rw-r--r--profiles/hardened/linux/ia64/server/parent2
-rw-r--r--profiles/hardened/linux/package.use.mask2
-rw-r--r--profiles/hardened/linux/powerpc/package.mask2
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/10.0/desktop/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/10.0/developer/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/10.0/parent1
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/10.0/server/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/deprecated (renamed from profiles/hardened/linux/powerpc/ppc32/10.0/deprecated)4
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/deprecated (renamed from profiles/hardened/linux/powerpc/ppc32/10.0/desktop/deprecated)4
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/make.defaults7
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/parent (renamed from profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent)0
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/developer/deprecated (renamed from profiles/hardened/linux/powerpc/ppc32/10.0/developer/deprecated)4
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/developer/parent (renamed from profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent)0
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/make.defaults8
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/server/deprecated (renamed from profiles/hardened/linux/powerpc/ppc32/10.0/server/deprecated)4
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/2008.0/server/parent (renamed from profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent)0
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/make.defaults8
-rw-r--r--profiles/hardened/linux/powerpc/ppc32/parent1
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/use.mask2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/use.mask2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/desktop/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/desktop/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/developer/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/developer/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/parent1
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/server/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/10.0/server/parent3
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/make.defaults7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults (renamed from profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults)4
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/make.defaults7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/deprecated7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals5
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/deprecated8
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/deprecated8
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/make.defaults7
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/parent (renamed from profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent)0
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/developer/deprecated8
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/developer/parent (renamed from profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent)0
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/make.defaults8
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/server/deprecated8
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/2008.0/server/parent (renamed from profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent)0
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent2
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask6
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask6
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals5
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/make.defaults8
-rw-r--r--profiles/hardened/linux/powerpc/ppc64/parent1
-rw-r--r--profiles/hardened/linux/x86/10.0/deprecated7
-rw-r--r--profiles/hardened/linux/x86/10.0/desktop/deprecated7
-rw-r--r--profiles/hardened/linux/x86/10.0/desktop/parent3
-rw-r--r--profiles/hardened/linux/x86/10.0/developer/deprecated7
-rw-r--r--profiles/hardened/linux/x86/10.0/developer/parent3
-rw-r--r--profiles/hardened/linux/x86/10.0/no-nptl/deprecated7
-rw-r--r--profiles/hardened/linux/x86/10.0/no-nptl/parent3
-rw-r--r--profiles/hardened/linux/x86/10.0/parent1
-rw-r--r--profiles/hardened/linux/x86/10.0/server/deprecated7
-rw-r--r--profiles/hardened/linux/x86/10.0/server/parent3
-rw-r--r--profiles/hardened/linux/x86/2008.0/deprecated7
-rw-r--r--profiles/hardened/linux/x86/2008.0/desktop/deprecated7
-rw-r--r--profiles/hardened/linux/x86/2008.0/desktop/make.defaults7
-rw-r--r--profiles/hardened/linux/x86/2008.0/desktop/parent (renamed from profiles/hardened/linux/powerpc/ppc64/desktop/parent)0
-rw-r--r--profiles/hardened/linux/x86/2008.0/developer/deprecated7
-rw-r--r--profiles/hardened/linux/x86/2008.0/developer/parent (renamed from profiles/hardened/linux/powerpc/ppc64/developer/parent)0
-rw-r--r--profiles/hardened/linux/x86/2008.0/make.defaults (renamed from profiles/hardened/linux/ia64/make.defaults)2
-rw-r--r--profiles/hardened/linux/x86/2008.0/no-nptl/deprecated8
-rw-r--r--profiles/hardened/linux/x86/2008.0/no-nptl/parent2
-rw-r--r--profiles/hardened/linux/x86/2008.0/parent2
-rw-r--r--profiles/hardened/linux/x86/2008.0/server/deprecated7
-rw-r--r--profiles/hardened/linux/x86/2008.0/server/parent (renamed from profiles/hardened/linux/powerpc/ppc64/server/parent)0
-rw-r--r--profiles/hardened/linux/x86/desktop/parent2
-rw-r--r--profiles/hardened/linux/x86/developer/parent2
-rw-r--r--profiles/hardened/linux/x86/make.defaults6
-rw-r--r--profiles/hardened/linux/x86/minimal/make.defaults2
-rw-r--r--profiles/hardened/linux/x86/no-nptl/parent2
-rw-r--r--profiles/hardened/linux/x86/package.mask2
-rw-r--r--profiles/hardened/linux/x86/package.use.mask2
-rw-r--r--profiles/hardened/linux/x86/parent1
-rw-r--r--profiles/hardened/linux/x86/server/parent2
-rw-r--r--profiles/hardened/package.mask5
-rw-r--r--profiles/hardened/package.use.mask2
-rw-r--r--profiles/hardened/ppc/deprecated4
-rw-r--r--profiles/hardened/ppc64/deprecated4
-rw-r--r--profiles/hardened/x86/2.6/deprecated4
-rw-r--r--profiles/hardened/x86/deprecated4
-rw-r--r--profiles/hardened/x86/minimal/deprecated4
-rw-r--r--profiles/hardened/x86/package.use.mask5
152 files changed, 326 insertions, 267 deletions
diff --git a/profiles/hardened/amd64/deprecated b/profiles/hardened/amd64/deprecated
index 401f688e..2ec537be 100644
--- a/profiles/hardened/amd64/deprecated
+++ b/profiles/hardened/amd64/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64/no-multilib
+hardened/linux/amd64/10.0/no-multilib
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/no-multilib profile.
+# 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
diff --git a/profiles/hardened/amd64/multilib/deprecated b/profiles/hardened/amd64/multilib/deprecated
index 23335761..a4054a37 100644
--- a/profiles/hardened/amd64/multilib/deprecated
+++ b/profiles/hardened/amd64/multilib/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64
+hardened/linux/amd64/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64 profile.
+# Find the number that corresponds with the hardened/linux/amd64/10.0 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 322001d0..ad6c5e12 100644
--- a/profiles/hardened/linux/amd64/10.0/desktop/parent
+++ b/profiles/hardened/linux/amd64/10.0/desktop/parent
@@ -1 +1,2 @@
-../../desktop
+..
+../../../../../targets/desktop
diff --git a/profiles/hardened/linux/amd64/10.0/developer/parent b/profiles/hardened/linux/amd64/10.0/developer/parent
index 0d57019c..4c893748 100644
--- a/profiles/hardened/linux/amd64/10.0/developer/parent
+++ b/profiles/hardened/linux/amd64/10.0/developer/parent
@@ -1 +1,2 @@
-../../developer
+..
+../../../../../targets/developer
diff --git a/profiles/hardened/linux/amd64/10.0/no-multilib/parent b/profiles/hardened/linux/amd64/10.0/no-multilib/parent
index a49e4076..52bcba73 100644
--- a/profiles/hardened/linux/amd64/10.0/no-multilib/parent
+++ b/profiles/hardened/linux/amd64/10.0/no-multilib/parent
@@ -1 +1,2 @@
-../../no-multilib
+..
+../../../../../features/64bit-native
diff --git a/profiles/hardened/linux/amd64/10.0/parent b/profiles/hardened/linux/amd64/10.0/parent
index f3229c5b..605d0438 100644
--- a/profiles/hardened/linux/amd64/10.0/parent
+++ b/profiles/hardened/linux/amd64/10.0/parent
@@ -1 +1,2 @@
..
+../../../../releases/10.0
diff --git a/profiles/hardened/linux/amd64/10.0/server/parent b/profiles/hardened/linux/amd64/10.0/server/parent
index 375b20d8..c3990165 100644
--- a/profiles/hardened/linux/amd64/10.0/server/parent
+++ b/profiles/hardened/linux/amd64/10.0/server/parent
@@ -1 +1,2 @@
-../../server
+..
+../../../../../targets/server
diff --git a/profiles/hardened/linux/amd64/10.0/deprecated b/profiles/hardened/linux/amd64/2008.0/deprecated
index 23335761..a4054a37 100644
--- a/profiles/hardened/linux/amd64/10.0/deprecated
+++ b/profiles/hardened/linux/amd64/2008.0/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64
+hardened/linux/amd64/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64 profile.
+# Find the number that corresponds with the hardened/linux/amd64/10.0 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/deprecated b/profiles/hardened/linux/amd64/2008.0/desktop/deprecated
index 23335761..a4054a37 100644
--- a/profiles/hardened/linux/amd64/10.0/desktop/deprecated
+++ b/profiles/hardened/linux/amd64/2008.0/desktop/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64
+hardened/linux/amd64/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64 profile.
+# Find the number that corresponds with the hardened/linux/amd64/10.0 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/desktop/make.defaults b/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults
new file mode 100644
index 00000000..b11f236c
--- /dev/null
+++ b/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults
@@ -0,0 +1,7 @@
+# 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/powerpc/ppc32/desktop/parent b/profiles/hardened/linux/amd64/2008.0/desktop/parent
index ad6c5e12..ad6c5e12 100644
--- a/profiles/hardened/linux/powerpc/ppc32/desktop/parent
+++ b/profiles/hardened/linux/amd64/2008.0/desktop/parent
diff --git a/profiles/hardened/linux/amd64/10.0/developer/deprecated b/profiles/hardened/linux/amd64/2008.0/developer/deprecated
index 23335761..a4054a37 100644
--- a/profiles/hardened/linux/amd64/10.0/developer/deprecated
+++ b/profiles/hardened/linux/amd64/2008.0/developer/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64
+hardened/linux/amd64/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64 profile.
+# Find the number that corresponds with the hardened/linux/amd64/10.0 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/powerpc/ppc32/developer/parent b/profiles/hardened/linux/amd64/2008.0/developer/parent
index 4c893748..4c893748 100644
--- a/profiles/hardened/linux/powerpc/ppc32/developer/parent
+++ b/profiles/hardened/linux/amd64/2008.0/developer/parent
diff --git a/profiles/hardened/linux/amd64/2008.0/make.defaults b/profiles/hardened/linux/amd64/2008.0/make.defaults
new file mode 100644
index 00000000..09a9483e
--- /dev/null
+++ b/profiles/hardened/linux/amd64/2008.0/make.defaults
@@ -0,0 +1,8 @@
+# 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/10.0/no-multilib/deprecated b/profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated
index 401f688e..2ec537be 100644
--- a/profiles/hardened/linux/amd64/10.0/no-multilib/deprecated
+++ b/profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64/no-multilib
+hardened/linux/amd64/10.0/no-multilib
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64/no-multilib profile.
+# 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
diff --git a/profiles/hardened/linux/amd64/no-multilib/make.defaults b/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults
index 91d933df..b4d6e380 100644
--- a/profiles/hardened/linux/amd64/no-multilib/make.defaults
+++ b/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults
@@ -1,6 +1,6 @@
# 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 $
+# $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}"
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent b/profiles/hardened/linux/amd64/2008.0/no-multilib/parent
index 52bcba73..52bcba73 100644
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
+++ b/profiles/hardened/linux/amd64/2008.0/no-multilib/parent
diff --git a/profiles/hardened/linux/amd64/2008.0/parent b/profiles/hardened/linux/amd64/2008.0/parent
new file mode 100644
index 00000000..3c71bf2b
--- /dev/null
+++ b/profiles/hardened/linux/amd64/2008.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/2008.0
diff --git a/profiles/hardened/linux/amd64/10.0/server/deprecated b/profiles/hardened/linux/amd64/2008.0/server/deprecated
index 23335761..a4054a37 100644
--- a/profiles/hardened/linux/amd64/10.0/server/deprecated
+++ b/profiles/hardened/linux/amd64/2008.0/server/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/amd64
+hardened/linux/amd64/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/amd64 profile.
+# Find the number that corresponds with the hardened/linux/amd64/10.0 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/powerpc/ppc32/server/parent b/profiles/hardened/linux/amd64/2008.0/server/parent
index c3990165..c3990165 100644
--- a/profiles/hardened/linux/powerpc/ppc32/server/parent
+++ b/profiles/hardened/linux/amd64/2008.0/server/parent
diff --git a/profiles/hardened/linux/amd64/desktop/parent b/profiles/hardened/linux/amd64/desktop/parent
deleted file mode 100644
index 8bd86303..00000000
--- a/profiles/hardened/linux/amd64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/desktop
diff --git a/profiles/hardened/linux/amd64/developer/parent b/profiles/hardened/linux/amd64/developer/parent
deleted file mode 100644
index b558d905..00000000
--- a/profiles/hardened/linux/amd64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/developer
diff --git a/profiles/hardened/linux/amd64/make.defaults b/profiles/hardened/linux/amd64/make.defaults
index b61284a3..51e59c6c 100644
--- a/profiles/hardened/linux/amd64/make.defaults
+++ b/profiles/hardened/linux/amd64/make.defaults
@@ -2,10 +2,7 @@
# 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 $
-USE="justify -unicode"
+USE="justify"
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened multilib nptl nptlonly pic"
diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent
deleted file mode 100644
index 8305c355..00000000
--- a/profiles/hardened/linux/amd64/no-multilib/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/64bit-native
diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask
index 5413db14..6781026a 100644
--- a/profiles/hardened/linux/amd64/package.mask
+++ b/profiles/hardened/linux/amd64/package.mask
@@ -1,6 +1,6 @@
# 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.1 2009/09/12 02:42:33 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/package.mask,v 1.2 2010/05/19 18:07:03 halcy0n Exp $
# These packages do more harm than good on hardened.
# Users with nVidia GPUs must use the OSS "nouveau" or "nv" Xorg drivers.
diff --git a/profiles/hardened/linux/amd64/parent b/profiles/hardened/linux/amd64/parent
index 376245ae..158dd88c 100644
--- a/profiles/hardened/linux/amd64/parent
+++ b/profiles/hardened/linux/amd64/parent
@@ -1,4 +1,3 @@
../../../base
..
../../../arch/amd64
-../../../releases/10.0
diff --git a/profiles/hardened/linux/amd64/server/parent b/profiles/hardened/linux/amd64/server/parent
deleted file mode 100644
index 9c7a1951..00000000
--- a/profiles/hardened/linux/amd64/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/server
diff --git a/profiles/hardened/linux/ia64/10.0/deprecated b/profiles/hardened/linux/ia64/10.0/deprecated
deleted file mode 100644
index 0820adc1..00000000
--- a/profiles/hardened/linux/ia64/10.0/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/ia64
-# 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/ia64/desktop/parent b/profiles/hardened/linux/ia64/desktop/parent
deleted file mode 100644
index 8bd86303..00000000
--- a/profiles/hardened/linux/ia64/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/desktop
diff --git a/profiles/hardened/linux/ia64/developer/parent b/profiles/hardened/linux/ia64/developer/parent
deleted file mode 100644
index b558d905..00000000
--- a/profiles/hardened/linux/ia64/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/developer
diff --git a/profiles/hardened/linux/ia64/server/parent b/profiles/hardened/linux/ia64/server/parent
deleted file mode 100644
index 9c7a1951..00000000
--- a/profiles/hardened/linux/ia64/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/server
diff --git a/profiles/hardened/linux/package.use.mask b/profiles/hardened/linux/package.use.mask
index a57c4994..76bdffe7 100644
--- a/profiles/hardened/linux/package.use.mask
+++ b/profiles/hardened/linux/package.use.mask
@@ -1,6 +1,6 @@
# 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.8 2009/10/25 05:50:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/package.use.mask,v 1.9 2010/04/10 15:35:30 ssuominen Exp $
sys-devel/gcc -hardened
sys-libs/glibc -hardened
diff --git a/profiles/hardened/linux/powerpc/package.mask b/profiles/hardened/linux/powerpc/package.mask
index 0f31d908..0628c73c 100644
--- a/profiles/hardened/linux/powerpc/package.mask
+++ b/profiles/hardened/linux/powerpc/package.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/package.mask,v 1.9 2009/12/03 17:48:37 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/package.mask,v 1.11 2010/10/05 23:19:12 alexxy Exp $
# Wulf C. Krueger <philantrop@gentoo.org> (22 Sep 2007)
# Needs OOo.
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/parent b/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/parent
index 322001d0..db8ce088 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/parent
@@ -1 +1,2 @@
-../../desktop
+..
+../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/developer/parent b/profiles/hardened/linux/powerpc/ppc32/10.0/developer/parent
index 0d57019c..5c8258a7 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/developer/parent
@@ -1 +1,2 @@
-../../developer
+..
+../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/parent b/profiles/hardened/linux/powerpc/ppc32/10.0/parent
index f3229c5b..8ae9641a 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/parent
@@ -1 +1,2 @@
..
+../../../../../releases/10.0
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/server/parent b/profiles/hardened/linux/powerpc/ppc32/10.0/server/parent
index 375b20d8..2e085a6e 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/server/parent
@@ -1 +1,2 @@
-../../server
+..
+../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/deprecated b/profiles/hardened/linux/powerpc/ppc32/2008.0/deprecated
index 5f30e79c..d0027215 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32
+hardened/linux/powerpc/ppc32/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 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/powerpc/ppc32/10.0/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/deprecated
index 5f30e79c..d0027215 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32
+hardened/linux/powerpc/ppc32/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 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/powerpc/ppc32/2008.0/desktop/make.defaults b/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/make.defaults
new file mode 100644
index 00000000..9c28a8cf
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/make.defaults
@@ -0,0 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/make.defaults,v 1.1 2009/08/06 18:02:10 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (06 Aug 2009)
+# Deprecated since 10.0 profiles.
+USE="esd qt3"
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent b/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/parent
index db8ce088..db8ce088 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/parent
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/developer/deprecated b/profiles/hardened/linux/powerpc/ppc32/2008.0/developer/deprecated
index 5f30e79c..d0027215 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/developer/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/developer/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32
+hardened/linux/powerpc/ppc32/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 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/powerpc/ppc64/32bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc32/2008.0/developer/parent
index 5c8258a7..5c8258a7 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/developer/parent
diff --git a/profiles/hardened/linux/powerpc/ppc32/2008.0/make.defaults b/profiles/hardened/linux/powerpc/ppc32/2008.0/make.defaults
new file mode 100644
index 00000000..5f09c4da
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2008 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/2008.0/make.defaults,v 1.2 2009/09/30 03:08:36 gengor Exp $
+
+# STAGE1_USE does not stack
+STAGE1_USE="hardened nptl nptlonly pic"
+
+USE="-unicode"
diff --git a/profiles/hardened/linux/powerpc/ppc32/2008.0/parent b/profiles/hardened/linux/powerpc/ppc32/2008.0/parent
new file mode 100644
index 00000000..cfe87f7a
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../../releases/2008.0
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/server/deprecated b/profiles/hardened/linux/powerpc/ppc32/2008.0/server/deprecated
index 5f30e79c..d0027215 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/server/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/server/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32
+hardened/linux/powerpc/ppc32/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 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/powerpc/ppc64/32bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc32/2008.0/server/parent
index 2e085a6e..2e085a6e 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/2008.0/server/parent
diff --git a/profiles/hardened/linux/powerpc/ppc32/make.defaults b/profiles/hardened/linux/powerpc/ppc32/make.defaults
deleted file mode 100644
index 753fde53..00000000
--- a/profiles/hardened/linux/powerpc/ppc32/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened nptl nptlonly pic"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/powerpc/ppc32/parent b/profiles/hardened/linux/powerpc/ppc32/parent
index 356ef4b7..dd20c2a8 100644
--- a/profiles/hardened/linux/powerpc/ppc32/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/parent
@@ -1,3 +1,2 @@
..
../../../../arch/powerpc/ppc32
-../../../../releases/10.0
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated
deleted file mode 100644
index b25f8f8c..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/32bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/32bit-userland 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/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated
deleted file mode 100644
index b25f8f8c..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/32bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/32bit-userland 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/powerpc/ppc64/10.0/32bit-userland/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/parent
index 9390cd89..fae96e8d 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/parent
@@ -1 +1,2 @@
-../../../32bit-userland/desktop
+..
+../../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated
deleted file mode 100644
index b25f8f8c..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/32bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/32bit-userland 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/powerpc/ppc64/10.0/32bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/parent
index 739881d3..4bb06e40 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/parent
@@ -1 +1,2 @@
-../../../32bit-userland/developer
+..
+../../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/parent
index c7a73069..7947ae88 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/parent
@@ -1 +1,2 @@
-../../32bit-userland
+..
+../../../../../../features/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated
deleted file mode 100644
index b25f8f8c..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/32bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/32bit-userland 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/powerpc/ppc64/10.0/32bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/parent
index 557cf07e..8c11cb52 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/parent
@@ -1 +1,2 @@
-../../../32bit-userland/server
+..
+../../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/use.mask
new file mode 100644
index 00000000..9b09de2d
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/use.mask
@@ -0,0 +1,2 @@
+# We mask this since we're not really a multilib profile
+multilib
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated
deleted file mode 100644
index dc0e177e..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland 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/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated
deleted file mode 100644
index dc0e177e..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland 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/powerpc/ppc64/10.0/64bit-userland/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/parent
index 15f582cb..fae96e8d 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/parent
@@ -1 +1,2 @@
-../../../64bit-userland/desktop
+..
+../../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated
deleted file mode 100644
index dc0e177e..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland 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/powerpc/ppc64/10.0/64bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/parent
index 87a3f75b..4bb06e40 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/parent
@@ -1 +1,2 @@
-../../../64bit-userland/developer
+..
+../../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/parent
index 675b3fbe..2479a24f 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/parent
@@ -1 +1,2 @@
-../../64bit-userland
+..
+../../../../../../features/64bit-native
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated
deleted file mode 100644
index dc0e177e..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland 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/powerpc/ppc64/10.0/64bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/parent
index e4a49f12..8c11cb52 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/parent
@@ -1 +1,2 @@
-../../../64bit-userland/server
+..
+../../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/use.mask
new file mode 100644
index 00000000..6c918ff2
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/use.mask
@@ -0,0 +1,2 @@
+# We mask this since we don't have a stable sys-process/audit yet
+audit
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/deprecated
deleted file mode 100644
index dc0e177e..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland 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/powerpc/ppc64/10.0/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/deprecated
deleted file mode 100644
index dc0e177e..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland 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/powerpc/ppc64/10.0/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/parent
index 322001d0..db8ce088 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/parent
@@ -1 +1,2 @@
-../../desktop
+..
+../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/developer/deprecated
deleted file mode 100644
index dc0e177e..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/developer/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland 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/powerpc/ppc64/10.0/developer/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/developer/parent
index 0d57019c..5c8258a7 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/developer/parent
@@ -1 +1,2 @@
-../../developer
+..
+../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/parent
index f3229c5b..8ae9641a 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/parent
@@ -1 +1,2 @@
..
+../../../../../releases/10.0
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/server/deprecated
deleted file mode 100644
index dc0e177e..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/server/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/powerpc/ppc64/64bit-userland
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland 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/powerpc/ppc64/10.0/server/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/server/parent
index 375b20d8..2e085a6e 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/server/parent
@@ -1 +1,2 @@
-../../server
+..
+../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/deprecated
new file mode 100644
index 00000000..1bd211dc
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64/10.0/32bit-userland
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/32bit-userland 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/powerpc/ppc64/2008.0/32bit-userland/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/deprecated
new file mode 100644
index 00000000..1bd211dc
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64/10.0/32bit-userland
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/32bit-userland 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/powerpc/ppc64/2008.0/32bit-userland/desktop/make.defaults b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/make.defaults
new file mode 100644
index 00000000..848d59aa
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/make.defaults
@@ -0,0 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/make.defaults,v 1.1 2009/08/06 18:02:11 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (06 Aug 2009)
+# Deprecated since 10.0 profiles.
+USE="esd qt3"
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/parent
new file mode 100644
index 00000000..fae96e8d
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/deprecated
new file mode 100644
index 00000000..1bd211dc
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64/10.0/32bit-userland
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/32bit-userland 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/powerpc/ppc64/2008.0/32bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/parent
new file mode 100644
index 00000000..4bb06e40
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults
index abfc5225..c6fedb2a 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults,v 1.1 2008/04/01 17:41:23 wolf31o2 Exp $
# All extra USE/etc should be specified in sub-profiles.
# DO NOT POLLUTE USE ON THIS PROFILE.
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent
new file mode 100644
index 00000000..7947ae88
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/deprecated
new file mode 100644
index 00000000..1bd211dc
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64/10.0/32bit-userland
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/32bit-userland 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/powerpc/ppc64/2008.0/32bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/parent
new file mode 100644
index 00000000..8c11cb52
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask
new file mode 100644
index 00000000..9b09de2d
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask
@@ -0,0 +1,2 @@
+# We mask this since we're not really a multilib profile
+multilib
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/deprecated
new file mode 100644
index 00000000..9f45ffd5
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64/10.0/64bit-userland
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/64bit-userland 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/powerpc/ppc64/2008.0/64bit-userland/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/deprecated
new file mode 100644
index 00000000..9f45ffd5
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64/10.0/64bit-userland
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/64bit-userland 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/powerpc/ppc64/2008.0/64bit-userland/desktop/make.defaults b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/make.defaults
new file mode 100644
index 00000000..409a68e0
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/make.defaults
@@ -0,0 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/make.defaults,v 1.1 2009/08/06 18:02:11 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (06 Aug 2009)
+# Deprecated since 10.0 profiles.
+USE="esd qt3"
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/parent
new file mode 100644
index 00000000..fae96e8d
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/deprecated
new file mode 100644
index 00000000..9f45ffd5
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64/10.0/64bit-userland
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/64bit-userland 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/powerpc/ppc64/2008.0/64bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/parent
new file mode 100644
index 00000000..4bb06e40
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/parent
new file mode 100644
index 00000000..2479a24f
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/64bit-native
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/deprecated
new file mode 100644
index 00000000..9f45ffd5
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64/10.0/64bit-userland
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/64bit-userland 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/powerpc/ppc64/2008.0/64bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/parent
new file mode 100644
index 00000000..8c11cb52
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask
new file mode 100644
index 00000000..6c918ff2
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask
@@ -0,0 +1,2 @@
+# We mask this since we don't have a stable sys-process/audit yet
+audit
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals
new file mode 100644
index 00000000..39ec233b
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals
@@ -0,0 +1,5 @@
+# Copyright 2004-2008 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals,v 1.1 2008/04/01 17:41:26 wolf31o2 Exp $
+
+virtual/bootloader sys-boot/yaboot-static
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/deprecated
new file mode 100644
index 00000000..465abd5f
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/deprecated
@@ -0,0 +1,8 @@
+hardened/linux/powerpc/ppc64/10.0
+# Example change to hardened/linux/powerpc/ppc64/10.0 profile:
+# cd /etc
+# rm make.profile
+# ln -s ../usr/portage/profiles/hardened/linux/powerpc/ppc64/10.0 make.profile
+#
+# 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/powerpc/ppc64/2008.0/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/deprecated
new file mode 100644
index 00000000..465abd5f
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/deprecated
@@ -0,0 +1,8 @@
+hardened/linux/powerpc/ppc64/10.0
+# Example change to hardened/linux/powerpc/ppc64/10.0 profile:
+# cd /etc
+# rm make.profile
+# ln -s ../usr/portage/profiles/hardened/linux/powerpc/ppc64/10.0 make.profile
+#
+# 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/powerpc/ppc64/2008.0/desktop/make.defaults b/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/make.defaults
new file mode 100644
index 00000000..69b65658
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/make.defaults
@@ -0,0 +1,7 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/make.defaults,v 1.1 2009/08/06 18:02:11 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (06 Aug 2009)
+# Deprecated since 10.0 profiles.
+USE="esd qt3"
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/parent
index db8ce088..db8ce088 100644
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/deprecated
new file mode 100644
index 00000000..465abd5f
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/deprecated
@@ -0,0 +1,8 @@
+hardened/linux/powerpc/ppc64/10.0
+# Example change to hardened/linux/powerpc/ppc64/10.0 profile:
+# cd /etc
+# rm make.profile
+# ln -s ../usr/portage/profiles/hardened/linux/powerpc/ppc64/10.0 make.profile
+#
+# 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/powerpc/ppc64/64bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/parent
index 5c8258a7..5c8258a7 100644
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/make.defaults b/profiles/hardened/linux/powerpc/ppc64/2008.0/make.defaults
new file mode 100644
index 00000000..41e5ffd5
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 1999-2008 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/2008.0/make.defaults,v 1.2 2009/09/30 03:08:39 gengor Exp $
+
+# STAGE1_USE does not stack
+STAGE1_USE="hardened nptl nptlonly pic"
+
+USE="-unicode"
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/parent
new file mode 100644
index 00000000..cfe87f7a
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../../releases/2008.0
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/server/deprecated
new file mode 100644
index 00000000..465abd5f
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/server/deprecated
@@ -0,0 +1,8 @@
+hardened/linux/powerpc/ppc64/10.0
+# Example change to hardened/linux/powerpc/ppc64/10.0 profile:
+# cd /etc
+# rm make.profile
+# ln -s ../usr/portage/profiles/hardened/linux/powerpc/ppc64/10.0 make.profile
+#
+# 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/powerpc/ppc64/64bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/server/parent
index 2e085a6e..2e085a6e 100644
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/2008.0/server/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
deleted file mode 100644
index 926c3281..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
deleted file mode 100644
index 6a0e089f..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# We mask this since we're not really a multilib profile
-multilib
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
deleted file mode 100644
index bce140ff..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# We mask this since we don't have a stable sys-process/audit yet
-audit
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals
deleted file mode 100644
index b681e1c8..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-virtual/bootloader sys-boot/yaboot-static
diff --git a/profiles/hardened/linux/powerpc/ppc64/make.defaults b/profiles/hardened/linux/powerpc/ppc64/make.defaults
deleted file mode 100644
index 753fde53..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# STAGE1_USE does not stack
-STAGE1_USE="hardened nptl nptlonly pic"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/powerpc/ppc64/parent b/profiles/hardened/linux/powerpc/ppc64/parent
index e91922d6..7990a758 100644
--- a/profiles/hardened/linux/powerpc/ppc64/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/parent
@@ -1,4 +1,3 @@
..
../../../../arch/powerpc/ppc64/64ul
../../../../features/64bit-native
-../../../../releases/10.0
diff --git a/profiles/hardened/linux/x86/10.0/deprecated b/profiles/hardened/linux/x86/10.0/deprecated
deleted file mode 100644
index 6073d83c..00000000
--- a/profiles/hardened/linux/x86/10.0/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/x86
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86 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/x86/10.0/desktop/deprecated b/profiles/hardened/linux/x86/10.0/desktop/deprecated
deleted file mode 100644
index 6073d83c..00000000
--- a/profiles/hardened/linux/x86/10.0/desktop/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/x86
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86 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/x86/10.0/desktop/parent b/profiles/hardened/linux/x86/10.0/desktop/parent
index 322001d0..ad6c5e12 100644
--- a/profiles/hardened/linux/x86/10.0/desktop/parent
+++ b/profiles/hardened/linux/x86/10.0/desktop/parent
@@ -1 +1,2 @@
-../../desktop
+..
+../../../../../targets/desktop
diff --git a/profiles/hardened/linux/x86/10.0/developer/deprecated b/profiles/hardened/linux/x86/10.0/developer/deprecated
deleted file mode 100644
index 6073d83c..00000000
--- a/profiles/hardened/linux/x86/10.0/developer/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/x86
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86 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/x86/10.0/developer/parent b/profiles/hardened/linux/x86/10.0/developer/parent
index 0d57019c..4c893748 100644
--- a/profiles/hardened/linux/x86/10.0/developer/parent
+++ b/profiles/hardened/linux/x86/10.0/developer/parent
@@ -1 +1,2 @@
-../../developer
+..
+../../../../../targets/developer
diff --git a/profiles/hardened/linux/x86/10.0/no-nptl/deprecated b/profiles/hardened/linux/x86/10.0/no-nptl/deprecated
deleted file mode 100644
index 6073d83c..00000000
--- a/profiles/hardened/linux/x86/10.0/no-nptl/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/x86
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86 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/x86/10.0/no-nptl/parent b/profiles/hardened/linux/x86/10.0/no-nptl/parent
index 67b5c970..0627a62b 100644
--- a/profiles/hardened/linux/x86/10.0/no-nptl/parent
+++ b/profiles/hardened/linux/x86/10.0/no-nptl/parent
@@ -1 +1,2 @@
-../../no-nptl
+..
+../../../../../features/no-nptl
diff --git a/profiles/hardened/linux/x86/10.0/parent b/profiles/hardened/linux/x86/10.0/parent
index f3229c5b..605d0438 100644
--- a/profiles/hardened/linux/x86/10.0/parent
+++ b/profiles/hardened/linux/x86/10.0/parent
@@ -1 +1,2 @@
..
+../../../../releases/10.0
diff --git a/profiles/hardened/linux/x86/10.0/server/deprecated b/profiles/hardened/linux/x86/10.0/server/deprecated
deleted file mode 100644
index 6073d83c..00000000
--- a/profiles/hardened/linux/x86/10.0/server/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-hardened/linux/x86
-# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86 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/x86/10.0/server/parent b/profiles/hardened/linux/x86/10.0/server/parent
index 375b20d8..c3990165 100644
--- a/profiles/hardened/linux/x86/10.0/server/parent
+++ b/profiles/hardened/linux/x86/10.0/server/parent
@@ -1 +1,2 @@
-../../server
+..
+../../../../../targets/server
diff --git a/profiles/hardened/linux/x86/2008.0/deprecated b/profiles/hardened/linux/x86/2008.0/deprecated
new file mode 100644
index 00000000..6920ba0c
--- /dev/null
+++ b/profiles/hardened/linux/x86/2008.0/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/x86/10.0
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/x86/10.0 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/x86/2008.0/desktop/deprecated b/profiles/hardened/linux/x86/2008.0/desktop/deprecated
new file mode 100644
index 00000000..6920ba0c
--- /dev/null
+++ b/profiles/hardened/linux/x86/2008.0/desktop/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/x86/10.0
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/x86/10.0 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/x86/2008.0/desktop/make.defaults b/profiles/hardened/linux/x86/2008.0/desktop/make.defaults
new file mode 100644
index 00000000..48a2daf6
--- /dev/null
+++ b/profiles/hardened/linux/x86/2008.0/desktop/make.defaults
@@ -0,0 +1,7 @@
+# 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/2008.0/desktop/make.defaults,v 1.2 2009/08/08 00:55:28 solar Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (06 Aug 2009)
+# Deprecated since 10.0 profiles.
+USE="esd"
diff --git a/profiles/hardened/linux/powerpc/ppc64/desktop/parent b/profiles/hardened/linux/x86/2008.0/desktop/parent
index ad6c5e12..ad6c5e12 100644
--- a/profiles/hardened/linux/powerpc/ppc64/desktop/parent
+++ b/profiles/hardened/linux/x86/2008.0/desktop/parent
diff --git a/profiles/hardened/linux/x86/2008.0/developer/deprecated b/profiles/hardened/linux/x86/2008.0/developer/deprecated
new file mode 100644
index 00000000..6920ba0c
--- /dev/null
+++ b/profiles/hardened/linux/x86/2008.0/developer/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/x86/10.0
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/x86/10.0 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/powerpc/ppc64/developer/parent b/profiles/hardened/linux/x86/2008.0/developer/parent
index 4c893748..4c893748 100644
--- a/profiles/hardened/linux/powerpc/ppc64/developer/parent
+++ b/profiles/hardened/linux/x86/2008.0/developer/parent
diff --git a/profiles/hardened/linux/ia64/make.defaults b/profiles/hardened/linux/x86/2008.0/make.defaults
index a3638e9c..5baa4c83 100644
--- a/profiles/hardened/linux/ia64/make.defaults
+++ b/profiles/hardened/linux/x86/2008.0/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/10.0/make.defaults,v 1.2 2009/09/30 03:08:33 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/2008.0/make.defaults,v 1.2 2008/04/21 20:11:14 phreak Exp $
# STAGE1_USE does not stack
STAGE1_USE="hardened nptl nptlonly pic"
diff --git a/profiles/hardened/linux/x86/2008.0/no-nptl/deprecated b/profiles/hardened/linux/x86/2008.0/no-nptl/deprecated
new file mode 100644
index 00000000..0760bb66
--- /dev/null
+++ b/profiles/hardened/linux/x86/2008.0/no-nptl/deprecated
@@ -0,0 +1,8 @@
+hardened/linux/x86/10.0/no-nptl
+# Example change to hardened/linux/x86/10.0/no-nptl profile:
+# cd /etc
+# rm make.profile
+# ln -s ../usr/portage/profiles/hardened/linux/x86/10.0/no-nptl make.profile
+#
+# 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/x86/2008.0/no-nptl/parent b/profiles/hardened/linux/x86/2008.0/no-nptl/parent
new file mode 100644
index 00000000..0627a62b
--- /dev/null
+++ b/profiles/hardened/linux/x86/2008.0/no-nptl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/no-nptl
diff --git a/profiles/hardened/linux/x86/2008.0/parent b/profiles/hardened/linux/x86/2008.0/parent
new file mode 100644
index 00000000..3c71bf2b
--- /dev/null
+++ b/profiles/hardened/linux/x86/2008.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/2008.0
diff --git a/profiles/hardened/linux/x86/2008.0/server/deprecated b/profiles/hardened/linux/x86/2008.0/server/deprecated
new file mode 100644
index 00000000..6920ba0c
--- /dev/null
+++ b/profiles/hardened/linux/x86/2008.0/server/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/x86/10.0
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/x86/10.0 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/powerpc/ppc64/server/parent b/profiles/hardened/linux/x86/2008.0/server/parent
index c3990165..c3990165 100644
--- a/profiles/hardened/linux/powerpc/ppc64/server/parent
+++ b/profiles/hardened/linux/x86/2008.0/server/parent
diff --git a/profiles/hardened/linux/x86/desktop/parent b/profiles/hardened/linux/x86/desktop/parent
deleted file mode 100644
index 8bd86303..00000000
--- a/profiles/hardened/linux/x86/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/desktop
diff --git a/profiles/hardened/linux/x86/developer/parent b/profiles/hardened/linux/x86/developer/parent
deleted file mode 100644
index b558d905..00000000
--- a/profiles/hardened/linux/x86/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/developer
diff --git a/profiles/hardened/linux/x86/make.defaults b/profiles/hardened/linux/x86/make.defaults
index c2ed50fd..971f5ec0 100644
--- a/profiles/hardened/linux/x86/make.defaults
+++ b/profiles/hardened/linux/x86/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2006 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.7 2009/12/13 21:45:33 remi Exp $
@@ -9,9 +9,7 @@ CHOST="i686-pc-linux-gnu"
CFLAGS="-march=i686 -O2 -pipe"
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="berkdb crypt hardened nptl nptlonly pam pic readline ssl tcpd zlib"
# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
# Defaults for video drivers
diff --git a/profiles/hardened/linux/x86/minimal/make.defaults b/profiles/hardened/linux/x86/minimal/make.defaults
index d66bdee6..41dd0b04 100644
--- a/profiles/hardened/linux/x86/minimal/make.defaults
+++ b/profiles/hardened/linux/x86/minimal/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/minimal/make.defaults,v 1.2 2009/07/09 00:47:49 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/minimal/make.defaults,v 1.3 2010/02/01 11:42:34 gengor Exp $
# - TESTING PROFILE - TESTING PROFILE -
# ------ USE AT YOUR OWN RISK ------
diff --git a/profiles/hardened/linux/x86/no-nptl/parent b/profiles/hardened/linux/x86/no-nptl/parent
deleted file mode 100644
index 0f08e56f..00000000
--- a/profiles/hardened/linux/x86/no-nptl/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../features/no-nptl
diff --git a/profiles/hardened/linux/x86/package.mask b/profiles/hardened/linux/x86/package.mask
index 194f455f..2128a03d 100644
--- a/profiles/hardened/linux/x86/package.mask
+++ b/profiles/hardened/linux/x86/package.mask
@@ -1,6 +1,6 @@
# 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/package.mask,v 1.5 2009/09/12 02:42:34 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/package.mask,v 1.6 2010/05/19 18:07:03 halcy0n Exp $
# These packages do more harm than good on hardened.
# Users with nVidia GPUs must use the OSS "nouveau" or "nv" Xorg drivers.
diff --git a/profiles/hardened/linux/x86/package.use.mask b/profiles/hardened/linux/x86/package.use.mask
index 0b96bb6a..9a625ba7 100644
--- a/profiles/hardened/linux/x86/package.use.mask
+++ b/profiles/hardened/linux/x86/package.use.mask
@@ -1,6 +1,6 @@
# 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/package.use.mask,v 1.12 2009/10/13 23:02:37 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/x86/package.use.mask,v 1.13 2010/02/11 18:39:16 reavertm Exp $
# Maciej Mrozowski <reavertm@gentoo.org> (11 Feb 2010)
# Depends on >=sys-devel/gdb-7.0 which is masked on hardened
diff --git a/profiles/hardened/linux/x86/parent b/profiles/hardened/linux/x86/parent
index 4618d105..03cb31ce 100644
--- a/profiles/hardened/linux/x86/parent
+++ b/profiles/hardened/linux/x86/parent
@@ -1,4 +1,3 @@
../../../base
..
../../../arch/x86
-../../../releases/10.0
diff --git a/profiles/hardened/linux/x86/server/parent b/profiles/hardened/linux/x86/server/parent
deleted file mode 100644
index 9c7a1951..00000000
--- a/profiles/hardened/linux/x86/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../targets/server
diff --git a/profiles/hardened/package.mask b/profiles/hardened/package.mask
index 6a625a97..17b10975 100644
--- a/profiles/hardened/package.mask
+++ b/profiles/hardened/package.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.70 2010/07/14 18:13:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.mask,v 1.71 2010/07/24 11:30:25 blueness Exp $
# Hardened versions of gcc-4.0* through gcc-4.2* are not available.
=sys-devel/gcc-4.0*
@@ -22,6 +22,3 @@
# =sys-devel/gdb-7.0 is not hardened-ready according to xake & Zorry.
# gdb-7.1 works fine.
=sys-devel/gdb-7.0*
-
-# sys-kernel/hardened-sources-2.6.34 in tree for testing Bug 328275
-=sys-kernel/hardened-sources-2.6.34*
diff --git a/profiles/hardened/package.use.mask b/profiles/hardened/package.use.mask
index 8d18277f..07e50249 100644
--- a/profiles/hardened/package.use.mask
+++ b/profiles/hardened/package.use.mask
@@ -1,6 +1,6 @@
# 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.22 2009/08/05 17:52:39 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/package.use.mask,v 1.23 2010/04/10 15:35:30 ssuominen Exp $
sys-devel/gcc -hardened
sys-libs/glibc -hardened
diff --git a/profiles/hardened/ppc/deprecated b/profiles/hardened/ppc/deprecated
index 5f30e79c..d0027215 100644
--- a/profiles/hardened/ppc/deprecated
+++ b/profiles/hardened/ppc/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32
+hardened/linux/powerpc/ppc32/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 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/ppc64/deprecated b/profiles/hardened/ppc64/deprecated
index dc0e177e..9f45ffd5 100644
--- a/profiles/hardened/ppc64/deprecated
+++ b/profiles/hardened/ppc64/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc64/64bit-userland
+hardened/linux/powerpc/ppc64/10.0/64bit-userland
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/64bit-userland profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/64bit-userland 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/x86/2.6/deprecated b/profiles/hardened/x86/2.6/deprecated
index 6073d83c..6920ba0c 100644
--- a/profiles/hardened/x86/2.6/deprecated
+++ b/profiles/hardened/x86/2.6/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/x86
+hardened/linux/x86/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86 profile.
+# Find the number that corresponds with the hardened/linux/x86/10.0 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/x86/deprecated b/profiles/hardened/x86/deprecated
index 6073d83c..6920ba0c 100644
--- a/profiles/hardened/x86/deprecated
+++ b/profiles/hardened/x86/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/x86
+hardened/linux/x86/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86 profile.
+# Find the number that corresponds with the hardened/linux/x86/10.0 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/x86/minimal/deprecated b/profiles/hardened/x86/minimal/deprecated
index 6073d83c..6920ba0c 100644
--- a/profiles/hardened/x86/minimal/deprecated
+++ b/profiles/hardened/x86/minimal/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/x86
+hardened/linux/x86/10.0
# Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86 profile.
+# Find the number that corresponds with the hardened/linux/x86/10.0 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/x86/package.use.mask b/profiles/hardened/x86/package.use.mask
index c907f172..074f5e77 100644
--- a/profiles/hardened/x86/package.use.mask
+++ b/profiles/hardened/x86/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 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/x86/package.use.mask,v 1.11 2009/08/05 15:02:47 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/package.use.mask,v 1.13 2010/04/08 13:40:31 ssuominen Exp $
# Raúl Porcel <armin76@gentoo.org> (02 Dec 2008)
media-libs/realcodecs win32codecs
@@ -18,6 +18,5 @@ dev-libs/cyrus-sasl berkdb
>=dev-java/ibm-jdk-bin-1.5 -nsplugin
>=dev-java/ibm-jre-bin-1.5 -nsplugin
-
# missing the necessary linux-headers dep
>=net-fs/netatalk-2.0.3-r3 xfs