updated profile

8 files changed, 47 insertions, 43 deletions

diff --git a/profiles/default-sparc-1.4/README b/profiles/default-sparc-1.4/README
deleted file mode 100644
index 6d4a9a5523f2..000000000000
--- a/profiles/default-sparc-1.4/README
+++ /dev/null
@@ -1 +0,0 @@
-Use ../default-sparc-1.0/scripts/build-rel.sh to create the files
diff --git a/profiles/default-sparc-1.4/make.defaults b/profiles/default-sparc-1.4/make.defaults
index 571a52593982..c570c86cc474 100644
--- a/profiles/default-sparc-1.4/make.defaults
+++ b/profiles/default-sparc-1.4/make.defaults
@@ -1,25 +1,28 @@
 # Copyright 2002 Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
-USE="oss sparc apm arts avi berkdb crypt cups encode gdbm gif gtk imlib
-java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis
-opengl pam pdflib png python qt qtmt quicktime readline sdl slang spell ssl
- tcpd truetype X xml2 xmms xv zlib"
+# System-wide defaults for the gcc 3.2 Portage system
+USE="oss 3dnow apm arts avi berkdb crypt cups encode gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt qtmt quicktime readline sdl slang spell ssl tcpd truetype X xml2 xmms xv zlib"
+COMPILER="gcc3"
+# Please edit the file make.defaults.sparc to make changes, then run
+# the ../default-sparc-1.0/scripts/build-rel.sh script and check the
+# changes that have occurred (cvs diff).
 #
 ARCH="sparc"
 CHOST=sparc-unknown-linux-gnu
-PLATFORM=sparc-unknown-linux-gnu
+PLATFORM=sparc64-unknown-linux-gnu
+PROFILE_ARCH="sparc64"
 
 # Options passed to make during the build process
-# MAKEOPTS="-j2"
+MAKEOPTS="-j2"
 
 # Fetching command (5 tries, passive ftp for firewall compatibility)
 FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 # Global configure options
 
 # C Compiler flags
-CFLAGS="-O2 -pipe"
+CFLAGS="-mcpu=v8 -mtune=v9 -O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
 # USE arch:xxx keyword
 ACCEPT_KEYWORDS="sparc"
+FEATURES="sandbox ccache"
diff --git a/profiles/default-sparc-1.4/make.defaults.sed b/profiles/default-sparc-1.4/make.defaults.sed
deleted file mode 100644
index 69f2d20dd2e1..000000000000
--- a/profiles/default-sparc-1.4/make.defaults.sed
+++ /dev/null
@@ -1,4 +0,0 @@
-s:USE="x86 :USE="sparc :
-s:ARCH=.*::
-s:ACCEPT_KEYWORDS=.*::
-s:svga::
diff --git a/profiles/default-sparc-1.4/make.defaults.sparc b/profiles/default-sparc-1.4/make.defaults.sparc
index 6be05ae0a576..1a3e8b65b9d9 100644
--- a/profiles/default-sparc-1.4/make.defaults.sparc
+++ b/profiles/default-sparc-1.4/make.defaults.sparc
@@ -1,26 +1,25 @@
-#
-# $Id: make.defaults.sparc,v 1.1 2002/08/31 21:43:44 seemant Exp $
-#
-# $Log: not supported by cvs2svn $
-# Revision 1.1  2002/08/29 01:24:59  murphy
-# Initial update
-#
+# Please edit the file make.defaults.sparc to make changes, then run
+# the ../default-sparc-1.0/scripts/build-rel.sh script and check the
+# changes that have occurred (cvs diff).
 #
 ARCH="sparc"
 CHOST=sparc-unknown-linux-gnu
-PLATFORM=sparc-unknown-linux-gnu
+PROFILE_ARCH="sparc64"
+PLATFORM=sparc64-unknown-linux-gnu
 
 # Options passed to make during the build process
-# MAKEOPTS="-j2"
+MAKEOPTS="-j2"
 
 # Fetching command (5 tries, passive ftp for firewall compatibility)
 FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 # Global configure options
 
 # C Compiler flags
-CFLAGS="-O2 -pipe"
+CFLAGS="-mcpu=v8 -mtune=v9 -O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
 # USE arch:xxx keyword
 ACCEPT_KEYWORDS="sparc"
+FEATURES="sandbox ccache"
+
diff --git a/profiles/default-sparc-1.4/packages b/profiles/default-sparc-1.4/packages
index 3c786ca80d4e..b99ea738a505 100644
--- a/profiles/default-sparc-1.4/packages
+++ b/profiles/default-sparc-1.4/packages
@@ -1,12 +1,10 @@
 # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
-
 # OK; you're staring at this file and you have no idea what these stars are
 # for.  Here's the scoop.  An initial "*" marks a package that is part of the
 # official "base" system profile.  If there's a "*", then "emerge system" will
 # use the line in its calculations of what "should" be installed for this
 # profile.  Lines without a "*" prefix will be ignored for profile
 # calculations.
