removed entries for console-tools and console-data, since those packages were just removed out of portage entirely

2 files changed, 85 insertions, 53 deletions

diff --git a/profiles/base/packages b/profiles/base/packages
index 3b8937c7a34c..3be7e8487278 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -1,5 +1,42 @@
 # Gentoo Base Profile
 
+# NOTE: THIS IS THE BASE PROFILE FOR *ANY* GENTOO BASED (GNU/LINUX) SYSTEM.
+# NO MODIFICATIONS MAY BE MADE TO THIS FILE WITHOUT PRIOR DISCUSSION.  IF
+# YOU ARE CREATING A NEW PROFILE, YOU SIMPLY NEED TO INHERIT THIS BASE
+# PROFILE IN YOUR PROFILE DIRECTORY'S "parent" FILE.
+
+
+# OK, you're staring at this file and you have no idea what these stars are
+# for.  HEre's teh scoop.  An initial "*" marks a package that is part of
+# the official BASE system profile.  If there is a "*" then `emerge system`
+# will use the line in its calculations of what should be installed for the
+# base profile.  Lines without a "*" prefix will be ignored for profile
+# system calculations.
+
+# Now, this is new: *all* lines (with or without a 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 except for gcc-2.95.3-r1. The notation: >=, >, <=, <, and ~ can be
+# used to offer a bit more flexibility.  For example, >=sys-libs/glibc-2.2.4
+# will cause Portage 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 dependency is used, say "sys-apps/foo"
+# then all versions of foo are considered.  The key thing to note is that
+# this file does not need to end up being an exaustive list of portage
+# packages, just the ones critical to this profile hierarchy.
+
+# So, what happens to ${PORTDIR}/profiles/package.mask? It is still around,
+# and still useful.  But it should be mainly used for broken ebuilds and
+# packages only.  The 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 those versions down here.
+# This prevents the user from shooting themselves in the foot by installing
+# a non-working version.
+
 *app-arch/bzip2
 *app-arch/cpio
 *app-arch/gzip
@@ -9,10 +46,7 @@
 *app-shells/sash
 *dev-lang/perl
 *dev-lang/python
-*net-firewall/iptables
-*net-misc/dhcpcd
 *net-misc/iputils
-*net-misc/openssh
 *net-misc/rsync
 *net-misc/wget
 *sys-apps/baselayout
@@ -33,7 +67,7 @@
 *sys-apps/man-pages
 *sys-apps/net-tools
 *sys-apps/pam-login
-*sys-apps/portage
+*>=sys-apps/portage-2.0.50-r1
 *sys-apps/procps
 *sys-apps/psmisc
 *sys-apps/sed
@@ -60,7 +94,7 @@
 *sys-libs/pam
 *sys-libs/readline
 *sys-libs/zlib
-*virtual/bootloader
 *virtual/editor
 *virtual/glibc
 *virtual/modutils
