updated default-sparc64-1.4

6 files changed, 54 insertions, 99 deletions

diff --git a/profiles/default-sparc64-1.4/make.defaults b/profiles/default-sparc64-1.4/make.defaults
index c570c86cc474..d60329608998 100644
--- a/profiles/default-sparc64-1.4/make.defaults
+++ b/profiles/default-sparc64-1.4/make.defaults
@@ -1,12 +1,9 @@
 # Copyright 2002 Gentoo Technologies, Inc.
-# 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).
-#
+# System-wide defaults for the Portage system
+
 ARCH="sparc"
+
+# Host type
 CHOST=sparc-unknown-linux-gnu
 PLATFORM=sparc64-unknown-linux-gnu
 PROFILE_ARCH="sparc64"
@@ -19,10 +16,20 @@ FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 # Global configure options
 
 # C Compiler flags
-CFLAGS="-mcpu=v8 -mtune=v9 -O2 -pipe"
+CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-# USE arch:xxx keyword
+USE="arts apm avi berkdb crypt cups encode esd fbcon gdbm gif gtk gnome imlib java jpeg kde
+ libwww mikmod motif mpeg ncurses oggvorbis oss opengl pam perl png python pdflib qt readline 
+ slang sdl spell ssl tcpd truetype X xv xml2 xmms zlib"
+
+
+# The following USE flags are NOT recommended for sparc64 and might cause breakage...
+# mmx, 3dnow, sse, svga
+
+COMPILER="gcc3"
+
 ACCEPT_KEYWORDS="sparc"
 FEATURES="sandbox ccache"
+
diff --git a/profiles/default-sparc64-1.4/make.defaults.sparc b/profiles/default-sparc64-1.4/make.defaults.sparc
deleted file mode 100644
index 1a3e8b65b9d9..000000000000
--- a/profiles/default-sparc64-1.4/make.defaults.sparc
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
-PROFILE_ARCH="sparc64"
-PLATFORM=sparc64-unknown-linux-gnu
-
-# Options passed to make during the build process
-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="-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-sparc64-1.4/packages b/profiles/default-sparc64-1.4/packages
index b99ea738a505..927954f6ad12 100644
--- a/profiles/default-sparc64-1.4/packages
+++ b/profiles/default-sparc64-1.4/packages
@@ -1,10 +1,11 @@
 # 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.
+# 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
@@ -21,26 +22,46 @@
 # 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 ebuilds.  Gentoo Linux 1.4 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.8.5.3
-*>=sys-apps/portage-2.0.45-r4
-*>=sys-devel/binutils-2.13.90.0.4
-*>=sys-devel/gcc-3.2
+
+# SPARC64 Profile
+
+# These don't make sense on sparc 
+~sys-devel/bin86
+~sys-apps/lilo
+~sys-apps/grub
+
+# VNC is broken on sparc64, maintainer uses i386 specific makefile
+~net-misc/vnc
+
+# Get a decent editor - BROKEN
+~app-editors/levee
+
+# sparc64 specfic pkgs
+*sys-apps/sparc-utils
+*sys-apps/silo
+*dev-util/dialog
+*sys-devel/egcs64-sparc
+
+# default-sparc-1.4 pkgs 
+*>=sys-apps/baselayout-1.8.5.5
+*>=sys-apps/portage-2.0.45-r2
+*=sys-devel/binutils-2.13.90.0.16
+*>=sys-devel/gcc-3.2.1
 *>=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.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
@@ -60,7 +81,6 @@
 *sys-apps/gawk
 *sys-apps/grep
 *sys-apps/groff
-#*sys-apps/grub
 *sys-apps/gzip
 *sys-apps/hdparm
 *sys-apps/iptables
@@ -86,7 +106,6 @@
 *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
@@ -97,29 +116,12 @@
 *sys-libs/cracklib  
 *<sys-libs/db-3.2.10
 *sys-libs/gdbm  
-*>=sys-libs/ncurses-5.2-r7
-*>=sys-libs/pam-0.75-r9
+*>=sys-libs/ncurses-5.2.20020511-r3
+*>=sys-libs/pam-0.75-r10
 *sys-libs/pwdb      
 *sys-libs/readline  
 *sys-libs/slang
 *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-sparc64-1.4/packages.sparc b/profiles/default-sparc64-1.4/packages.sparc
deleted file mode 100644
index 4becaa049fd7..000000000000
--- a/profiles/default-sparc64-1.4/packages.sparc
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
-
-# 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-sparc64-1.4/use.defaults b/profiles/default-sparc64-1.4/use.defaults
index b8f9dca73440..d5761eabfb54 100644
--- a/profiles/default-sparc64-1.4/use.defaults
+++ b/profiles/default-sparc64-1.4/use.defaults
@@ -1,15 +1,4 @@
-#gif
-#mmx
-#3dnow
-#odbc
-#fbcon		
-#qtmt
-#oss
-#libg++
-#objprelink
-#nls
-#mitshm
-#sse
+# Not recommended: mmx, 3dnow, sse, svga
 directfb	dev-libs/DirectFB
 ungif		media-libs/ungif
 gtkhtml		gnome-extra/gtkhtml
@@ -23,7 +12,6 @@ tetex		app-text/tetex
 aalib		media-libs/aalib	
 nas		media-libs/nas
 bonobo		gnome-base/bonobo
-#svga
 ggi		media-libs/libggi
 tcltk		dev-lang/tcl dev-lang/tk
 java		virtual/jre
diff --git a/profiles/default-sparc64-1.4/virtuals b/profiles/default-sparc64-1.4/virtuals
index 52e211ee3fb2..45e1cc4772fd 100644
--- a/profiles/default-sparc64-1.4/virtuals
+++ b/profiles/default-sparc64-1.4/virtuals
@@ -2,7 +2,7 @@ virtual/lpr             net-print/cups
 virtual/python          dev-lang/python
 virtual/mta             net-mail/ssmtp
 virtual/kernel          sys-kernel/linux-headers
-virtual/linux-sources   sys-kernel/vanilla-sources
+virtual/linux-sources   sys-kernel/sparc-sources
 virtual/glibc           sys-libs/glibc
 virtual/x11             x11-base/xfree
 virtual/opengl          x11-base/xfree
@@ -22,6 +22,7 @@ sys-apps/reiserfs-utils sys-apps/reiserfsprogs
 virtual/xemacs          app-editors/xemacs
 virtual/sylpheed        net-mail/sylpheed
 virtual/php             dev-php/mod_php
-virtual/textbrowser		net-www/links
+virtual/xforms		x11-libs/xforms-sparc
+virtual/textbrowser	net-www/links
 virtual/mda		net-mail/procmail
-virtual/krb5			app-crypt/heimdal
+virtual/krb5		app-crypt/heimdal