Making a no-lib32 subprofile in which x86's libdir is lib. Moving unfriendly package maskings into that profile.

7 files changed, 48 insertions, 22 deletions

diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/README b/profiles/default-linux/amd64/2005.0/no-symlinks/README
index 299ff1b89f24..ce60ca2be15d 100644
--- a/profiles/default-linux/amd64/2005.0/no-symlinks/README
+++ b/profiles/default-linux/amd64/2005.0/no-symlinks/README
@@ -8,14 +8,4 @@ HOWTO upgrade from 2005.0 to 2005.0/no-symlinks
  6) emerge -uv system
 
 Notes:
-baselayout-1.11.8-r1 isn't in portage yet,  but you can use
-http://dev.gentoo.org/~eradicator/baselayout-ml.patch to make what I'm using
-for it.  When base-system releases 1.11.8-r1, it might have other fixes too,
-so be sure to re-emerge, but this one should be fine for building stages.
-
 The script for step 4 isn't yet ready.  It's safe to skip for now.
-
-linux-headers is masked in the main package.mask still, so unmask it yourself.
-linux26-headers-2.6.8.1-r3 will probably work, but I noticed it doesn't get
-the headers in asm-i386/mach-*/, but my updated multilib.eclass method does
-for linux-headers.
diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/make.defaults b/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/make.defaults
new file mode 100644
index 000000000000..0cb4a16c4634
--- /dev/null
+++ b/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/make.defaults
@@ -0,0 +1,5 @@
+# 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/2005.0/no-symlinks/no-lib32/make.defaults,v 1.1 2005/01/23 05:06:46 eradicator Exp $
+
+LIBDIR_x86="lib"
diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/package.mask b/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/package.mask
new file mode 100644
index 000000000000..afe2f5c0bc48
--- /dev/null
+++ b/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/package.mask
@@ -0,0 +1,13 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/package.mask,v 1.1 2005/01/23 05:06:46 eradicator Exp $
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# multilib aware versions (install to & look in proper $(get_libdir))
+<app-editors/emacs-21.3-r5
+<dev-db/postgresql-7.4.6
+<dev-lang/tcl-8.4.6-r1
+<dev-lang/tk-8.4.6-r1
+<dev-tcltk/expect-5.42.1
+<media-video/transcode-0.6.14
+<net-libs/courier-authlib-0.52
+<sys-apps/iproute2-2.6.10.20050112
+<sys-devel/flex-2.5.4a-r6
diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/parent b/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/parent
new file mode 100644
index 000000000000..6b0271ae1579
--- /dev/null
+++ b/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/parent
@@ -0,0 +1,8 @@
+# Copyright 2004-2005 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/parent,v 1.2
+# 2004/03/18 00:16:43 seemant Exp $
+
+# This file describes the parent profile to this.  In most cases this will
+# just be the name of the parent directory
+..
diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/profile.bashrc b/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/profile.bashrc
new file mode 100644
index 000000000000..cf5af63b0b7d
--- /dev/null
+++ b/profiles/default-linux/amd64/2005.0/no-symlinks/no-lib32/profile.bashrc
@@ -0,0 +1,17 @@
+# 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/2005.0/no-symlinks/no-lib32/profile.bashrc,v 1.1 2005/01/23 05:08:44 eradicator Exp $
+
+for dir in /lib /lib64 /usr/lib /usr/lib64 /usr/X11R6/lib /usr/X11R6/lib64 /usr/qt/*/lib /usr/qt/*/lib64 /usr/kde/*/lib /usr/kde/*/lib64; do
+	if [ -L "${dir}" ]; then
+		ewarn "${dir} is a symlink"
+		exit 1
+	fi
+done
+
+if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then
+	eerror "The amd64 2005.0/no-symlinks profile is still in active development"
+	eerror "and not yet ready for user testing.  An announcement will be made"
+	eerror "on gentoo-amd64@gentoo.org once we are ready for testers."
+	exit 1
+fi
diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask b/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask
index 9355589ad080..a773bfaf84f5 100644
--- a/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask
+++ b/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask
@@ -1,15 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask,v 1.5 2005/01/22 03:16:45 eradicator Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# multilib aware versions (install to & look in proper $(get_libdir))
-<app-editors/emacs-21.3-r5
-<dev-lang/tcl-8.4.6-r1
-<dev-lang/tk-8.4.6-r1
-<dev-tcltk/expect-5.42.1
-<media-video/transcode-0.6.14
-<net-libs/courier-authlib-0.52
-<sys-apps/iproute2-2.6.10.20050112
-<sys-devel/flex-2.5.4a-r6
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-symlinks/package.mask,v 1.6 2005/01/23 05:06:46 eradicator Exp $
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # Don't use packages which do ugly symlink hackery for lib/lib64
diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/profile.bashrc b/profiles/default-linux/amd64/2005.0/no-symlinks/profile.bashrc
index b9c0ab574112..0625a4e337b2 100644
--- a/profiles/default-linux/amd64/2005.0/no-symlinks/profile.bashrc
+++ b/profiles/default-linux/amd64/2005.0/no-symlinks/profile.bashrc
@@ -1,3 +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/2005.0/no-symlinks/profile.bashrc,v 1.2 2005/01/23 05:06:46 eradicator Exp $
+
 for dir in /lib /lib64 /usr/lib /usr/lib64 /usr/X11R6/lib /usr/X11R6/lib64 /usr/qt/*/lib /usr/qt/*/lib64 /usr/kde/*/lib /usr/kde/*/lib64; do
 	if [ -L "${dir}" ]; then
 		ewarn "${dir} is a symlink"