Merging in changes from x86

Masking openssl 0.9.6d

5 files changed, 31 insertions, 18 deletions

diff --git a/profiles/default-sparc-1.0/make.defaults b/profiles/default-sparc-1.0/make.defaults
index f0f2937e18cf..6bdb772c92c1 100644
--- a/profiles/default-sparc-1.0/make.defaults
+++ b/profiles/default-sparc-1.0/make.defaults
@@ -1,4 +1,4 @@
-# This file created automagically by scripts/generate-packages.sh on Sat May 11 03:12:10 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Thu Jul  4 16:44:11 CEST 2002
 
 # Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
 # System-wide defaults for the Portage system
@@ -10,18 +10,16 @@ slang spell ssl svga tcpd truetype X xml2 xmms xv"
 
 
 
+
 # These lines added by scripts/generate-packages.sh
 #
-# $Id: make.defaults,v 1.11 2002/06/22 16:39:42 drobbins Exp $
+# $Id: make.defaults,v 1.12 2002/07/04 16:12:08 murphy Exp $
 #
 # $Log: make.defaults,v $
-# Revision 1.11  2002/06/22 16:39:42  drobbins
-# added ACCEPT_KEYWORDS
-#
-# Revision 1.10  2002/05/11 01:40:21  murphy
-# Removing X mask stuff.
+# Revision 1.12  2002/07/04 16:12:08  murphy
+# Merging in changes from x86
 #
-# More fixes to CD.
+# Masking openssl 0.9.6d
 #
 # Revision 1.3  2002/05/08 22:08:22  murphy
 # More fixes to CD stuff.
@@ -49,6 +47,6 @@ FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
-# End of lines added by scripts/generate-packages.sh
 
-ACCEPT_KEYWORDS="sparc"
+# Use arch flag
+# 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 d0df13818872..49c0c0bdc0b9 100644
--- a/profiles/default-sparc-1.0/make.defaults.sparc
+++ b/profiles/default-sparc-1.0/make.defaults.sparc
@@ -1,7 +1,12 @@
 #
-# $Id: make.defaults.sparc,v 1.3 2002/05/08 22:08:22 murphy Exp $
+# $Id: make.defaults.sparc,v 1.4 2002/07/04 16:12:08 murphy Exp $
 #
 # $Log: make.defaults.sparc,v $
+# Revision 1.4  2002/07/04 16:12:08  murphy
+# Merging in changes from x86
+#
+# Masking openssl 0.9.6d
+#
 # Revision 1.3  2002/05/08 22:08:22  murphy
 # More fixes to CD stuff.
 #
@@ -28,3 +33,6 @@ FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
+
+# Use arch flag
+ACCEPT_KEYWORDS="sparc"
diff --git a/profiles/default-sparc-1.0/packages b/profiles/default-sparc-1.0/packages
index 116572af47a4..4e26260d004c 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 Sat May 11 03:12:09 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Thu Jul  4 16:44:11 CEST 2002
 
 # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
 
@@ -110,7 +110,7 @@
 *sys-devel/make
 *sys-devel/patch
 *sys-libs/cracklib  
-*sys-libs/db
+*<sys-libs/db-3.2.10
 *sys-libs/gdbm  
 <sys-libs/ncurses-5.2.20020112a
 # Removed since it's really no need for this to be default, and it together 
@@ -118,15 +118,14 @@
 # sys-libs/nss-db 
 *sys-libs/pam     
 *sys-libs/pwdb      
-*sys-libs/readline  
+*<sys-libs/readline-4.2 
 *sys-libs/slang
 *sys-libs/zlib
 #these ones have the new rc6 style init scripts
 >=sys-libs/gpm-1.19.3-r5
 >=sys-apps/isapnptools-1.23-r6
 # *>=sys-apps/dcron-2.7-r6
-*=dev-libs/openssl-0.9.6c-r1
-*=net-misc/openssh-3.1_p1
+*>=net-misc/openssh-3.0.1_p1
 *>=sys-apps/devfsd-1.3.20
 >=sys-apps/xinetd-2.3.3-r6
 >=net-fs/samba-2.2.2-r6
@@ -169,7 +168,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.14 2002/07/02 23:37:19 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.15 2002/07/04 16:12:08 murphy Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
@@ -183,4 +182,7 @@
 
 # Fixes bug#1726
 >=sys-devel/patch-2.5.4-r4
+
+# Fix OpenSSL 0.9.6d issue
+<dev-libs/openssl-0.9.6d
 # End of lines added by scripts/generate-packages.sh
diff --git a/profiles/default-sparc-1.0/packages.sparc b/profiles/default-sparc-1.0/packages.sparc
index af6adba87630..e3c6d57ad26d 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.2 2002/04/18 21:05:52 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages.sparc,v 1.3 2002/07/04 16:12:08 murphy Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
@@ -12,3 +12,6 @@
 
 # Fixes bug#1726
 >=sys-devel/patch-2.5.4-r4
+
+# Fix OpenSSL 0.9.6d issue
+<dev-libs/openssl-0.9.6d
diff --git a/profiles/default-sparc-1.0/virtuals b/profiles/default-sparc-1.0/virtuals
index bb07f7f86bd5..a082edb76c9f 100644
--- a/profiles/default-sparc-1.0/virtuals
+++ b/profiles/default-sparc-1.0/virtuals
@@ -21,4 +21,6 @@ virtual/emacs		app-editors/emacs
 net-www/netscape	net-www/netscape-communicator
 virtual/cron		sys-apps/dcron
 sys-apps/reiserfs-utils sys-apps/reiserfsprogs
+virtual/xemacs		app-editors/xemacs
+virtual/pppd		net-dialup/ppp
 virtual/sylpheed	net-mail/sylpheed