-
 # Now, this is new: *all* lines (star or no star) will be used as a special
 # package *inclusion* mask.  For example, the line *=sys-devel/gcc-2.95.3-r1
 # will cause Portage to totally ignore all gcc ebuilds other than
@@ -19,31 +17,30 @@
 # there is no entry, then all versions of an app are included.  The key thing
 # to note is that this file does not need to end up being an exhaustive list
 # of portage packages; just the ones critical to this profile.
-
 # So, what happens to /usr/portage/profiles/package.mask?  It's still around,
 # and still useful.  But it should mainly be used for broken ebuilds only.
 # package.mask continues to function as normal, masking out ebuilds from *all*
 # system profiles.
-
 # Which to use?  Use the profile-specific stuff to "lock down" specific
 # versions of ebuilds.  Gentoo Linux 1.0_rc6 uses certain known-compatible
 # versions of binutils, gcc and glibc, so we lock them down here.  This
 # prevents the user from shooting himself/herself in the foot by installing a
 # wacky version.
-
 !dev-lang/gpc
-*>=sys-apps/baselayout-1.7.9-r1
-*>=sys-apps/portage-2.0.45
-*>=sys-devel/binutils-2.13.90.0.14
-*=sys-devel/gcc-2.95.3-r7
-*=sys-libs/glibc-2.2.5-r7
-*>=sys-kernel/linux-headers-2.4.19
+*>=sys-apps/baselayout-1.8.5.3
+*>=sys-apps/portage-2.0.45-r4
+*>=sys-devel/binutils-2.13.90.0.4
+*>=sys-devel/gcc-3.2
+*>=sys-libs/glibc-2.3.1-r2
+>=sys-kernel/linux-headers-2.4.19
 >=sys-apps/sysklogd-1.4.1
 *dev-lang/python
->=x11-base/xfree-4.1.0-r12
+>=x11-base/xfree-4.2.1
+# sash - static shell for system recovery
 *app-shells/sash
 *sys-devel/perl
 *app-editors/nano
+#no real cost for nano, since we already have ncurses
 *net-ftp/ftp
 *net-misc/dhcpcd
 *net-misc/rsync
@@ -63,6 +60,7 @@
 *sys-apps/gawk
 *sys-apps/grep
 *sys-apps/groff
+#*sys-apps/grub
 *sys-apps/gzip
 *sys-apps/hdparm
 *sys-apps/iptables
@@ -88,6 +86,7 @@
 *sys-devel/autoconf
 *>=sys-devel/automake-1.6.1-r5
 *sys-devel/bc
+#*sys-devel/bin86
 *sys-devel/bison
 *sys-devel/flex
 *sys-devel/gettext
@@ -98,7 +97,7 @@
 *sys-libs/cracklib  
 *<sys-libs/db-3.2.10
 *sys-libs/gdbm  
-*>=sys-libs/ncurses-5.2.20020112a
+*>=sys-libs/ncurses-5.2-r7
 *>=sys-libs/pam-0.75-r9
 *sys-libs/pwdb      
 *sys-libs/readline  
@@ -106,6 +105,21 @@
 *sys-libs/zlib
 *net-misc/openssh
 *sys-apps/devfsd
+# Please edit the file packages.sparc, it will be included in
+# packages the next time you run ../default-sparc-1.0/scripts/build.rel
+#
+# SPARC specific packages
 *sys-apps/sparc-utils
 *sys-apps/silo
+*dev-util/dialog
+# Kernel compiler
+*sys-devel/egcs64-sparc
+
+# VNC is broken on x86, maintainer uses i386 specific makefile
+!net-misc/vnc
+
+# Get a decent editor - BROKEN
+#*app-editors/levee
 
+# Sed replacement - POSTPONED
+#*sys-apps/supersed
diff --git a/profiles/default-sparc-1.4/packages.build.sed b/profiles/default-sparc-1.4/packages.build.sed
deleted file mode 100644
index 0145ec4493d3..000000000000
--- a/profiles/default-sparc-1.4/packages.build.sed
+++ /dev/null
@@ -1 +0,0 @@
-s:sys-apps/sed:sys-apps/supersed:
diff --git a/profiles/default-sparc-1.4/use.defaults.sed b/profiles/default-sparc-1.4/use.defaults.sed
deleted file mode 100644
index 6a07babe8678..000000000000
--- a/profiles/default-sparc-1.4/use.defaults.sed
+++ /dev/null
@@ -1 +0,0 @@
-s:svga.*:#svga:
diff --git a/profiles/default-sparc-1.4/virtuals.sed b/profiles/default-sparc-1.4/virtuals.sed
deleted file mode 100644
index b378a6ee0c85..000000000000
--- a/profiles/default-sparc-1.4/virtuals.sed
+++ /dev/null
@@ -1,5 +0,0 @@
-s:sys-kernel/gentoo-sources:sys-kernel/vanilla-sources:
-s:virtual/alsa.*::
-s:virtual/jdk.*::
-s:virtual/jre.*:virtual/jre		dev-java/blackdown-jre:
-s:virtual/xforms.*::