still some mistakes

24 files changed, 356 insertions, 69 deletions

diff --git a/profiles/base/use.defaults b/profiles/base/use.defaults
index 9deccbb70dae..8b2ce1bc344a 100644
--- a/profiles/base/use.defaults
+++ b/profiles/base/use.defaults
@@ -8,6 +8,7 @@ directfb					dev-libs/DirectFB
 esd							media-sound/esound
 gdbm						sys-libs/gdbm
 ggi							media-libs/libggi
+gif							media-libs/giflib
 gnome						gnome-base/gnome
 gphoto2						media-gfx/gphoto2
 gpm							sys-libs/gpm
@@ -23,10 +24,12 @@ motif						x11-libs/openmotif
 mozilla						net-www/mozilla
 mysql						dev-db/mysql
 nas							media-libs/nas
+nls							sys-devel/gettext
 oggvorbis					media-libs/libvorbis
 opengl						virtual/opengl
 pam							sys-libs/pam
 perl						dev-lang/perl
+png							media-libs/libpng
 postgres					dev-db/postgresql
 python						dev-lang/python
 qt							x11-libs/qt
@@ -41,5 +44,6 @@ svga						media-libs/svgalib
 tcltk						dev-lang/tcl dev-lang/tk
 tcpd						sys-apps/tcp-wrappers
 tetex						app-text/tetex
+tiff						media-libs/tiff
 ungif						media-libs/ungif
 X							x11-base/xfree
diff --git a/profiles/default/make.defaults b/profiles/default/make.defaults
deleted file mode 100644
index 0073dcd35089..000000000000
--- a/profiles/default/make.defaults
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
-
-# Host-type
-CHOST=i486-pc-linux-gnu
-
-PLATFORM=$CHOST
-
-# 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 \${x} -P \${DISTDIR}"
-#For Prozilla (really rocks):
-#FETCHCOMMAND="/usr/bin/proz -s \${x} -P \${DISTDIR}"
-
-# Global configure options
-
-# C Compiler flags
-CFLAGS="-m486 -march=i486 -O2"
-# C++ Compiler flags
-CXXFLAGS="-m486 -march=i486 -O2"
diff --git a/profiles/default/parent b/profiles/default/parent
new file mode 100644
index 000000000000..df967b96a579
--- /dev/null
+++ b/profiles/default/parent
@@ -0,0 +1 @@
+base
diff --git a/profiles/default/use.mask b/profiles/default/use.mask
new file mode 100644
index 000000000000..54021e6ada55
--- /dev/null
+++ b/profiles/default/use.mask
@@ -0,0 +1,4 @@
+
+# Chris PeBenito <pebenito@gentoo.org>
+# must use a SELinux profile
+selinux
diff --git a/profiles/default/virtuals b/profiles/default/virtuals
index 32de60e804e2..0380d06eb9df 100644
--- a/profiles/default/virtuals
+++ b/profiles/default/virtuals
@@ -1,50 +1,3 @@
 virtual/kernel				sys-kernel/linux
 virtual/os-headers			sys-kernel/linux-headers
 virtual/modutils			sys-apps/modutils
