proper headers and other fixes

7 files changed, 70 insertions, 109 deletions

diff --git a/profiles/default/x86/2004.0/make.defaults b/profiles/default/x86/2004.0/make.defaults
index 68d71ceb11ca..600e9de98480 100644
--- a/profiles/default/x86/2004.0/make.defaults
+++ b/profiles/default/x86/2004.0/make.defaults
@@ -1,5 +1,9 @@
 # Copyright 2002 Gentoo Technologies, Inc.
-# System-wide defaults for the gcc 3.2 Portage system
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/2004.0/make.defaults,v 1.3 2004/03/18 00:16:43 seemant Exp $
+
+# System-wide defaults for the gcc 3.2 Portage system (2004.0)
+
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
 #thus eliminating the inherent fragility of using USE for this
diff --git a/profiles/default/x86/2004.0/packages b/profiles/default/x86/2004.0/packages
index 4576859a0f63..7f2915b7ecff 100644
--- a/profiles/default/x86/2004.0/packages
+++ b/profiles/default/x86/2004.0/packages
@@ -1,35 +1,17 @@
-# 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.
+# Copyright 2001-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/2004.0/packages,v 1.2 2004/03/18 00:16:43 seemant Exp $
+
+# For instructions on how this file works (as an inclusion mask, primarily),
+# please refer to ${PORTDIR}/profiles/base/packages
+
+# Use this file to lock down specific versions of packages ONLY TO THIS
+# SPECIFIC PROFILE!
+
+# You can also add files to the base system itself if you prefix them with a
+# *
+
+
 
 >dev-lang/gpc-2.1
 >=sys-apps/baselayout-1.7.9-r1
@@ -38,3 +20,6 @@
 >=sys-libs/glibc-2.2.5
 
 >=x11-base/xfree-4.1.0-r12
+
+>=app-admin/sysklogd-1.4.1
+<sys-apps/shadow-5
diff --git a/profiles/default/x86/2004.0/packages.build b/profiles/default/x86/2004.0/packages.build
index 05322d6fb280..146c1cd1ee7e 100644
--- a/profiles/default/x86/2004.0/packages.build
+++ b/profiles/default/x86/2004.0/packages.build
@@ -1,31 +1,33 @@
-sys-apps/baselayout
-sys-libs/glibc
-sys-apps/texinfo
-app-shells/bash
+# Copyright 2001-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/2004.0/packages.build,v 1.2 2004/03/18 00:16:43 seemant Exp $
+
 app-arch/bzip2
+app-arch/gzip
+app-arch/tar
+app-editors/nano
+app-shells/bash
+dev-lang/python
+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
-app-arch/gzip
+sys-apps/less
+sys-apps/net-tools
 sys-apps/portage
 sys-apps/sed
-sys-apps/sh-utils
-app-arch/tar
-sys-apps/textutils
+sys-apps/texinfo
 sys-devel/binutils
 sys-devel/bison
 sys-devel/flex
+sys-devel/gettext
 sys-devel/gcc
 sys-devel/make
 sys-devel/patch
-sys-devel/gettext
-dev-lang/python
-net-misc/wget
+sys-libs/glibc
 net-misc/rsync
-app-editors/nano
-sys-apps/net-tools
-sys-apps/less
+net-misc/wget
diff --git a/profiles/default/x86/2004.0/parent b/profiles/default/x86/2004.0/parent
index 4ad96d51599f..66d1c6225c71 100644
--- a/profiles/default/x86/2004.0/parent
+++ b/profiles/default/x86/2004.0/parent
@@ -1 +1,8 @@
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/2004.0/parent,v 1.2 2004/03/18 00:16:43 seemant Exp $
+
+# This file describes the parent profile to this.  In most cases this will
+# just be the name of the parent directory
+
 default
diff --git a/profiles/default/x86/2004.0/use.defaults b/profiles/default/x86/2004.0/use.defaults
index 8b9be0c1f091..709f20e4e90d 100644
--- a/profiles/default/x86/2004.0/use.defaults
+++ b/profiles/default/x86/2004.0/use.defaults
@@ -1,57 +1,12 @@
-#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
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/2004.0/use.defaults,v 1.2 2004/03/18 00:16:43 seemant Exp $
+
+# Use this file to override specific mappings indicating which package
+# satisfies a particular USE flag.  The base profile (in
+# ${PORTDIR}/profiles/base/use.defaults) will already describe those
+# mappings which apply to absolutely all architectures.  This file is used
+# to describe mappings which are unique to THIS SPECIFIC PROFILE ONLY.
+# Note, that these mappings extend the parent profiles' (its own parent,
+# grandparent, and so on up to the base profile).  However, mappings that
+# are present in the parents can be overridden in this file.
diff --git a/profiles/default/x86/2004.0/use.mask b/profiles/default/x86/2004.0/use.mask
index 54021e6ada55..97528e17d241 100644
--- a/profiles/default/x86/2004.0/use.mask
+++ b/profiles/default/x86/2004.0/use.mask
@@ -1,4 +1,7 @@
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/2004.0/use.mask,v 1.2 2004/03/18 00:16:43 seemant Exp $
 
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
+# This file serves as a mask file for USE flags.  This way flags that may be
+# invalid on a specific architecture or profile and not on this one will
+# be listed in here.
diff --git a/profiles/default/x86/2004.0/virtuals b/profiles/default/x86/2004.0/virtuals
index 278a0dbbf18b..8c109c24dcaa 100644
--- a/profiles/default/x86/2004.0/virtuals
+++ b/profiles/default/x86/2004.0/virtuals
@@ -1 +1,6 @@
-virtual/bootloader			sys-boot/grub
+# Copyright 2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/x86/2004.0/virtuals,v 1.2 2004/03/18 00:16:43 seemant Exp $
+
+# Use this virtuals file to override or add virtuals that are specific ONLY
+# TO THIS PROFILE!