Updated hardened powerpc profiles, bug #344861

91 files changed, 252 insertions, 226 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 482b579edbb5..90d0be387ad4 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,120 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4785 2010/11/14 15:22:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4786 2010/11/14 15:44:23 blueness Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  14 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+  +hardened/linux/powerpc/ppc32/10.0/deprecated,
+  +hardened/linux/powerpc/ppc32/10.0/desktop/deprecated,
+  hardened/linux/powerpc/ppc32/10.0/desktop/parent,
+  +hardened/linux/powerpc/ppc32/10.0/developer/deprecated,
+  hardened/linux/powerpc/ppc32/10.0/developer/parent,
+  -hardened/linux/powerpc/ppc32/10.0/make.defaults,
+  hardened/linux/powerpc/ppc32/10.0/parent,
+  +hardened/linux/powerpc/ppc32/10.0/server/deprecated,
+  hardened/linux/powerpc/ppc32/10.0/server/parent,
+  -hardened/linux/powerpc/ppc32/2008.0/deprecated,
+  -hardened/linux/powerpc/ppc32/2008.0/desktop/deprecated,
+  -hardened/linux/powerpc/ppc32/2008.0/desktop/make.defaults,
+  -hardened/linux/powerpc/ppc32/2008.0/desktop/parent,
+  -hardened/linux/powerpc/ppc32/2008.0/developer/deprecated,
+  -hardened/linux/powerpc/ppc32/2008.0/developer/parent,
+  -hardened/linux/powerpc/ppc32/2008.0/make.defaults,
+  -hardened/linux/powerpc/ppc32/2008.0/parent,
+  -hardened/linux/powerpc/ppc32/2008.0/server/deprecated,
+  -hardened/linux/powerpc/ppc32/2008.0/server/parent,
+  +hardened/linux/powerpc/ppc32/desktop/parent,
+  +hardened/linux/powerpc/ppc32/developer/parent,
+  +hardened/linux/powerpc/ppc32/make.defaults,
+  hardened/linux/powerpc/ppc32/parent,
+  +hardened/linux/powerpc/ppc32/server/parent,
+  +hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated,
+  +hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/parent,
+  +hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/parent,
+  -hardened/linux/powerpc/ppc64/10.0/32bit-userland/make.defaults,
+  hardened/linux/powerpc/ppc64/10.0/32bit-userland/parent,
+  +hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/parent,
+  -hardened/linux/powerpc/ppc64/10.0/32bit-userland/use.mask,
+  +hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated,
+  +hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/parent,
+  +hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/parent,
+  hardened/linux/powerpc/ppc64/10.0/64bit-userland/parent,
+  +hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/parent,
+  -hardened/linux/powerpc/ppc64/10.0/64bit-userland/use.mask,
+  -hardened/linux/powerpc/ppc64/10.0/64bit-userland/virtuals,
+  +hardened/linux/powerpc/ppc64/10.0/deprecated,
+  +hardened/linux/powerpc/ppc64/10.0/desktop/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/desktop/parent,
+  +hardened/linux/powerpc/ppc64/10.0/developer/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/developer/parent,
+  -hardened/linux/powerpc/ppc64/10.0/make.defaults,
+  hardened/linux/powerpc/ppc64/10.0/parent,
+  +hardened/linux/powerpc/ppc64/10.0/server/deprecated,
+  hardened/linux/powerpc/ppc64/10.0/server/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/make.defaults,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/make.defaults,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask,
+  -hardened/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals,
+  -hardened/linux/powerpc/ppc64/2008.0/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/desktop/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/desktop/make.defaults,
+  -hardened/linux/powerpc/ppc64/2008.0/desktop/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/developer/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/developer/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/make.defaults,
+  -hardened/linux/powerpc/ppc64/2008.0/parent,
+  -hardened/linux/powerpc/ppc64/2008.0/server/deprecated,
+  -hardened/linux/powerpc/ppc64/2008.0/server/parent,
+  +hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent,
+  +hardened/linux/powerpc/ppc64/32bit-userland/developer/parent,
+  +hardened/linux/powerpc/ppc64/32bit-userland/make.defaults,
+  +hardened/linux/powerpc/ppc64/32bit-userland/parent,
+  +hardened/linux/powerpc/ppc64/32bit-userland/server/parent,
+  +hardened/linux/powerpc/ppc64/32bit-userland/use.mask,
+  +hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent,
+  +hardened/linux/powerpc/ppc64/64bit-userland/developer/parent,
+  +hardened/linux/powerpc/ppc64/64bit-userland/parent,
+  +hardened/linux/powerpc/ppc64/64bit-userland/server/parent,
+  +hardened/linux/powerpc/ppc64/64bit-userland/use.mask,
+  +hardened/linux/powerpc/ppc64/64bit-userland/virtuals,
+  +hardened/linux/powerpc/ppc64/desktop/parent,
+  +hardened/linux/powerpc/ppc64/developer/parent,
+  +hardened/linux/powerpc/ppc64/make.defaults,
+  hardened/linux/powerpc/ppc64/parent,
+  +hardened/linux/powerpc/ppc64/server/parent, hardened/ppc/deprecated,
+  hardened/ppc64/deprecated, profiles.desc:
+  Update profiles, bug #344861
+  hardened/linux/powerpc/ppc32 
+  hardened/linux/powerpc/ppc64/32bit-userland
+  hardened/linux/powerpc/ppc64/64bit-userland
+
   14 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Lastrite sys-apps/slocate wrt #338380.
 