-
-virtual/glibc				sys-libs/glibc
-
-virtual/cron				sys-apps/dcron
-virtual/dhcpc				net-misc/dhcpcd
-virtual/logger				app-admin/sysklogd
-sys-apps/reiserfs-utils		sys-apps/reiserfsprogs
-
-virtual/ghc					dev-lang/ghc-bin
-virtual/php					dev-php/mod_php
-virtual/python				dev-lang/python
-
-virtual/x11					x11-base/xfree
-virtual/opengl				x11-base/xfree
-virtual/glu					x11-base/xfree
-virtual/xft					x11-base/xfree
-
-virtual/glut				media-libs/glut
-x11-libs/xaw				x11-libs/Xaw3d
-
-virtual/mda					net-mail/procmail
-virtual/mta					net-mail/ssmtp
-virtual/imap				net-mail/courier-imap
-virtual/imap-c-client		net-libs/c-client
-virtual/sylpheed			net-mail/sylpheed
-
-virtual/editor				app-editors/nano
-virtual/textbrowser			net-www/links
-virtual/w3m					net-www/w3m
-
-virtual/blackbox			x11-wm/blackbox
-virtual/bittorrent			net-p2p/bittorrent
-virtual/inetd				sys-apps/xinetd
-virtual/krb5				app-crypt/heimdal
-virtual/snmp				net-analyzer/net-snmp
-
-virtual/aspell-dict			app-dicts/aspell-en
-virtual/skkserv				app-i18n/skkserv
-virtual/tetex				app-text/tetex
-
-virtual/flim				app-emacs/flim
-virtual/semi				app-emacs/semi
-
-virtual/mpg123				media-sound/mpg123
-virtual/gzip				app-arch/gzip
-virtual/lpr					net-print/cups
-virtual/alsa				media-sound/alsa-driver	
diff --git a/profiles/default/x86/1.0/make.defaults b/profiles/default/x86/1.0/make.defaults
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/profiles/default/x86/1.0/make.defaults
diff --git a/profiles/default/x86/1.0/packages b/profiles/default/x86/1.0/packages
new file mode 100644
index 000000000000..d52eabad837c
--- /dev/null
+++ b/profiles/default/x86/1.0/packages
@@ -0,0 +1,110 @@
+# 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
+# gcc-2.95.3-r1.  >=, <=, <, > and ~ can be used to offer a bit more
+# flexibility.  For example, >=sys-libs/glibc-2.2.4 will cause emerge to ignore
+# all glibc ebuilds with a version less than 2.2.4.  This allows us to have
+# profile-specific package.mask settings.  *All* lines are used for this
+# masking process, whether they are prefixed with a * or not.  And if a generic
+# dep is used, like "sys-apps/foo", then all versions of foo are included.  If
+# 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.
+
+#does not build with gcc-2.x
+<media-video/transcode-0.6.12
+sys-fs/ntfsprogs
+<app-arch/rar-3.2.0
+<dev-util/ddd-3.3.6
+
+*=sys-devel/gcc-2.95.3-r8
+*~sys-libs/glibc-2.2.5
+
+>=x11-base/xfree-4.1.0-r2
+
+# sash - static shell for system recovery
+*app-shells/sash
+
+*<sys-apps/shadow-5
+*>=sys-apps/texinfo-4.2-r1
+*>=sys-devel/automake-1.6.1-r5
+*>=sys-devel/libtool-1.4.1-r4
+*<sys-libs/readline-4.2 
+
+#these ones have the new rc6 style init scripts
+>=sys-libs/gpm-1.19.3-r5
+>=sys-apps/isapnptools-1.23-r6
+
+*>=sys-fs/devfsd-1.3.20
+>=sys-apps/xinetd-2.3.3-r6
+>=net-fs/samba-2.2.2-r6
+>=sys-apps/at-3.1.8-r6
+>=app-admin/fcron-1.1.1-r6
+>=app-admin/metalog-0.6-r6
+>=app-admin/mon-0.38.20-r6
+>=app-admin/syslog-ng-1.4.12-r6
+>=net-www/apache-1.3.20-r6
+>=net-analyzer/ucd-snmp-4.1.2-r6
+>=net-ftp/oftpd-0.3.6-r6
+>=net-ftp/proftpd-1.2.4-r6
+>=net-misc/dhcp-3.0_rc12-r6
+>=net-misc/bind-9.1.3-r6
+>=net-misc/netkit-timed-0.17-r6
+>=net-misc/pdnsd-1.1.6-r6
+>=net-mail/exim-3.32-r6
+>=net-misc/fakeidentd-1.4-r6
+>=net-nds/openldap-1.2.12-r6
+>=net-nds/portmap-5b-r6
+>=media-sound/alsa-utils-0.5.10-r6
+>=net-print/LPRng-3.7.9-r6
+>=net-nds/ypbind-1.7-r6
+>=net-nds/ypserv-1.3.9-r6
+>=net-print/cups-1.1.10-r6
+>=sys-apps/apmd-3.0.1-r6
+>=net-misc/portsentry-1.1-r6
+>=sys-apps/noflushd-2.4-r6
+>=app-text/dictd-1.5.5-r6
+>=net-fs/samba-winbind-20010329-r6
+>=net-www/wwwoffle-2.6d-r6
+>=net-www/squid-2.4.2s-r6
+>=net-dialup/ppp-2.4.1-r6
+=app-sci/octave-2.0*
+~media-video/cinelerra
+
+#GNUStep stuff works in gcc-3 only
+~dev-util/gnustep-back
+~dev-util/gnustep-base
+~dev-util/gnustep-gui
+~dev-util/gnustep-guile
+~dev-util/gnustep-make
+
+# Needs gcc-3
+dev-libs/elfutils
+~sys-devel/prelink
+<=app-arch/rpm-4.1
+<=games-emulation/fceultra-0.90
+<=sys-apps/attr-2.4.1
+
+# Needs >=readline-4.2
+<media-sound/cdcd-0.6.4
+<net-nds/openldap-2.0.27
diff --git a/profiles/default/x86/1.0/packages.build b/profiles/default/x86/1.0/packages.build
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/profiles/default/x86/1.0/packages.build
diff --git a/profiles/default/x86/1.0/use.defaults b/profiles/default/x86/1.0/use.defaults
new file mode 100644
index 000000000000..26869081edb8
--- /dev/null
+++ b/profiles/default/x86/1.0/use.defaults
@@ -0,0 +1 @@
+gnome-libs	gnome-base/gnome-libs
diff --git a/profiles/default/x86/1.0/virtuals b/profiles/default/x86/1.0/virtuals
new file mode 100644
index 000000000000..3b06e708a2a0
--- /dev/null
+++ b/profiles/default/x86/1.0/virtuals
@@ -0,0 +1,4 @@
+virtual/linux-sources				sys-kernel/gentoo-sources
+virtual/xemacs						app-editors/xemacs
+virtual/winkernel					sys-kernel/win4lin-sources
+virtual/wine						app-emulation/wine
diff --git a/profiles/default/x86/2004.0/make.defaults b/profiles/default/x86/2004.0/make.defaults
new file mode 100644
index 000000000000..fb8a1faa6ac0
--- /dev/null
+++ b/profiles/default/x86/2004.0/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 2002-2004 Gentoo Technologies, Inc.
+# System-wide defaults for the gcc 3 Portage system
+
+COMPILER="gcc3"
diff --git a/profiles/default/x86/2004.0/packages b/profiles/default/x86/2004.0/packages
new file mode 100644
index 000000000000..4576859a0f63
--- /dev/null
+++ b/profiles/default/x86/2004.0/packages
@@ -0,0 +1,40 @@
+# 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
+# gcc-2.95.3-r1.  >=, <=, <, > and ~ can be used to offer a bit more
+# flexibility.  For example, >=sys-libs/glibc-2.2.4 will cause emerge to ignore
+# all glibc ebuilds with a version less than 2.2.4.  This allows us to have
+# profile-specific package.mask settings.  *All* lines are used for this
+# masking process, whether they are prefixed with a * or not.  And if a generic
+# dep is used, like "sys-apps/foo", then all versions of foo are included.  If
+# 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-2.1
+>=sys-apps/baselayout-1.7.9-r1
+>=sys-devel/binutils-2.13.90.0.4
+>=sys-devel/gcc-3.2
+>=sys-libs/glibc-2.2.5
+
+>=x11-base/xfree-4.1.0-r12
diff --git a/profiles/default/x86/2004.0/packages.build b/profiles/default/x86/2004.0/packages.build
new file mode 100644
index 000000000000..05322d6fb280
--- /dev/null
+++ b/profiles/default/x86/2004.0/packages.build
@@ -0,0 +1,31 @@
+sys-apps/baselayout
+sys-libs/glibc
+sys-apps/texinfo
+app-shells/bash
+app-arch/bzip2
+sys-apps/debianutils
+sys-apps/diffutils
+sys-apps/file
+sys-apps/fileutils
+sys-apps/findutils
+sys-apps/gawk
+sys-apps/grep
+app-arch/gzip
+sys-apps/portage
+sys-apps/sed
+sys-apps/sh-utils
+app-arch/tar
+sys-apps/textutils
+sys-devel/binutils
+sys-devel/bison
+sys-devel/flex
+sys-devel/gcc
+sys-devel/make
+sys-devel/patch
+sys-devel/gettext
+dev-lang/python
+net-misc/wget
+net-misc/rsync
+app-editors/nano
+sys-apps/net-tools
+sys-apps/less
diff --git a/profiles/default/x86/2004.0/parent b/profiles/default/x86/2004.0/parent
new file mode 100644
index 000000000000..4ad96d51599f
--- /dev/null
+++ b/profiles/default/x86/2004.0/parent
@@ -0,0 +1 @@
+default
diff --git a/profiles/default/x86/2004.0/use.defaults b/profiles/default/x86/2004.0/use.defaults
new file mode 100644
index 000000000000..8b9be0c1f091
--- /dev/null
+++ b/profiles/default/x86/2004.0/use.defaults
@@ -0,0 +1,57 @@
+#gif
+#mmx
+#3dnow
+#odbc
+#fbcon		
+#oss
+#libg++
+#objprelink
+#nls
+#mitshm
+#sse
+xinerama
+directfb	dev-libs/DirectFB
+ungif		media-libs/ungif
+gtkhtml		gnome-extra/gtkhtml
+alsa		media-libs/alsa-lib
+gdbm		sys-libs/gdbm
+berkdb		sys-libs/db
+slang		sys-libs/slang
+readline	sys-libs/readline
+arts		kde-base/arts
+tetex		app-text/tetex
+aalib		media-libs/aalib	
+nas		media-libs/nas
+bonobo		gnome-base/bonobo
+svga		media-libs/svgalib
+ggi		media-libs/libggi
+tcltk		dev-lang/tcl dev-lang/tk
+java		virtual/jre
+guile		dev-util/guile
+ruby		dev-lang/ruby
+mysql		dev-db/mysql
+postgres	dev-db/postgresql
+X		x11-base/xfree
+sdl		media-libs/libsdl
+gpm		sys-libs/gpm
+tcpd		sys-apps/tcp-wrappers
+pam		sys-libs/pam
+libwww		net-libs/libwww
+ssl		dev-libs/openssl
+perl		dev-lang/perl
+python		dev-lang/python
+esd		media-sound/esound
+imlib		media-libs/imlib
+oggvorbis	media-libs/libvorbis
+gnome		gnome-base/gnome
+gtk		x11-libs/gtk+
+qt		x11-libs/qt
+kde		kde-base/kdebase
+motif		x11-libs/openmotif
+opengl		virtual/opengl
+mozilla		net-www/mozilla
+gphoto2		media-gfx/gphoto2
+ldap		net-nds/openldap
+snmp		net-analyzer/ucd-snmp
+cdr		app-cdr/cdrtools
+scanner		media-gfx/sane-backends
diff --git a/profiles/default/x86/2004.0/use.mask b/profiles/default/x86/2004.0/use.mask
new file mode 100644
index 000000000000..54021e6ada55
--- /dev/null
+++ b/profiles/default/x86/2004.0/use.mask
@@ -0,0 +1,4 @@
+
+# Chris PeBenito <pebenito@gentoo.org>
+# must use a SELinux profile
+selinux
diff --git a/profiles/default/x86/2004.0/virtuals b/profiles/default/x86/2004.0/virtuals
new file mode 100644
index 000000000000..278a0dbbf18b
--- /dev/null
+++ b/profiles/default/x86/2004.0/virtuals
@@ -0,0 +1 @@
+virtual/bootloader			sys-boot/grub
diff --git a/profiles/default/x86/make.defaults b/profiles/default/x86/make.defaults
new file mode 100644
index 000000000000..c2bba93803ae
--- /dev/null
+++ b/profiles/default/x86/make.defaults
@@ -0,0 +1,20 @@
+# Copyright 2002 Gentoo Technologies, Inc.
+# System-wide defaults for the gcc 3.2 Portage system
+
+#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="x86 oss apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gpm gtk gtk2 imlib
+jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis
+opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
+svga tcpd truetype X xml2 xmms xv zlib"
+
+ARCH="x86"
+ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default/x86/packages b/profiles/default/x86/packages
new file mode 100644
index 000000000000..63c0506a67cb
--- /dev/null
+++ b/profiles/default/x86/packages
@@ -0,0 +1,41 @@
+# 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
+# gcc-2.95.3-r1.  >=, <=, <, > and ~ can be used to offer a bit more
+# flexibility.  For example, >=sys-libs/glibc-2.2.4 will cause emerge to ignore
+# all glibc ebuilds with a version less than 2.2.4.  This allows us to have
+# profile-specific package.mask settings.  *All* lines are used for this
+# masking process, whether they are prefixed with a * or not.  And if a generic
+# dep is used, like "sys-apps/foo", then all versions of foo are included.  If
+# 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.
+
+*>=sys-devel/binutils-2.13.90.0.4
+
+>=x11-base/xfree-4.1.0-r2
+
+*sys-devel/bin86
+*>=sys-devel/libtool-1.4.1-r4
+*sys-libs/pwdb
+*sys-fs/devfsd
diff --git a/profiles/default/x86/packages.build b/profiles/default/x86/packages.build
new file mode 100644
index 000000000000..76f3abc1223d
--- /dev/null
+++ b/profiles/default/x86/packages.build
@@ -0,0 +1,31 @@
+app-arch/bzip2
+app-arch/gzip
+app-arch/tar
+app-editors/nano
+app-shells/bash
+dev-lang/python
+net-misc/rsync
+net-misc/wget
+sys-apps/baselayout
+sys-apps/coreutils
+sys-apps/debianutils
+sys-apps/diffutils
+sys-apps/file
+sys-apps/fileutils
+sys-apps/findutils
+sys-apps/gawk
+sys-apps/grep
+sys-apps/less
+sys-apps/net-tools
+sys-apps/portage
+sys-apps/sed
+sys-apps/texinfo
+sys-apps/textutils
+sys-devel/binutils
+sys-devel/bison
+sys-devel/flex
+sys-devel/gcc
+sys-devel/gettext
+sys-devel/make
+sys-devel/patch
+sys-libs/glibc
diff --git a/profiles/default/x86/parent b/profiles/default/x86/parent
new file mode 100644
index 000000000000..4ad96d51599f
--- /dev/null
+++ b/profiles/default/x86/parent
@@ -0,0 +1 @@
+default
diff --git a/profiles/default/x86/use.defaults b/profiles/default/x86/use.defaults
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/profiles/default/x86/use.defaults
diff --git a/profiles/default/x86/use.mask b/profiles/default/x86/use.mask
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/profiles/default/x86/use.mask
diff --git a/profiles/default/x86/virtuals b/profiles/default/x86/virtuals
new file mode 100644
index 000000000000..278a0dbbf18b
--- /dev/null
+++ b/profiles/default/x86/virtuals
@@ -0,0 +1 @@
+virtual/bootloader			sys-boot/grub