+*virtual/ssh
diff --git a/profiles/base/virtuals b/profiles/base/virtuals
index c4691f445b82..9eab2af9861d 100644
--- a/profiles/base/virtuals
+++ b/profiles/base/virtuals
@@ -1,51 +1,49 @@
-sys-apps/console-tools	sys-apps/kbd
-sys-apps/reiserfs-utils	sys-fs/reiserfsprogs
-virtual/alsa		media-sound/alsa-driver    
-virtual/antivirus	net-mail/clamav
-virtual/aspell-dict	app-dicts/aspell-en
-virtual/bittorrent	net-p2p/bittorrent
-virtual/blackbox	x11-wm/blackbox
-virtual/cron		sys-apps/vixie-cron
-virtual/editor		app-editors/nano
-virtual/emacs		app-editors/emacs
-virtual/flim		app-emacs/flim
-virtual/ghc		dev-lang/ghc-bin
-virtual/ghostscript	app-text/ghostscript
-virtual/glibc		sys-libs/glibc
-virtual/glu		x11-base/xfree
-virtual/glut		media-libs/glut
-virtual/gzip		app-arch/gzip
-virtual/imap-c-client	net-libs/c-client
-virtual/imapUW		net-mail/uw-imap
-virtual/imapd		net-mail/courier-imap
-virtual/inetd		sys-apps/xinetd
-virtual/jack		media-sound/jack-audio-connection-kit
-virtual/jdk		dev-java/blackdown-jdk
-virtual/jre		dev-java/blackdown-jre
-virtual/kernel		sys-kernel/linux-headers
-virtual/krb5		app-crypt/heimdal
-virtual/logger		app-admin/syslog-ng
-virtual/lpr		net-print/cups
-virtual/mda		net-mail/procmail
-virtual/modutils	sys-apps/module-init-tools
-virtual/mpg123		media-sound/mpg123
-virtual/mta		net-mail/ssmtp
-virtual/opengl		x11-base/xfree
-virtual/os-headers	sys-kernel/linux-headers
-virtual/php		dev-php/mod_php
-virtual/python		dev-lang/python
-virtual/quicktime	media-libs/libquicktime
-virtual/semi		app-emacs/semi
-virtual/skkserv		app-i18n/skkserv
-virtual/snmp		net-analyzer/net-snmp
-virtual/ssh		net-misc/openssh
-virtual/sylpheed	net-mail/sylpheed
-virtual/tetex		app-text/tetex
-virtual/textbrowser	net-www/links
-virtual/tftp		net-misc/tftp-hpa
-virtual/w3m		net-www/w3m
-virtual/x11		x11-base/xfree
-virtual/xemacs		app-editors/xemacs
+virtual/alsa					media-sound/alsa-driver    
+virtual/antivirus				net-mail/clamav
+virtual/aspell-dict				app-dicts/aspell-en
+virtual/bittorrent				net-p2p/bittorrent
+virtual/blackbox				x11-wm/blackbox
+virtual/cron					sys-apps/vixie-cron
+virtual/editor					app-editors/nano
+virtual/emacs					app-editors/emacs
+virtual/flim					app-emacs/flim
+virtual/ghc						dev-lang/ghc-bin
+virtual/ghostscript				app-text/ghostscript
+virtual/glibc					sys-libs/glibc
+virtual/glu						x11-base/xfree
+virtual/glut					media-libs/glut
+virtual/gzip					app-arch/gzip
+virtual/imap-c-client			net-libs/c-client
+virtual/imapUW					net-mail/uw-imap
+virtual/imapd					net-mail/courier-imap
+virtual/inetd					sys-apps/xinetd
+virtual/jack					media-sound/jack-audio-connection-kit
+virtual/jdk						dev-java/blackdown-jdk
+virtual/jre						dev-java/blackdown-jre
+virtual/kernel					sys-kernel/linux-headers
+virtual/krb5					app-crypt/heimdal
+virtual/logger					app-admin/syslog-ng
+virtual/lpr						net-print/cups
+virtual/mda						net-mail/procmail
+virtual/modutils				sys-apps/module-init-tools
+virtual/mpg123					media-sound/mpg123
+virtual/mta						net-mail/ssmtp
+virtual/opengl					x11-base/xfree
+virtual/os-headers				sys-kernel/linux-headers
+virtual/php						dev-php/mod_php
+virtual/python					dev-lang/python
+virtual/quicktime				media-libs/libquicktime
+virtual/semi					app-emacs/semi
+virtual/skkserv					app-i18n/skkserv
+virtual/snmp					net-analyzer/net-snmp
+virtual/ssh						net-misc/openssh
+virtual/sylpheed				net-mail/sylpheed
+virtual/tetex					app-text/tetex
+virtual/textbrowser				net-www/links
+virtual/tftp					net-misc/tftp-hpa
+virtual/w3m						net-www/w3m
+virtual/x11						x11-base/xfree
+virtual/xemacs					app-editors/xemacs
 virtual/xft		x11-base/xfree
 x11-libs/xaw		x11-libs/Xaw3d
 virtual/dhcpc		net-misc/dhcpcd