diff --git a/profiles/hardened/linux/powerpc/ppc32/2008.0/developer/deprecated b/profiles/hardened/linux/powerpc/ppc32/10.0/deprecated
index d002721574ab..5f30e79cc8e5 100644
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/developer/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32/10.0
+hardened/linux/powerpc/ppc32
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32 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/deprecated b/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/deprecated
index d002721574ab..5f30e79cc8e5 100644
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32/10.0
+hardened/linux/powerpc/ppc32
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32 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/parent b/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/parent
index db8ce088c69a..322001d09da5 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/desktop/parent
@@ -1,2 +1 @@
-..
-../../../../../../targets/desktop
+../../desktop
diff --git a/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc32/10.0/developer/deprecated
index d002721574ab..5f30e79cc8e5 100644
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/developer/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32/10.0
+hardened/linux/powerpc/ppc32
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32 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/developer/parent b/profiles/hardened/linux/powerpc/ppc32/10.0/developer/parent
index 5c8258a71e32..0d57019c243b 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/developer/parent
@@ -1,2 +1 @@
-..
-../../../../../../targets/developer
+../../developer
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/parent b/profiles/hardened/linux/powerpc/ppc32/10.0/parent
index 8ae9641a4546..f3229c5b9876 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/parent
@@ -1,2 +1 @@
 ..
-../../../../../releases/10.0
diff --git a/profiles/hardened/linux/powerpc/ppc32/2008.0/server/deprecated b/profiles/hardened/linux/powerpc/ppc32/10.0/server/deprecated
index d002721574ab..5f30e79cc8e5 100644
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/server/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/server/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32/10.0
+hardened/linux/powerpc/ppc32
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32 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/server/parent b/profiles/hardened/linux/powerpc/ppc32/10.0/server/parent
index 2e085a6e45cc..375b20d80d4a 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/10.0/server/parent
@@ -1,2 +1 @@
-..
-../../../../../../targets/server
+../../server
diff --git a/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/make.defaults b/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/make.defaults
deleted file mode 100644
index 9c28a8cf6186..000000000000
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/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/ppc32/2008.0/make.defaults b/profiles/hardened/linux/powerpc/ppc32/2008.0/make.defaults
deleted file mode 100644
index 5f09c4da1687..000000000000
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/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
deleted file mode 100644
index cfe87f7ad5be..000000000000
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/2008.0
diff --git a/profiles/hardened/linux/powerpc/ppc32/desktop/parent b/profiles/hardened/linux/powerpc/ppc32/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc32/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc32/developer/parent b/profiles/hardened/linux/powerpc/ppc32/developer/parent
new file mode 100644
index 000000000000..4c893748ce71
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc32/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc32/10.0/make.defaults b/profiles/hardened/linux/powerpc/ppc32/make.defaults
index 0e326f940cca..ab785cf007c3 100644
--- a/profiles/hardened/linux/powerpc/ppc32/10.0/make.defaults
+++ b/profiles/hardened/linux/powerpc/ppc32/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation.
+# Copyright 1999-2010 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/10.0/make.defaults,v 1.2 2009/09/30 03:08:35 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc32/make.defaults,v 1.1 2010/11/14 15:44:23 blueness Exp $
 
 # STAGE1_USE does not stack
 STAGE1_USE="hardened nptl nptlonly pic"
diff --git a/profiles/hardened/linux/powerpc/ppc32/parent b/profiles/hardened/linux/powerpc/ppc32/parent
index dd20c2a8cf39..356ef4b7bcb7 100644
--- a/profiles/hardened/linux/powerpc/ppc32/parent
+++ b/profiles/hardened/linux/powerpc/ppc32/parent
@@ -1,2 +1,3 @@
 ..
 ../../../../arch/powerpc/ppc32
