Push some bashrc stuff into the sub-profiles, and move some make.defaults stuff to the parent for better cascading.

6 files changed, 95 insertions, 69 deletions

diff --git a/profiles/default-linux/amd64/2004.3/lib64/make.defaults b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
index 0d4967ea09b8..d5c658b1762b 100644
--- a/profiles/default-linux/amd64/2004.3/lib64/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.11 2004/11/08 00:22:08 lv Exp $
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.12 2005/01/01 00:30:51 eradicator Exp $
 
 # GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
 # for compatibility
@@ -12,8 +9,6 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses m
 # Sane, functional, almost-but-not-quite-minimal default for USE
 USE="${GRP_STAGE23_USE} bitmap-fonts oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
-ARCH="amd64"
-
 # we can enable sandbox now that we use multilib by default
 FEATURES="sandbox autoconfig"
 
diff --git a/profiles/default-linux/amd64/2004.3/make.defaults b/profiles/default-linux/amd64/2004.3/make.defaults
index 2469a84f47a4..fe5505f252dc 100644
--- a/profiles/default-linux/amd64/2004.3/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/make.defaults
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.13 2004/12/30 22:18:58 eradicator Exp $
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.14 2005/01/01 00:30:51 eradicator Exp $
 
 # GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
 # for compatibility. also, without this we might actually fail to build stages.
@@ -14,8 +11,6 @@ GRP_STAGE23_USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python be
 # Sane, functional, almost-but-not-quite-minimal default for USE
 USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
-ARCH="amd64"
-
 # we can enable sandbox now that we use multilib by default
 FEATURES="sandbox autoconfig"
 
diff --git a/profiles/default-linux/amd64/2004.3/profile.bashrc b/profiles/default-linux/amd64/2004.3/profile.bashrc
new file mode 100644
index 000000000000..0a0f2cdd5dcb
--- /dev/null
+++ b/profiles/default-linux/amd64/2004.3/profile.bashrc
@@ -0,0 +1,46 @@
+# currently theoretical multilib stuff only available if using portage 2.0.51
+CHOST32="i686-pc-linux-gnu"
+CONF_MULTILIBDIR="${CONF_MULTILIBDIR:=lib32}"
+# until everything in the tree understands $(get_libdir), the only sane
+# default for this is lib.
+CONF_LIBDIR="${CONF_LIBDIR:=lib}"
+ARCH_WRAPPER="linux32"
+CC32="gcc32"
+CPP32="g++32"
+
+
+setup_multilib_variables() {
+	# if run via linux32, uname -m will always return i686
+	if [ "$(uname -m)" == "i686" ] ; then
+		CONF_LIBDIR="${CONF_MULTILIBDIR:=lib32}"
+		CHOST="${CHOST32:=i686-pc-linux-gnu}"
+
+		if [ -x /usr/bin/${CC32:=gcc32} ] ; then
+			CC="${CC32:=gcc32}"
+			CPP="${CPP32:=g++32}"
+		else
+			CFLAGS="${CFLAGS} -m32"
+			CXXFLAGS="${CXXFLAGS} -m32"
+		fi
+	else
+		# this isnt needed for profiles that set CONF_LIBDIR, but it
+		# doesnt hurt to be safe.
+		CONF_LIBDIR="${CONF_LIBDIR:=lib64}"
+	fi
+
+	export CONF_LIBDIR
+}
+
+[ "${CCHOST}" == "" -o "${CCHOST}" == "${CHOST}" -o "${CCHOST}" == "${CHOST32}" ] && setup_multilib_variables
+[ "${CONF_MULTILIBDIR}" == "lib" -a "${CONF_LIBDIR}" == "lib64" ] && SKIP_MULTILIB_HACK="YES"
+
+
+# spec switching support only available in gcc 3.4.2-r1 and later
+if [ -n "${USE_SPECS}" ] ; then
+	GCC_VER="$(${CC:=gcc} -dumpversion)"
+	SPECSLOC="/usr/lib/gcc-lib/${CHOST}/${GCC_VER}/"
+	if [ -f ${SPECSLOC}/${USE_SPECS}.specs ] ; then
+		export GCC_SPECS="${SPECSLOC}/${USE_SPECS}.specs"
+	fi
+fi
+
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
index 7023ca8680fa..2f9c90d6e07e 100644
--- a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
+++ b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
@@ -1,14 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/gcc34-2004.2/make.defaults,v 1.9 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/gcc34-2004.2/make.defaults,v 1.10 2005/01/01 00:30:51 eradicator Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
 
 USE="amd64 bitmap-fonts oss 3dnow apm arts avi berkdb crypt -cups encode fortran f77 foomaticdb gdbm gif gpm gtk  gtk2 imlib -gcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype X xml2 xmms xv zlib"
 
