Get rid of 10.0 versioning in hardened/linux/x86 profile path

25 files changed, 33 insertions, 53 deletions

diff --git a/profiles/hardened/linux/x86/2008.0/deprecated b/profiles/hardened/linux/x86/10.0/deprecated
index 6920ba0c..6073d83c 100644
--- a/profiles/hardened/linux/x86/2008.0/deprecated
+++ b/profiles/hardened/linux/x86/10.0/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/x86/10.0
+hardened/linux/x86
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86/10.0 profile.
+# 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
diff --git a/profiles/hardened/linux/x86/2008.0/desktop/deprecated b/profiles/hardened/linux/x86/10.0/desktop/deprecated
index 6920ba0c..6073d83c 100644
--- a/profiles/hardened/linux/x86/2008.0/desktop/deprecated
+++ b/profiles/hardened/linux/x86/10.0/desktop/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/x86/10.0
+hardened/linux/x86
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86/10.0 profile.
+# 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
diff --git a/profiles/hardened/linux/x86/10.0/desktop/parent b/profiles/hardened/linux/x86/10.0/desktop/parent
index ad6c5e12..e33d6474 100644
--- a/profiles/hardened/linux/x86/10.0/desktop/parent
+++ b/profiles/hardened/linux/x86/10.0/desktop/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/desktop
+/../../desktop
diff --git a/profiles/hardened/linux/x86/2008.0/developer/deprecated b/profiles/hardened/linux/x86/10.0/developer/deprecated
index 6920ba0c..6073d83c 100644
--- a/profiles/hardened/linux/x86/2008.0/developer/deprecated
+++ b/profiles/hardened/linux/x86/10.0/developer/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/x86/10.0
+hardened/linux/x86
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86/10.0 profile.
+# 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
diff --git a/profiles/hardened/linux/x86/10.0/developer/parent b/profiles/hardened/linux/x86/10.0/developer/parent
index 4c893748..0d57019c 100644
--- a/profiles/hardened/linux/x86/10.0/developer/parent
+++ b/profiles/hardened/linux/x86/10.0/developer/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/developer
+../../developer
diff --git a/profiles/hardened/linux/x86/2008.0/server/deprecated b/profiles/hardened/linux/x86/10.0/no-nptl/deprecated
index 6920ba0c..6073d83c 100644
--- a/profiles/hardened/linux/x86/2008.0/server/deprecated
+++ b/profiles/hardened/linux/x86/10.0/no-nptl/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/x86/10.0
+hardened/linux/x86
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/x86/10.0 profile.
+# 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
diff --git a/profiles/hardened/linux/x86/10.0/no-nptl/parent b/profiles/hardened/linux/x86/10.0/no-nptl/parent
index 0627a62b..67b5c970 100644
--- a/profiles/hardened/linux/x86/10.0/no-nptl/parent
+++ b/profiles/hardened/linux/x86/10.0/no-nptl/parent
@@ -1,2 +1 @@
-..
-../../../../../features/no-nptl
+../../no-nptl
diff --git a/profiles/hardened/linux/x86/10.0/parent b/profiles/hardened/linux/x86/10.0/parent
index 605d0438..f3229c5b 100644
--- a/profiles/hardened/linux/x86/10.0/parent
+++ b/profiles/hardened/linux/x86/10.0/parent
@@ -1,2 +1 @@
 ..