+../../../../releases/10.0
diff --git a/profiles/hardened/linux/powerpc/ppc32/server/parent b/profiles/hardened/linux/powerpc/ppc32/server/parent
new file mode 100644
index 000000000000..c39901657c87
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc32/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated
new file mode 100644
index 000000000000..b25f8f8c17ae
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000000..b25f8f8c17ae
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated
@@ -0,0 +1,7 @@
+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 fae96e8d36b2..9390cd8940e9 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,2 +1 @@
-..
-../../../../../../../targets/desktop
+../../../32bit-userland/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
new file mode 100644
index 000000000000..b25f8f8c17ae
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated
@@ -0,0 +1,7 @@
+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 4bb06e409236..739881d38b20 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,2 +1 @@
-..
-../../../../../../../targets/developer
+../../../32bit-userland/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 7947ae88c017..c7a73069a4a3 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/parent
@@ -1,2 +1 @@
-..
-../../../../../../features/32bit-userland
+../../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
new file mode 100644
index 000000000000..b25f8f8c17ae
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated
@@ -0,0 +1,7 @@
+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 8c11cb52782f..557cf07eb3cb 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,2 +1 @@
-..
-../../../../../../../targets/server
+../../../32bit-userland/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated
new file mode 100644
index 000000000000..dc0e177ecc70
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000000..dc0e177ecc70
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/desktop/deprecated
@@ -0,0 +1,7 @@
+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 fae96e8d36b2..15f582cba386 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,2 +1 @@
-..
-../../../../../../../targets/desktop
+../../../64bit-userland/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
new file mode 100644
index 000000000000..dc0e177ecc70
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/developer/deprecated
@@ -0,0 +1,7 @@
+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 4bb06e409236..87a3f75b984e 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,2 +1 @@
-..
-../../../../../../../targets/developer
+../../../64bit-userland/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 2479a24f890a..675b3fbedb75 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/parent
@@ -1,2 +1 @@
-..
-../../../../../../features/64bit-native
+../../64bit-userland
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
new file mode 100644
index 000000000000..dc0e177ecc70
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/server/deprecated
@@ -0,0 +1,7 @@
+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 8c11cb52782f..e4a49f12d4ed 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,2 +1 @@
-..
-../../../../../../../targets/server
+../../../64bit-userland/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/virtuals b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/virtuals
deleted file mode 100644
index 64956b2f74ec..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/10.0/64bit-userland/virtuals,v 1.1 2009/08/06 08:07:11 ssuominen Exp $
-
-virtual/bootloader     sys-boot/yaboot-static
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/deprecated
new file mode 100644
index 000000000000..e2094fd68530
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64 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
new file mode 100644
index 000000000000..e2094fd68530
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64 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 db8ce088c69a..322001d09da5 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/parent
@@ -1,2 +1 @@
-..
-../../../../../../targets/desktop
+../../desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/developer/deprecated
new file mode 100644
index 000000000000..e2094fd68530
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/developer/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64 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 5c8258a71e32..0d57019c243b 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/developer/parent
@@ -1,2 +1 @@
-..
-../../../../../../targets/developer
+../../developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/parent
index 8ae9641a4546..f3229c5b9876 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/parent
@@ -1,2 +1 @@
 ..