-ARCH="amd64"
-ACCEPT_KEYWORDS="amd64"
-
 # not having a 32bit sandbox breaks too much right now, and we cant even be
 # sure the user has a 32bit sandbox! it only gets installed if you add multilib
 # to use, recompile gcc, and then recompile portage. :/
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/profile.bashrc b/profiles/default-linux/amd64/gcc34-2004.2/profile.bashrc
index a23dacf85363..0a0f2cdd5dcb 100644
--- a/profiles/default-linux/amd64/gcc34-2004.2/profile.bashrc
+++ b/profiles/default-linux/amd64/gcc34-2004.2/profile.bashrc
@@ -1,5 +1,46 @@
-# fix for bug 60147, "configure causes sandbox violations when lib64
-# is a directory". currently only works with cvs portage.
-#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
-addwrite /usr/lib64/conftest
-addwrite /usr/lib64/cf
+# currently theoretical multilib stuff only available if using portage 2.0.51
+CHOST32="i686-pc-linux-gnu"
+CONF_MULTILIBDIR="${CONF_MULTILIBDIR:=lib32}"
+# until everything in the tree understands $(get_libdir), the only sane
+# default for this is lib.
+CONF_LIBDIR="${CONF_LIBDIR:=lib}"
+ARCH_WRAPPER="linux32"
+CC32="gcc32"
+CPP32="g++32"
+
+
+setup_multilib_variables() {
+	# if run via linux32, uname -m will always return i686
+	if [ "$(uname -m)" == "i686" ] ; then
+		CONF_LIBDIR="${CONF_MULTILIBDIR:=lib32}"
+		CHOST="${CHOST32:=i686-pc-linux-gnu}"
+
+		if [ -x /usr/bin/${CC32:=gcc32} ] ; then
+			CC="${CC32:=gcc32}"
+			CPP="${CPP32:=g++32}"
+		else
+			CFLAGS="${CFLAGS} -m32"
+			CXXFLAGS="${CXXFLAGS} -m32"
+		fi
+	else
+		# this isnt needed for profiles that set CONF_LIBDIR, but it
+		# doesnt hurt to be safe.
+		CONF_LIBDIR="${CONF_LIBDIR:=lib64}"
+	fi
+
+	export CONF_LIBDIR
+}
+
+[ "${CCHOST}" == "" -o "${CCHOST}" == "${CHOST}" -o "${CCHOST}" == "${CHOST32}" ] && setup_multilib_variables
+[ "${CONF_MULTILIBDIR}" == "lib" -a "${CONF_LIBDIR}" == "lib64" ] && SKIP_MULTILIB_HACK="YES"
+
+
+# spec switching support only available in gcc 3.4.2-r1 and later
+if [ -n "${USE_SPECS}" ] ; then
+	GCC_VER="$(${CC:=gcc} -dumpversion)"
+	SPECSLOC="/usr/lib/gcc-lib/${CHOST}/${GCC_VER}/"
+	if [ -f ${SPECSLOC}/${USE_SPECS}.specs ] ; then
+		export GCC_SPECS="${SPECSLOC}/${USE_SPECS}.specs"
+	fi
+fi
+
diff --git a/profiles/default-linux/amd64/profile.bashrc b/profiles/default-linux/amd64/profile.bashrc
index f0bc6afe459f..b7328061f503 100644
--- a/profiles/default-linux/amd64/profile.bashrc
+++ b/profiles/default-linux/amd64/profile.bashrc
@@ -24,51 +24,3 @@ elif [ -f /dev/null ] ; then
 	eerror "/dev/null is a normal file! this is bad! tail -n 20 /var/log/emerge.log and attach the output to http://bugs.gentoo.org/show_bug.cgi?id=65876"
 	exit 1
 fi
-
-
-# currently theoretical multilib stuff only available if using portage 2.0.51
-CHOST32="i686-pc-linux-gnu"
-CONF_MULTILIBDIR="${CONF_MULTILIBDIR:=lib32}"
-# until everything in the tree understands $(get_libdir), the only sane
-# default for this is lib.
-CONF_LIBDIR="${CONF_LIBDIR:=lib}"
-ARCH_WRAPPER="linux32"
-CC32="gcc32"
-CPP32="g++32"
-
-
-setup_multilib_variables() {
-	# if run via linux32, uname -m will always return i686
-	if [ "$(uname -m)" == "i686" ] ; then
-		CONF_LIBDIR="${CONF_MULTILIBDIR:=lib32}"
-		CHOST="${CHOST32:=i686-pc-linux-gnu}"
-
-		if [ -x /usr/bin/${CC32:=gcc32} ] ; then
-			CC="${CC32:=gcc32}"
-			CPP="${CPP32:=g++32}"
-		else
-			CFLAGS="${CFLAGS} -m32"
-			CXXFLAGS="${CXXFLAGS} -m32"
-		fi
-	else
-		# this isnt needed for profiles that set CONF_LIBDIR, but it
-		# doesnt hurt to be safe.
-		CONF_LIBDIR="${CONF_LIBDIR:=lib64}"
-	fi
-
-	export CONF_LIBDIR
-}
-
-[ "${CCHOST}" == "" -o "${CCHOST}" == "${CHOST}" -o "${CCHOST}" == "${CHOST32}" ] && setup_multilib_variables
-[ "${CONF_MULTILIBDIR}" == "lib" -a "${CONF_LIBDIR}" == "lib64" ] && SKIP_MULTILIB_HACK="YES"
-
-
-# spec switching support only available in gcc 3.4.2-r1 and later
-if [ -n "${USE_SPECS}" ] ; then
-	GCC_VER="$(${CC:=gcc} -dumpversion)"
-	SPECSLOC="/usr/lib/gcc-lib/${CHOST}/${GCC_VER}/"
-	if [ -f ${SPECSLOC}/${USE_SPECS}.specs ] ; then
-		export GCC_SPECS="${SPECSLOC}/${USE_SPECS}.specs"
-	fi
-fi
-