-../../../../releases/10.0
diff --git a/profiles/hardened/linux/x86/10.0/server/deprecated b/profiles/hardened/linux/x86/10.0/server/deprecated
new file mode 100644
index 00000000..6073d83c
--- /dev/null
+++ b/profiles/hardened/linux/x86/10.0/server/deprecated
@@ -0,0 +1,7 @@
+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 c3990165..375b20d8 100644
--- a/profiles/hardened/linux/x86/10.0/server/parent
+++ b/profiles/hardened/linux/x86/10.0/server/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/server
+../../server
diff --git a/profiles/hardened/linux/x86/2008.0/desktop/make.defaults b/profiles/hardened/linux/x86/2008.0/desktop/make.defaults
deleted file mode 100644
index 48a2daf6..00000000
--- a/profiles/hardened/linux/x86/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/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/x86/2008.0/desktop/parent b/profiles/hardened/linux/x86/2008.0/desktop/parent
deleted file mode 100644
index ad6c5e12..00000000
--- a/profiles/hardened/linux/x86/2008.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/hardened/linux/x86/2008.0/developer/parent b/profiles/hardened/linux/x86/2008.0/developer/parent
deleted file mode 100644
index 4c893748..00000000
--- a/profiles/hardened/linux/x86/2008.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/hardened/linux/x86/2008.0/make.defaults b/profiles/hardened/linux/x86/2008.0/make.defaults
deleted file mode 100644
index 5baa4c83..00000000
--- a/profiles/hardened/linux/x86/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/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"
-
-USE="-unicode"
diff --git a/profiles/hardened/linux/x86/2008.0/no-nptl/deprecated b/profiles/hardened/linux/x86/2008.0/no-nptl/deprecated
deleted file mode 100644
index 0760bb66..00000000
--- a/profiles/hardened/linux/x86/2008.0/no-nptl/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 0627a62b..00000000
--- a/profiles/hardened/linux/x86/2008.0/no-nptl/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/no-nptl
diff --git a/profiles/hardened/linux/x86/2008.0/parent b/profiles/hardened/linux/x86/2008.0/parent
deleted file mode 100644
index 3c71bf2b..00000000
--- a/profiles/hardened/linux/x86/2008.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/2008.0
diff --git a/profiles/hardened/linux/x86/2008.0/server/parent b/profiles/hardened/linux/x86/2008.0/server/parent
deleted file mode 100644
index c3990165..00000000
--- a/profiles/hardened/linux/x86/2008.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/hardened/linux/x86/desktop/parent b/profiles/hardened/linux/x86/desktop/parent
new file mode 100644
index 00000000..8bd86303
--- /dev/null
+++ b/profiles/hardened/linux/x86/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/desktop
diff --git a/profiles/hardened/linux/x86/developer/parent b/profiles/hardened/linux/x86/developer/parent
new file mode 100644
index 00000000..b558d905
--- /dev/null
+++ b/profiles/hardened/linux/x86/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/developer
diff --git a/profiles/hardened/linux/x86/make.defaults b/profiles/hardened/linux/x86/make.defaults
index 971f5ec0..c2ed50fd 100644
--- a/profiles/hardened/linux/x86/make.defaults
+++ b/profiles/hardened/linux/x86/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 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/x86/make.defaults,v 1.7 2009/12/13 21:45:33 remi Exp $
 
@@ -9,7 +9,9 @@ CHOST="i686-pc-linux-gnu"
 CFLAGS="-march=i686 -O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 
-USE="berkdb crypt hardened nptl nptlonly pam pic readline ssl tcpd zlib"
+# STAGE1_USE does not stack
+STAGE1_USE="hardened nptl nptlonly pic"
+USE="berkdb crypt hardened nptl nptlonly pam pic readline ssl tcpd zlib -unicode"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
diff --git a/profiles/hardened/linux/x86/no-nptl/parent b/profiles/hardened/linux/x86/no-nptl/parent
new file mode 100644
index 00000000..0f08e56f
--- /dev/null
+++ b/profiles/hardened/linux/x86/no-nptl/parent
@@ -0,0 +1,2 @@
+..
+../../../../features/no-nptl
diff --git a/profiles/hardened/linux/x86/parent b/profiles/hardened/linux/x86/parent
index 03cb31ce..4618d105 100644
--- a/profiles/hardened/linux/x86/parent
+++ b/profiles/hardened/linux/x86/parent
@@ -1,3 +1,4 @@
 ../../../base
 ..
 ../../../arch/x86
+../../../releases/10.0
diff --git a/profiles/hardened/linux/x86/server/parent b/profiles/hardened/linux/x86/server/parent
new file mode 100644
index 00000000..9c7a1951
--- /dev/null
+++ b/profiles/hardened/linux/x86/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/server
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 7357b0e9..833acbd7 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -248,7 +248,7 @@ ia64		hardened/linux/ia64/10.0				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
-x86		hardened/linux/x86/10.0					stable
+x86		hardened/linux/x86					stable
 
 # selinux profiles
 amd64		selinux/2007.0/amd64				dev