updates from x86

3 files changed, 37 insertions, 25 deletions

diff --git a/profiles/default-alpha-2004.0/make.defaults b/profiles/default-alpha-2004.0/make.defaults
index 0dc017add767..74abf2abc927 100644
--- a/profiles/default-alpha-2004.0/make.defaults
+++ b/profiles/default-alpha-2004.0/make.defaults
@@ -1,8 +1,20 @@
-# Copyright 2003 Gentoo Technologies, Inc.
+# Copyright 2004 Gentoo Technologies, Inc.
 # System-wide defaults for the Portage system on alpha
 
+#Experimental: trying to use these USE variables to build up from stage 2->3 
+#thus eliminating the inherent fragility of using USE for this
+
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+
+# Please avoid enabling things by default in here if possible. Understand any 
+# implications with core packages. For example, if "java" is in USE and db 
+# has a conditional dependency on java (which it does,) then a JDK will be 
+# pulled in during *emerge system*!
+
 USE="
 alpha
+arts
+avi
 berkdb
 crypt
 cups
@@ -19,8 +31,10 @@ jpeg
 kde
 libg++
 libwww
+mad
 mikmod
 motif
+mpeg
 ncurses
 nls
 oggvorbis
diff --git a/profiles/default-alpha-2004.0/packages b/profiles/default-alpha-2004.0/packages
index 137d2ca4b362..f89355345385 100644
--- a/profiles/default-alpha-2004.0/packages
+++ b/profiles/default-alpha-2004.0/packages
@@ -31,72 +31,71 @@
 # prevents the user from shooting himself/herself in the foot by installing a
 # wacky version.
 
-*>=sys-apps/baselayout-1.8.3
-*>=sys-apps/portage-2.0.36
-*>=sys-devel/binutils-2.13.90.0.4
-*>=sys-devel/gcc-3.2
-*>=sys-libs/glibc-2.2.5-r7
-*virtual/modutils
-virtual/os-headers
 >=app-admin/sysklogd-1.4.1
-*dev-lang/python
->=x11-base/xfree-4.2.1
-# sash - static shell for system recovery
+*app-arch/bzip2
+*app-arch/cpio
+*app-arch/gzip
+*app-arch/sharutils
+*app-arch/tar
+*app-shells/bash
 *app-shells/sash
 *dev-lang/perl
-*virtual/editor
+*dev-lang/python
 *net-misc/dhcpcd
 *net-misc/iputils
 *net-misc/rsync
 *net-misc/wget
-*app-shells/bash
-*app-arch/bzip2
-*sys-apps/kbd
+*>=sys-apps/baselayout-1.8.3
 *sys-apps/coreutils
-*app-arch/cpio
 *sys-apps/debianutils
 *sys-apps/diffutils
-*sys-fs/e2fsprogs
 *sys-apps/ed
 *sys-apps/fbset
 *sys-apps/file
 *sys-apps/findutils
-*sys-apps/slocate
 *sys-apps/gawk
 *sys-apps/grep
 *sys-apps/groff
-*app-arch/gzip
 *sys-apps/hdparm
+*sys-apps/kbd
 *sys-apps/less
 *sys-apps/man
 *sys-apps/man-pages
 *sys-apps/net-tools
+*sys-apps/pam-login
+*>=sys-apps/portage-2.0.36
 *sys-apps/procps
 *sys-apps/psmisc
 *sys-apps/sed
 *sys-apps/setserial
 *<sys-apps/shadow-5
-*sys-apps/pam-login
-*app-arch/sharutils
-*app-arch/tar
+*sys-apps/slocate
 *>=sys-apps/texinfo-4.2-r5
 *sys-apps/util-linux
 *sys-apps/which
 *sys-devel/autoconf
 *>=sys-devel/automake-1.6.1-r6
 *sys-devel/bc
+*>=sys-devel/binutils-2.13.90.0.4
 *sys-devel/bison
 *sys-devel/flex
+*>=sys-devel/gcc-3.2
 *>=sys-devel/libtool-1.4.1-r9
 *sys-devel/m4
 *sys-devel/make
 *sys-devel/patch
+*sys-fs/devfsd
+*sys-fs/e2fsprogs
 *sys-libs/cracklib  
 *sys-libs/db
+*>=sys-libs/glibc-2.2.5-r7
 *>=sys-libs/ncurses-5.2.20020112a
 *>=sys-libs/pam-0.75-r9
 *sys-libs/pwdb      
 *sys-libs/readline  
 *sys-libs/zlib
+*virtual/editor
+*virtual/modutils
+virtual/os-headers
 *virtual/ssh
-*sys-fs/devfsd
+>=x11-base/xfree-4.2.1
diff --git a/profiles/default-alpha-2004.0/virtuals b/profiles/default-alpha-2004.0/virtuals
index 3be751e01906..b0d8bad54485 100644
--- a/profiles/default-alpha-2004.0/virtuals
+++ b/profiles/default-alpha-2004.0/virtuals
@@ -43,9 +43,8 @@ virtual/tetex			app-text/tetex
 virtual/bittorrent		net-p2p/bittorrent
 virtual/logger			app-admin/sysklogd
 virtual/ssh				net-misc/openssh
+virtual/commonlisp		dev-lisp/cmucl dev-lisp/sbcl dev-lisp/cmucl
 virtual/tftp			net-misc/tftp-hpa
-sys-apps/reiserfs-utils	sys-fs/reiserfsprogs
-x11-libs/xaw			x11-libs/Xaw3d
 virtual/gzip			app-arch/gzip
 virtual/ghostscript		app-text/ghostscript
 virtual/w3m			net-www/w3m