Get rid of 10.0 versioning in hardened/linux/powerpc/ppc64 profile path

69 files changed, 123 insertions, 157 deletions

diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated
index 1bd211dc..b25f8f8c 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc64/10.0/32bit-userland
+hardened/linux/powerpc/ppc64/32bit-userland
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/32bit-userland profile.
+# 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
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated
index 1bd211dc..b25f8f8c 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/desktop/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc64/10.0/32bit-userland
+hardened/linux/powerpc/ppc64/32bit-userland
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/32bit-userland profile.
+# 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
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 fae96e8d..9390cd89 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/2008.0/32bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated
index 1bd211dc..b25f8f8c 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/developer/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc64/10.0/32bit-userland
+hardened/linux/powerpc/ppc64/32bit-userland
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/32bit-userland profile.
+# 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
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 4bb06e40..739881d3 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 7947ae88..c7a73069 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/2008.0/32bit-userland/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated
index 1bd211dc..b25f8f8c 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/deprecated
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/server/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/powerpc/ppc64/10.0/32bit-userland
+hardened/linux/powerpc/ppc64/32bit-userland
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/powerpc/ppc64/10.0/32bit-userland profile.
+# 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
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 8c11cb52..557cf07e 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/32bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/10.0/32bit-userland/use.mask
deleted file mode 100644
index 9b09de2d..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.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/10.0/64bit-userland/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/deprecated
new file mode 100644
index 00000000..dc0e177e
--- /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 00000000..dc0e177e
--- /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 fae96e8d..15f582cb 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 00000000..dc0e177e
--- /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 4bb06e40..87a3f75b 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 2479a24f..675b3fbe 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 00000000..dc0e177e
--- /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 8c11cb52..e4a49f12 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/use.mask b/profiles/hardened/linux/powerpc/ppc64/10.0/64bit-userland/use.mask
deleted file mode 100644
index 6c918ff2..00000000
--- a/profiles/hardened/linux/powerpc/ppc64/10.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/10.0/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/deprecated
new file mode 100644
index 00000000..dc0e177e
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/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/desktop/deprecated b/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/deprecated
new file mode 100644
index 00000000..dc0e177e
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/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/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/desktop/parent
index db8ce088..322001d0 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 00000000..dc0e177e
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/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/developer/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/developer/parent
index 5c8258a7..0d57019c 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 8ae9641a..f3229c5b 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 00000000..dc0e177e
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/10.0/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/server/parent b/profiles/hardened/linux/powerpc/ppc64/10.0/server/parent
index 2e085a6e..375b20d8 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/desktop/make.defaults b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/desktop/make.defaults
deleted file mode 100644
index 848d59aa..00000000
--- 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 fae96e8d..00000000
--- 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/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/developer/parent
deleted file mode 100644
index 4bb06e40..00000000
--- 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/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/parent
deleted file mode 100644
index 7947ae88..00000000
--- 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/parent b/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/server/parent
deleted file mode 100644
index 8c11cb52..00000000
--- 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 9b09de2d..00000000
--- 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 9f45ffd5..00000000
--- 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 9f45ffd5..00000000
--- 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 409a68e0..00000000
--- 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 fae96e8d..00000000
--- 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 9f45ffd5..00000000
--- 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 4bb06e40..00000000
--- 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 2479a24f..00000000
--- 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 9f45ffd5..00000000
--- 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 8c11cb52..00000000
--- 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 6c918ff2..00000000
--- 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 39ec233b..00000000
--- 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 465abd5f..00000000
--- 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 465abd5f..00000000
--- 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 69b65658..00000000
--- 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 465abd5f..00000000
--- 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 41e5ffd5..00000000
--- 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 cfe87f7a..00000000
--- 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 465abd5f..00000000
--- 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/ppc64/2008.0/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent
index db8ce088..db8ce088 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/desktop/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/desktop/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent
index 5c8258a7..5c8258a7 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/developer/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/developer/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/2008.0/32bit-userland/make.defaults b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/make.defaults
index c6fedb2a..abfc5225 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.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/2008.0/32bit-userland/make.defaults,v 1.1 2008/04/01 17:41:23 wolf31o2 Exp $
+# $Header: $
 
 # 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 00000000..926c3281
--- /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/ppc64/2008.0/server/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent
index 2e085a6e..2e085a6e 100644
--- a/profiles/hardened/linux/powerpc/ppc64/2008.0/server/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/server/parent
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
new file mode 100644
index 00000000..6a0e089f
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/use.mask
@@ -0,0 +1,6 @@
+# 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/desktop/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent
new file mode 100644
index 00000000..db8ce088
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent
new file mode 100644
index 00000000..5c8258a7
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/developer
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 00000000..52bcba73
--- /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/64bit-userland/server/parent b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent
new file mode 100644
index 00000000..2e085a6e
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/server
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
new file mode 100644
index 00000000..bce140ff
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/use.mask
@@ -0,0 +1,6 @@
+# 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
new file mode 100644
index 00000000..b681e1c8
--- /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: $
+
+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 00000000..ad6c5e12
--- /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 00000000..4c893748
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/developer
diff --git a/profiles/hardened/linux/powerpc/ppc64/make.defaults b/profiles/hardened/linux/powerpc/ppc64/make.defaults
new file mode 100644
index 00000000..753fde53
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/make.defaults
@@ -0,0 +1,8 @@
+# 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 7990a758..e91922d6 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 00000000..c3990165
--- /dev/null
+++ b/profiles/hardened/linux/powerpc/ppc64/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/server
diff --git a/profiles/hardened/ppc64/deprecated b/profiles/hardened/ppc64/deprecated
index 9f45ffd5..dc0e177e 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 8b622a72..36165504 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -246,8 +246,8 @@ amd64		hardened/linux/amd64					stable
 amd64		hardened/linux/amd64/no-multilib			dev
 ia64		hardened/linux/ia64/10.0				dev
 ppc		hardened/linux/powerpc/ppc32				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/ppc64/32bit-userland		dev
+ppc64		hardened/linux/powerpc/ppc64/64bit-userland		dev
 x86		hardened/linux/x86					stable
 
 # selinux profiles