Updated hardened/linux/ia64 profiles, bug #344861

19 files changed, 22 insertions, 34 deletions

diff --git a/profiles/hardened/ia64/deprecated b/profiles/hardened/ia64/deprecated
index b55ccb7d5ab1..336eef15029c 100644
--- a/profiles/hardened/ia64/deprecated
+++ b/profiles/hardened/ia64/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/ia64/10.0
+hardened/linux/ia64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/ia64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/ia64 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/ia64/2008.0/deprecated b/profiles/hardened/linux/ia64/10.0/deprecated
index b55ccb7d5ab1..336eef15029c 100644
--- a/profiles/hardened/linux/ia64/2008.0/deprecated
+++ b/profiles/hardened/linux/ia64/10.0/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/ia64/10.0
+hardened/linux/ia64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/ia64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/ia64 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/ia64/2008.0/desktop/deprecated b/profiles/hardened/linux/ia64/10.0/desktop/deprecated
index b55ccb7d5ab1..336eef15029c 100644
--- a/profiles/hardened/linux/ia64/2008.0/desktop/deprecated
+++ b/profiles/hardened/linux/ia64/10.0/desktop/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/ia64/10.0
+hardened/linux/ia64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/ia64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/ia64 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/ia64/10.0/desktop/parent b/profiles/hardened/linux/ia64/10.0/desktop/parent
index ad6c5e126fbb..322001d09da5 100644
--- a/profiles/hardened/linux/ia64/10.0/desktop/parent
+++ b/profiles/hardened/linux/ia64/10.0/desktop/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/desktop
+../../desktop
diff --git a/profiles/hardened/linux/ia64/2008.0/developer/deprecated b/profiles/hardened/linux/ia64/10.0/developer/deprecated
index b55ccb7d5ab1..336eef15029c 100644
--- a/profiles/hardened/linux/ia64/2008.0/developer/deprecated
+++ b/profiles/hardened/linux/ia64/10.0/developer/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/ia64/10.0
+hardened/linux/ia64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/ia64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/ia64 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/ia64/10.0/developer/parent b/profiles/hardened/linux/ia64/10.0/developer/parent
index 4c893748ce71..0d57019c243b 100644
--- a/profiles/hardened/linux/ia64/10.0/developer/parent
+++ b/profiles/hardened/linux/ia64/10.0/developer/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/developer
+../../developer
diff --git a/profiles/hardened/linux/ia64/10.0/parent b/profiles/hardened/linux/ia64/10.0/parent
index 605d0438e49e..f3229c5b9876 100644
--- a/profiles/hardened/linux/ia64/10.0/parent
+++ b/profiles/hardened/linux/ia64/10.0/parent
@@ -1,2 +1 @@
 ..
-../../../../releases/10.0
diff --git a/profiles/hardened/linux/ia64/2008.0/server/deprecated b/profiles/hardened/linux/ia64/10.0/server/deprecated
index b55ccb7d5ab1..336eef15029c 100644
--- a/profiles/hardened/linux/ia64/2008.0/server/deprecated
+++ b/profiles/hardened/linux/ia64/10.0/server/deprecated
@@ -1,6 +1,6 @@
-hardened/linux/ia64/10.0
+hardened/linux/ia64
 # Check 'eselect profile list'.
-# Find the number that corresponds with the hardened/linux/ia64/10.0 profile.
+# Find the number that corresponds with the hardened/linux/ia64 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/ia64/10.0/server/parent b/profiles/hardened/linux/ia64/10.0/server/parent
index c39901657c87..375b20d80d4a 100644
--- a/profiles/hardened/linux/ia64/10.0/server/parent
+++ b/profiles/hardened/linux/ia64/10.0/server/parent
@@ -1,2 +1 @@
-..
-../../../../../targets/server
+../../server
diff --git a/profiles/hardened/linux/ia64/2008.0/desktop/make.defaults b/profiles/hardened/linux/ia64/2008.0/desktop/make.defaults
deleted file mode 100644
index 42abb4295015..000000000000
--- a/profiles/hardened/linux/ia64/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/ia64/2008.0/desktop/make.defaults,v 1.1 2009/08/06 17:59:29 ssuominen Exp $
-
-# Samuli Suominen <ssuominen@gentoo.org> (06 Aug 2009)
-# Deprecated since 10.0 profiles.
-USE="esd qt3"
diff --git a/profiles/hardened/linux/ia64/2008.0/desktop/parent b/profiles/hardened/linux/ia64/2008.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb..000000000000
--- a/profiles/hardened/linux/ia64/2008.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/hardened/linux/ia64/2008.0/developer/parent b/profiles/hardened/linux/ia64/2008.0/developer/parent
deleted file mode 100644
index 4c893748ce71..000000000000
--- a/profiles/hardened/linux/ia64/2008.0/developer/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/developer
diff --git a/profiles/hardened/linux/ia64/2008.0/parent b/profiles/hardened/linux/ia64/2008.0/parent
deleted file mode 100644
index 3c71bf2b8ea0..000000000000
--- a/profiles/hardened/linux/ia64/2008.0/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../releases/2008.0
diff --git a/profiles/hardened/linux/ia64/2008.0/server/parent b/profiles/hardened/linux/ia64/2008.0/server/parent
deleted file mode 100644
index c39901657c87..000000000000
--- a/profiles/hardened/linux/ia64/2008.0/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/server
diff --git a/profiles/hardened/linux/ia64/desktop/parent b/profiles/hardened/linux/ia64/desktop/parent
new file mode 100644
index 000000000000..8bd863038bbe
--- /dev/null
+++ b/profiles/hardened/linux/ia64/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/desktop
diff --git a/profiles/hardened/linux/ia64/developer/parent b/profiles/hardened/linux/ia64/developer/parent
new file mode 100644
index 000000000000..b558d90594ab
--- /dev/null
+++ b/profiles/hardened/linux/ia64/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/developer
diff --git a/profiles/hardened/linux/ia64/2008.0/make.defaults b/profiles/hardened/linux/ia64/make.defaults
index 04965221ab92..b7fa91e9f085 100644
--- a/profiles/hardened/linux/ia64/2008.0/make.defaults
+++ b/profiles/hardened/linux/ia64/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/ia64/2008.0/make.defaults,v 1.2 2009/09/30 03:08:34 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/ia64/make.defaults,v 1.1 2010/11/13 12:39:32 blueness Exp $
 
 # STAGE1_USE does not stack
 STAGE1_USE="hardened nptl nptlonly pic"
diff --git a/profiles/hardened/linux/ia64/parent b/profiles/hardened/linux/ia64/parent
index 10d6c4b38690..634592c407d4 100644
--- a/profiles/hardened/linux/ia64/parent
+++ b/profiles/hardened/linux/ia64/parent
@@ -1,3 +1,4 @@
 ../../../base
 ..
 ../../../arch/ia64
+../../../releases/10.0
diff --git a/profiles/hardened/linux/ia64/server/parent b/profiles/hardened/linux/ia64/server/parent
new file mode 100644
index 000000000000..9c7a195197bd
--- /dev/null
+++ b/profiles/hardened/linux/ia64/server/parent
@@ -0,0 +1,2 @@
+..
+../../../../targets/server