-../../../../../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
new file mode 100644
index 000000000000..e2094fd68530
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/server/deprecated
@@ -0,0 +1,7 @@
+hardened/linux/powerpc/ppc64
+# Check 'eselect profile list'.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc64 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 2e085a6e45cc..375b20d80d4a 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/server/parent
@@ -1,2 +1 @@
-..
-../../../../../../targets/server
+../../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
deleted file mode 100644
index 1bd211dc9cf0..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 1bd211dc9cf0..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 848d59aadf1c..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/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
deleted file mode 100644
index fae96e8d36b2..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../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
deleted file mode 100644
index 1bd211dc9cf0..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 4bb06e409236..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults
deleted file mode 100644
index c6fedb2a2c50..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/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.
-
-ACCEPT_KEYWORDS="-* ${ARCH}"
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent
deleted file mode 100644
index 7947ae88c017..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../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
deleted file mode 100644
index 1bd211dc9cf0..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 8c11cb52782f..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../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
deleted file mode 100644
index 9b09de2deaf0..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index 9f45ffd55b54..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 9f45ffd55b54..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 409a68e0f2c9..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/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
deleted file mode 100644
index fae96e8d36b2..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../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
deleted file mode 100644
index 9f45ffd55b54..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 4bb06e409236..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../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
deleted file mode 100644
index 2479a24f890a..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../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
deleted file mode 100644
index 9f45ffd55b54..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/deprecated
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 8c11cb52782f..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../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
deleted file mode 100644
index 6c918ff219d7..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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
deleted file mode 100644
index 39ec233b50ff..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/64bit-userland/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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
deleted file mode 100644
index 465abd5f4b55..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 465abd5f4b55..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 69b65658d5f0..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/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/2008.0/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/deprecated
deleted file mode 100644
index 465abd5f4b55..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-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/make.defaults b/profiles/hardened/linux/powerpc/ppc64/2008.0/make.defaults
deleted file mode 100644
index 41e5ffd51998..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/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
deleted file mode 100644
index cfe87f7ad5be..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../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
deleted file mode 100644
index 465abd5f4b55..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/server/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-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/ppc32/2008.0/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent
index db8ce088c69a..db8ce088c69a 100644
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent
diff --git a/profiles/hardened/linux/powerpc/ppc32/2008.0/developer/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent
index 5c8258a71e32..5c8258a71e32 100644
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults
index 71ca74da6b5d..d0804caa06cd 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/make.defaults
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/make.defaults,v 1.1 2009/08/06 08:07:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults,v 1.1 2010/11/14 15:44:27 blueness 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/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
new file mode 100644
index 000000000000..926c3281b862
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/32bit-userland
diff --git a/profiles/hardened/linux/powerpc/ppc32/2008.0/server/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent
index 2e085a6e45cc..2e085a6e45cc 100644
--- a/profiles/hardened/linux/powerpc/ppc32/2008.0/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
index 9b09de2deaf0..9b09de2deaf0 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent
index db8ce088c69a..db8ce088c69a 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent
index 5c8258a71e32..5c8258a71e32 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
new file mode 100644
index 000000000000..52bcba73e7a5
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/64bit-native
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/server/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent
index 2e085a6e45cc..2e085a6e45cc 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
index 6c918ff219d7..6c918ff219d7 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/use.mask
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals
new file mode 100644
index 000000000000..7ebd1c2cd918
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals
@@ -0,0 +1,5 @@
+# Copyright 1999-2010 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals,v 1.1 2010/11/14 15:44:27 blueness Exp $
+
+virtual/bootloader	sys-boot/yaboot-static
diff --git a/profiles/hardened/linux/powerpc/ppc64/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/desktop/parent
new file mode 100644
index 000000000000..ad6c5e126fbb
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/developer/parent b/profiles/hardened/linux/powerpc/ppc64/developer/parent
new file mode 100644
index 000000000000..4c893748ce71
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/10.0/make.defaults b/profiles/hardened/linux/powerpc/ppc64/make.defaults
index cd57ab8e75fa..8f514b951f79 100644
--- a/profiles/hardened/linux/powerpc/ppc64/10.0/make.defaults
+++ b/profiles/hardened/linux/powerpc/ppc64/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation.
+# Copyright 1999-2010 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/10.0/make.defaults,v 1.2 2009/09/30 03:08:37 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/make.defaults,v 1.1 2010/11/14 15:44:24 blueness Exp $
 
 # STAGE1_USE does not stack
 STAGE1_USE="hardened nptl nptlonly pic"
diff --git a/profiles/hardened/linux/powerpc/ppc64/parent b/profiles/hardened/linux/powerpc/ppc64/parent
index 7990a758ccce..e91922d67fbe 100644
--- a/profiles/hardened/linux/powerpc/ppc64/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/parent
@@ -1,3 +1,4 @@
 ..
 ../../../../arch/powerpc/ppc64/64ul
 ../../../../features/64bit-native
+../../../../releases/10.0
diff --git a/profiles/hardened/linux/powerpc/ppc64/server/parent b/profiles/hardened/linux/powerpc/ppc64/server/parent
new file mode 100644
index 000000000000..c39901657c87
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/server
diff --git a/profiles/hardened/ppc/deprecated b/profiles/hardened/ppc/deprecated
index d002721574ab..5f30e79cc8e5 100644
--- a/profiles/hardened/ppc/deprecated
+++ b/profiles/hardened/ppc/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc32/10.0
+hardened/linux/powerpc/ppc32
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc32/10.0 profile.
+# Find the number that corresponds with the hardened/linux/powerpc/ppc32 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 9f45ffd55b54..dc0e177ecc70 100644
--- a/profiles/hardened/ppc64/deprecated
+++ b/profiles/hardened/ppc64/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc64/10.0/64bit-userland
+hardened/linux/powerpc/ppc64/64bit-userland
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/64bit-userland profile.
+# 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
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 8645a126c7ec..8fd50347b0a8 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -155,9 +155,9 @@ x86-fbsd	default/bsd/fbsd/x86/8.0			dev
 amd64		hardened/linux/amd64/10.0				stable
 amd64		hardened/linux/amd64/10.0/no-multilib			dev
 ia64		hardened/linux/ia64					dev
-ppc		hardened/linux/powerpc/ppc32/10.0			dev
-ppc		hardened/linux/powerpc/ppc64/10.0/32bit-userland	dev
-ppc64		hardened/linux/powerpc/ppc64/10.0/64bit-userland	dev
+ppc		hardened/linux/powerpc/ppc32				dev
+ppc		hardened/linux/powerpc/ppc64/32bit-userland		dev
+ppc64		hardened/linux/powerpc/ppc64/64bit-userland		dev
 x86		hardened/linux/x86/10.0					stable
 
 # selinux profiles