move 32bit-userland profile to 2006.0/

5 files changed, 11 insertions, 12 deletions

diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/README b/profiles/default-linux/amd64/2006.0/32bit-userland/README
index 8b5ab7fd79df..8b5ab7fd79df 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/README
+++ b/profiles/default-linux/amd64/2006.0/32bit-userland/README
diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/make.defaults b/profiles/default-linux/amd64/2006.0/32bit-userland/make.defaults
index 80e10d089b26..3ae14de2e795 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/make.defaults
+++ b/profiles/default-linux/amd64/2006.0/32bit-userland/make.defaults
@@ -1,8 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/make.defaults,v 1.1 2006/03/01 18:29:11 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/32bit-userland/make.defaults,v 1.1 2006/03/01 20:40:54 blubb Exp $
 
-MULTILIB_ABIS="x86 amd64"
 DEFAULT_ABI="x86"
 KERNEL_ABI="amd64"
 ABI=${DEFAULT_ABI}
@@ -14,6 +13,6 @@ CFLAGS_x86="-m32 "
 LDFLAGS_x86="-m elf_i386"
 
 # In case someone wants to help out by setting FEATURES="multilib-strict"
-MULTILIB_STRICT_DIRS="/lib64 /usr/lib64 /usr/kde/*/lib64 /usr/qt/*/lib64 /usr/X11R6/lib64"
+MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
 MULTILIB_STRICT_DENY="32-bit.*shared object"
 MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3|debug|portage)"
diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/parent b/profiles/default-linux/amd64/2006.0/32bit-userland/parent
index f3229c5b9876..f3229c5b9876 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/parent
+++ b/profiles/default-linux/amd64/2006.0/32bit-userland/parent
diff --git a/profiles/default-linux/amd64/2006.0/32bit-userland/profile.bashrc b/profiles/default-linux/amd64/2006.0/32bit-userland/profile.bashrc
new file mode 100644
index 000000000000..ec838be203df
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.0/32bit-userland/profile.bashrc
@@ -0,0 +1,9 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/32bit-userland/profile.bashrc,v 1.1 2006/03/01 20:40:54 blubb Exp $
+
+if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then
+	eerror "The 2006.0/32bit-userland profile is currently broken and only"
+	eerror "for development purposes in the tree. An announcement will be sent"
+	eerror "out to gentoo-amd64@lists.gentoo.org as soon as it is save for more testing."
+fi
diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/profile.bashrc b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/profile.bashrc
deleted file mode 100644
index 35597ee16247..000000000000
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/profile.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/32bit-userland/profile.bashrc,v 1.1 2006/03/01 18:29:11 blubb Exp $
-
-if [ -z "${IWANTTOTRASHMYSYSTEMHARD}" ]; then
-	eerror "The 2006.0/no-symlink/no-lib32/32bit-userland profile is currently broken"
-	eerror "and only for development purposes in the tree. An announcement will be sent"
-	eerror "out to gentoo-amd64@lists.gentoo.org as soon as it is save for more testing."
-fi