sync with default-linux + minimal profile updated

15 files changed, 82 insertions, 45 deletions

diff --git a/profiles/vserver/make.defaults b/profiles/vserver/make.defaults
index e147f224be17..b1c00bcb568b 100644
--- a/profiles/vserver/make.defaults
+++ b/profiles/vserver/make.defaults
@@ -1,6 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/make.defaults,v 1.3 2005/06/12 08:16:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/make.defaults,v 1.4 2005/09/26 10:34:24 hollow Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
+#
+# 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*!
 
 # make sure toolchain has sane defaults
-USE="fortran"
+USE="${USE} fortran"
diff --git a/profiles/vserver/packages b/profiles/vserver/packages
index 34246c50f1dc..a163dae225ae 100644
--- a/profiles/vserver/packages
+++ b/profiles/vserver/packages
@@ -1,16 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/packages,v 1.4 2005/09/05 20:11:03 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/packages,v 1.5 2005/09/26 10:34:24 hollow Exp $
 
-# useless inside vservers
--*sys-apps/busybox
--*sys-apps/groff
--*sys-apps/udev
--*sys-devel/gettext
+# This file extends the base packages file for the default profile that all
+# architectures will enjoy.  Please note that default is what most architectures
+# will have.  Some will have an selinux profile (see ${PORTDIR}/profiles/selinux).
+# The idea is to only create a new family of profiles when absolutely necessary.
+
+*sys-libs/pwdb
+
+# we don't want those by default
+-*sys-apps/kbd
 -*sys-fs/e2fsprogs
 -*virtual/dev-manager
 -*virtual/modutils
 -*virtual/ssh
-
-# core apps
-*virtual/baselayout
diff --git a/profiles/vserver/packages.build b/profiles/vserver/packages.build
index f9a44d360291..5def5291827f 100644
--- a/profiles/vserver/packages.build
+++ b/profiles/vserver/packages.build
@@ -1,15 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/packages.build,v 1.3 2005/06/12 08:16:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/packages.build,v 1.4 2005/09/26 10:34:24 hollow Exp $
 
 # This file describes the packages needed to build a stage 1 based on this
-# profile
+# profile.  Packages in this file are built in order.
 
 app-arch/bzip2
-app-arch/gzip
 app-arch/tar
-app-editors/nano
 app-shells/bash
+dev-lang/perl
 dev-lang/python
 net-misc/rsync
 net-misc/wget
@@ -31,6 +30,10 @@ sys-devel/bison
 sys-devel/flex
 sys-devel/gcc
 sys-devel/gettext
+sys-devel/gnuconfig
 sys-devel/make
 sys-devel/patch
-sys-libs/glibc
+virtual/editor
+virtual/gzip
+virtual/libc
+virtual/os-headers
diff --git a/profiles/vserver/parent b/profiles/vserver/parent
index 79e113f4153f..b3f4023064c9 100644
--- a/profiles/vserver/parent
+++ b/profiles/vserver/parent
@@ -1,7 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/parent,v 1.3 2005/06/12 08:16:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/parent,v 1.4 2005/09/26 10:34:24 hollow Exp $
 
 # This file describes the parent profile to this.  In most cases this will
 # just be the name of the parent directory
+
 ../base
diff --git a/profiles/vserver/use.defaults b/profiles/vserver/use.defaults
index d2d9d612f01b..1c6ef5a4ec5c 100644
--- a/profiles/vserver/use.defaults
+++ b/profiles/vserver/use.defaults
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/use.defaults,v 1.2 2005/06/08 09:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/use.defaults,v 1.3 2005/09/26 10:34:24 hollow Exp $
 
 # Use this to add linux specific architecture independent USE flags, to
 # extend the base profile's USE mappings
diff --git a/profiles/vserver/use.mask b/profiles/vserver/use.mask
index 6493dc9ec6cf..a7d8240aa8e7 100644
--- a/profiles/vserver/use.mask
+++ b/profiles/vserver/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/use.mask,v 1.5 2005/06/12 08:16:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/use.mask,v 1.6 2005/09/26 10:34:24 hollow Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -9,8 +9,9 @@
 
 uclibc
 
-# aqua USE flag is only valid on Mac OS X
+# USE flags only valid on Mac OS X
 aqua
+coreaudio
 
 # amd64 only:
 emul-linux-x86
@@ -34,6 +35,7 @@ sse2
 # ppc only:
 altivec
 ppcsha1
+pbbuttonsd
 
 # mips only:
 n32
diff --git a/profiles/vserver/virtuals b/profiles/vserver/virtuals
index 70f47acd50ea..21a6c6909b0d 100644
--- a/profiles/vserver/virtuals
+++ b/profiles/vserver/virtuals
@@ -1,10 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/virtuals,v 1.3 2005/06/12 08:16:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/virtuals,v 1.4 2005/09/26 10:34:24 hollow Exp $
 
 # Use this virtuals file to either overload the base profile's defined
 # virtuals, or add virtuals that are specific to this family of profiles
 
-virtual/kernel				sys-kernel/vanilla-sources
 virtual/os-headers			sys-kernel/linux-headers
 virtual/baselayout			sys-apps/baselayout-vserver
