YMCA: Yet More Changes Ah-ha (tm)

5 files changed, 23 insertions, 11 deletions

diff --git a/profiles/default-sparc-1.0/make.defaults b/profiles/default-sparc-1.0/make.defaults
index 5743312c43de..ba7f7cde027d 100644
--- a/profiles/default-sparc-1.0/make.defaults
+++ b/profiles/default-sparc-1.0/make.defaults
@@ -1,10 +1,16 @@
-# This file created automagically by scripts/generate-packages.sh on Thu Apr 18 13:17:44 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Thu Apr 18 23:03:24 CEST 2002
 
 # Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
 # System-wide defaults for the Portage system
 
 USE="xv slang readline gpm berkdb mmx 3dnow gdbm tcpd pam libwww ssl nls mitshm arts lame perl python esd imlib sdl oggvorbis gnome gtk X qt kde motif opengl avi jpeg png tiff gif"
-ARCH="x86"
+
 
 # These lines added by scripts/generate-packages.sh -----------------------
+#
+# $Id: make.defaults,v 1.5 2002/04/18 21:05:52 murphy Exp $
+#
+# $Log: not supported by cvs2svn $
+#
+ARCH="sparc"
 # End of lines added by scripts/generate-packages.sh ----------------------
diff --git a/profiles/default-sparc-1.0/make.defaults.sparc b/profiles/default-sparc-1.0/make.defaults.sparc
index e69de29bb2d1..cbd7337edba9 100644
--- a/profiles/default-sparc-1.0/make.defaults.sparc
+++ b/profiles/default-sparc-1.0/make.defaults.sparc
@@ -0,0 +1,6 @@
+#
+# $Id: make.defaults.sparc,v 1.2 2002/04/18 21:05:52 murphy Exp $
+#
+# $Log: not supported by cvs2svn $
+#
+ARCH="sparc"
diff --git a/profiles/default-sparc-1.0/packages b/profiles/default-sparc-1.0/packages
index cd7b2428d929..dfa93d98b6fe 100644
--- a/profiles/default-sparc-1.0/packages
+++ b/profiles/default-sparc-1.0/packages
@@ -1,4 +1,4 @@
-# This file created automagically by scripts/generate-packages.sh on Thu Apr 18 13:17:44 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Thu Apr 18 23:03:24 CEST 2002
 
 # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
 
@@ -167,7 +167,7 @@
 <=sys-apps/tcp-wrappers-7.6-r3
 
 # These lines added by scripts/generate-packages.sh -----------------------
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.3 2002/04/18 11:19:12 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.4 2002/04/18 21:05:52 murphy Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
@@ -176,8 +176,8 @@
 *sys-apps/sparc-utils
 *sys-apps/silo
 
-# Not working, and should only be in 64
-#*sys-devel/sparc-egcs64
+# In case we need a different 32 bit compiler.
+#*sys-devel/sparc-egcs32
 
 # Fixes bug#1726
 >=sys-devel/patch-2.5.4-r4
diff --git a/profiles/default-sparc-1.0/packages.sparc b/profiles/default-sparc-1.0/packages.sparc
index 14d7b83005ea..af6adba87630 100644
--- a/profiles/default-sparc-1.0/packages.sparc
+++ b/profiles/default-sparc-1.0/packages.sparc
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages.sparc,v 1.1 2002/04/16 20:07:18 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages.sparc,v 1.2 2002/04/18 21:05:52 murphy Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
@@ -7,8 +7,8 @@
 *sys-apps/sparc-utils
 *sys-apps/silo
 
-# Not working, and should only be in 64
-#*sys-devel/sparc-egcs64
+# In case we need a different 32 bit compiler.
+#*sys-devel/sparc-egcs32
 
 # Fixes bug#1726
 >=sys-devel/patch-2.5.4-r4
diff --git a/profiles/default-sparc-1.0/scripts/generate-packages.sh b/profiles/default-sparc-1.0/scripts/generate-packages.sh
index e4c8a814c9d9..b68745303267 100644
--- a/profiles/default-sparc-1.0/scripts/generate-packages.sh
+++ b/profiles/default-sparc-1.0/scripts/generate-packages.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/scripts/generate-packages.sh,v 1.3 2002/04/18 11:18:52 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/scripts/generate-packages.sh,v 1.4 2002/04/18 21:05:52 murphy Exp $
 #
 # New packages file
 NEWPACKAGESBUILD=packages.build
@@ -49,7 +49,7 @@ _EOF_
 cp -p $NEWDEFAULTS $KEEPDEFAULTS
 echo "# This file created automagically by $0 on `date`" > $NEWDEFAULTS
 echo "" >> $NEWDEFAULTS
-cat ${from_dir}/make.defaults >> $NEWDEFAULTS
+sed -e 's:ARCH=.*::' ${from_dir}/make.defaults >> $NEWDEFAULTS
 cat >> $NEWDEFAULTS <<_EOF_
 
 # These lines added by $0 -----------------------