Updated maskings, made to work better with current portage. Created a subprofile that sete 64bit default if the user desires (and for better testing).

6 files changed, 32 insertions, 53 deletions

diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
index a9934ac9cc6b..83c084838bba 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
@@ -1,34 +1,5 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.16 2005/01/12 23:08:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.17 2005/01/23 11:30:47 eradicator Exp $
 
-FEATURES="sandbox ccache autoconfig multilib-pkg multilib-strict"
-
-# Catalyst stage/grp USE
-GRP_STAGE23_USE="berkdb gpm ipv6 -java multislot multilib ncurses nls -nptl pam perl python readline ssl tcpd zlib"
-
-# Sane, minimal USE settings
-USE="${GRP_STAGE23_USE} alsa bitmap-fonts crypt cups font-server fortran f77 fbcon gif jpeg nls opengl png tiff truetype truetype-fonts type1-fonts usb xpm xrandr xv"
-
-# Not all of this is implemented in portage/toolchain, yet. See 
-# http://bugs.gentoo.org/show_bug.cgi?id=75420
-
-# MULTILIB_ABIS lists all the ABIS you want to build for when
-# you emerge a package.  The libs that get installed will be for
-# all of these ABIs, but the bins will be for ${DEFAULT_ABI}.
-
-MULTILIB_ABIS="sparc32 sparc64"
-DEFAULT_ABI="sparc32"
-
-ARCH_WRAPPER_sparc64="sparc64"
-ASFLAGS_sparc64="-64 -no-undeclared-regs"
-CFLAGS_sparc64="-m64"
-LIBDIR_sparc64="lib64"
-
-ARCH_WRAPPER_sparc32="sparc32"
-ASFLAGS_sparc32="-32"
-CFLAGS_sparc32="-m32"
-LIBDIR_sparc32="lib"
-
-MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
-MULTILIB_STRICT_DENY="64-bit.*shared object"
+DEFAULT_ABI="sparc64"
diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/package.mask b/profiles/default-linux/sparc/sparc64-multilib/dev/package.mask
index f03e1d85052a..221db870e186 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/dev/package.mask
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/package.mask,v 1.3 2005/01/02 03:21:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/package.mask,v 1.4 2005/01/23 11:30:47 eradicator Exp $
 
 # Jeremy Huddleston <eradicator@dev.gentoo.org>
 # Masking to prevent accidental emerge of unsafe alsa drivers.
@@ -19,8 +19,3 @@
 =sys-kernel/gentoo-dev-sources-2.6.8-r10
 ~sys-kernel/gentoo-dev-sources-2.6.9
 sys-kernel/development-sources
-
-# Jeremy Huddleston <eradicator@dev.gentoo.org>
-# Use CFLAGS_${ABI} compatible distcc
--=sys-devel/distcc-2.18.3-r1
-
diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/virtuals b/profiles/default-linux/sparc/sparc64-multilib/dev/virtuals
index a74f43840521..4996857c65b2 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/dev/virtuals
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/virtuals
@@ -1,3 +1,3 @@
-virtual/kernel          sys-kernel/gentoo-dev-sources
-virtual/linux-sources	sys-kernel/gentoo-dev-sources
-virtual/os-headers      sys-kernel/linux26-headers
+virtual/kernel          sys-kernel/gentoo-sources
+virtual/linux-sources	sys-kernel/gentoo-sources
+virtual/os-headers      sys-kernel/linux-headers
diff --git a/profiles/default-linux/sparc/sparc64-multilib/package.mask b/profiles/default-linux/sparc/sparc64-multilib/package.mask
new file mode 100644
index 000000000000..e8778b113e31
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64-multilib/package.mask
@@ -0,0 +1,13 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/package.mask,v 1.1 2005/01/23 11:30:47 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/sparc/sparc64-multilib/packages b/profiles/default-linux/sparc/sparc64-multilib/packages
index 285ea6fb7730..74d1b3cc7a9d 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/packages
+++ b/profiles/default-linux/sparc/sparc64-multilib/packages
@@ -1,6 +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/sparc/sparc64-multilib/packages,v 1.15 2005/01/07 08:12:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.16 2005/01/23 11:30:47 eradicator Exp $
 
 # Sometimes necessary to trick programs into thinking we're really
 # a sparc32 system.
@@ -23,10 +23,3 @@
 # this version of openssl always builds the 64bit version... when we get a
 # smarter portage, it will need to be updated
 >=dev-libs/openssl-0.9.7d-r2
-
-# 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
->=net-libs/courier-authlib-0.52
diff --git a/profiles/default-linux/sparc/sparc64-multilib/profile.bashrc b/profiles/default-linux/sparc/sparc64-multilib/profile.bashrc
index 66e06c7ad40b..a573012feed2 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/profile.bashrc
+++ b/profiles/default-linux/sparc/sparc64-multilib/profile.bashrc
@@ -16,9 +16,16 @@ addpredict /usr/lib64/python2.4/
 addpredict /usr/lib64/python2.5/
 addpredict /usr/lib64/python3.0/
 
-if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then
-	echo "You are using a VERY development profile.  You probably"
-	echo "shouldn't be doing this.  Please see the README in"
-	echo "/usr/portage/profiles/default-linux/sparc/sparc64-multilib/dev"
-	exit 1
+# The version of profile in our 'packages' does not yet set ABI for us nor
+# export the CFLAGS_${ABI} envvars... The multilib-pkg patch does, but this
+# won't be in portage until atleast .52_pre
+if [ -n "${ABI}" ]; then
+	export ABI
+elif [ -n "${DEFAULT_ABI}" ]; then
+	export ABI="${DEFAULT_ABI}"
+else
+	export ABI="sparc32"
 fi
+
+export CFLAGS_sparc32
+export CFLAGS_sparc64