diff --git a/profiles/vserver/x86/make.defaults b/profiles/vserver/x86/make.defaults
index f1955bdbb153..757a97b69daa 100644
--- a/profiles/vserver/x86/make.defaults
+++ b/profiles/vserver/x86/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/make.defaults,v 1.3 2005/06/12 08:16:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/make.defaults,v 1.4 2005/09/26 10:34:24 hollow Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
@@ -9,5 +9,6 @@ CHOST="i686-pc-linux-gnu"
 CFLAGS="-O2 -mcpu=i686 -pipe"
 CXXFLAGS="${CFLAGS}"
 
-GRP_STAGE23_USE="berkdb crypt gdbm ncurses nls pam perl python readline ssl zlib"
-USE="berkdb crypt gdbm ncurses nls pam perl python readline ssl zlib"
+FEATURES="sandbox sfperms"
+
+USE="alsa apm arts avi berkdb bitmap-fonts crypt cups eds emboss encode fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls ogg oggvorbis opengl oss pam pdflib perl png python qt quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml2 xmms xv zlib"
diff --git a/profiles/vserver/x86/minimal/make.defaults b/profiles/vserver/x86/minimal/make.defaults
index 6e08b5372cca..480d6327b8cd 100644
--- a/profiles/vserver/x86/minimal/make.defaults
+++ b/profiles/vserver/x86/minimal/make.defaults
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/minimal/make.defaults,v 1.1 2005/09/05 20:31:39 phreak Exp $
-
-GRP_STAGE23_USE="-berkdb -crypt -gdbm -nls -pam -perl -python"
-USE="-berkdb -crypt -gdbm -gpm -nls -pam -perl -python"
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/minimal/make.defaults,v 1.2 2005/09/26 10:34:24 hollow Exp $
 
+USE="-* ncurses readline ssl zlib"
 FEATURES="nodoc noinfo noman"
diff --git a/profiles/vserver/x86/minimal/packages b/profiles/vserver/x86/minimal/packages
index 7ad44db4c07a..b4792d8fa217 100644
--- a/profiles/vserver/x86/minimal/packages
+++ b/profiles/vserver/x86/minimal/packages
@@ -1,8 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/minimal/packages,v 1.1 2005/09/05 20:31:39 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/minimal/packages,v 1.2 2005/09/26 10:34:24 hollow Exp $
 
 # unneeded inside minimal vservers
+-*net-misc/iputils
+-*sys-apps/groff
 -*sys-apps/man
 -*sys-apps/man-pages
 -*sys-apps/net-tools
+-*sys-apps/texinfo
+-*sys-libs/cracklib
+-*sys-libs/pwdb
+-*virtual/os-headers
diff --git a/profiles/vserver/x86/minimal/parent b/profiles/vserver/x86/minimal/parent
index cfe2c582dcd9..854eae30fbd8 100644
--- a/profiles/vserver/x86/minimal/parent
+++ b/profiles/vserver/x86/minimal/parent
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/minimal/parent,v 1.1 2005/09/05 20:31:39 phreak Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/minimal/parent,v 1.2 2005/09/26 10:34:24 hollow Exp $
 
 # This file describes the parent profile to this.  In most cases this will
 # just be the name of the parent directory
diff --git a/profiles/vserver/x86/packages b/profiles/vserver/x86/packages
new file mode 100644
index 000000000000..2565f2cf560e
--- /dev/null
+++ b/profiles/vserver/x86/packages
@@ -0,0 +1,14 @@
+# Copyright 2001-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/packages,v 1.3 2005/09/26 10:34:24 hollow 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 ARCHITECTURE!!
+
+# You can also add files to the base system itself if you prefix them with a
+# *
+
+>=sys-devel/binutils-2.13.90.0.4
diff --git a/profiles/vserver/x86/parent b/profiles/vserver/x86/parent
index 03060cfc60e5..6bcf41e4fbcd 100644
--- a/profiles/vserver/x86/parent
+++ b/profiles/vserver/x86/parent
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/parent,v 1.4 2005/06/12 08:16:16 hollow Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/parent,v 1.5 2005/09/26 10:34:24 hollow Exp $
 
 # This file describes the parent profile to this.  In most cases this will
 # just be the name of the parent directory
diff --git a/profiles/vserver/x86/use.mask b/profiles/vserver/x86/use.mask
index 07182ffd6ff5..9eee58ffe0b4 100644
--- a/profiles/vserver/x86/use.mask
+++ b/profiles/vserver/x86/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/use.mask,v 1.4 2005/06/12 08:16:16 hollow Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/use.mask,v 1.5 2005/09/26 10:34:24 hollow Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # x86 profile.  This works, for example, if another architecture's
@@ -17,3 +17,6 @@
 -win32codecs
 -divx4linux
 -kqemu
+
+# Unmask nvidia XvMC support
+-nvidia
diff --git a/profiles/vserver/x86/virtuals b/profiles/vserver/x86/virtuals
index e94ebb3d3434..4f5e5a2158cc 100644
--- a/profiles/vserver/x86/virtuals
+++ b/profiles/vserver/x86/virtuals
@@ -1,9 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/virtuals,v 1.3 2005/06/12 08:16:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/virtuals,v 1.4 2005/09/26 10:34:24 hollow Exp $
 
 # This file is used to either override or extend the parent profile's
 # virtuals mappings.   In this case, this is for ARCHITECTURE SPECIFIC
 # mappings
 
+virtual/bootloader		sys-boot/grub
 virtual/linux-sources	sys-kernel/gentoo-sources