cleanup + some updates

12 files changed, 17 insertions, 70 deletions

diff --git a/profiles/vserver/make.defaults b/profiles/vserver/make.defaults
index 4863f60aea22..b8646a1bfb5f 100644
--- a/profiles/vserver/make.defaults
+++ b/profiles/vserver/make.defaults
@@ -1,14 +1,5 @@
 # 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.1 2005/04/20 17:44:59 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*!
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/make.defaults,v 1.2 2005/06/08 09:28:44 hollow Exp $
 
-# make sure toolchain has sane defaults
-USE="fortran"
+USE="berkdb crypt gdbm ncurses nls pam perl python readline ssl zlib"
diff --git a/profiles/vserver/packages b/profiles/vserver/packages
deleted file mode 100644
index f110d3e91274..000000000000
--- a/profiles/vserver/packages
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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.1 2005/04/20 17:44:59 hollow Exp $
-
-# 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-apps/ed
--*sys-apps/net-tools
--*sys-fs/e2fsprogs
--*virtual/dev-manager
--*virtual/modutils
--*virtual/ssh
diff --git a/profiles/vserver/packages.build b/profiles/vserver/packages.build
index 120906cb3918..38c2734dd4c5 100644
--- a/profiles/vserver/packages.build
+++ b/profiles/vserver/packages.build
@@ -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/packages.build,v 1.1 2005/04/20 17:44:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/packages.build,v 1.2 2005/06/08 09:28:44 hollow Exp $
 
 # This file describes the packages needed to build a stage 1 based on this
 # profile
diff --git a/profiles/vserver/parent b/profiles/vserver/parent
index 028faabd77c8..a385455bf835 100644
--- a/profiles/vserver/parent
+++ b/profiles/vserver/parent
@@ -1,6 +1,6 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/parent,v 1.1 2005/04/20 17:44:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/parent,v 1.2 2005/06/08 09:28:44 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/use.defaults b/profiles/vserver/use.defaults
index 8605e914db45..d2d9d612f01b 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.1 2005/04/20 17:44:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/use.defaults,v 1.2 2005/06/08 09:28:44 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 0470ea7e39e4..4b66f3faf4ee 100644
--- a/profiles/vserver/use.mask
+++ b/profiles/vserver/use.mask
@@ -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.mask,v 1.3 2005/05/21 01:13:42 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/use.mask,v 1.4 2005/06/08 09:28:44 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
@@ -21,6 +21,7 @@ ultra1
 # x86 only
 divx4linux
 win32codecs
+kqemu
 
 # x86/amd64 only:
 mmx
@@ -32,12 +33,11 @@ sse2
 
 # ppc only:
 altivec
+ppcsha1
 
 # mips only:
 n32
 n64
-cobalt
-ip28
 
 # Only used by mips and old amd64 profiles
 multilib
diff --git a/profiles/vserver/virtuals b/profiles/vserver/virtuals
index a8f260b94525..6df080b50254 100644
--- a/profiles/vserver/virtuals
+++ b/profiles/vserver/virtuals
@@ -1,6 +1,6 @@
-# Copyright 2004 Gentoo Foundation.
+# 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.1 2005/04/20 17:44:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/virtuals,v 1.2 2005/06/08 09:28:44 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
diff --git a/profiles/vserver/x86/make.defaults b/profiles/vserver/x86/make.defaults
index fb5ed50fced7..f34671248e0e 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.1 2005/04/20 17:44:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/make.defaults,v 1.2 2005/06/08 09:28:44 hollow Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
@@ -8,9 +8,3 @@ ACCEPT_KEYWORDS="x86"
 CHOST="i686-pc-linux-gnu"
 CFLAGS="-O2 -mcpu=i686 -pipe"
 CXXFLAGS="${CFLAGS}"
-
-FEATURES="sandbox sfperms strict"
-
-GRP_STAGE23_USE="pam readline ssl perl python berkdb ncurses"
-
-USE="berkdb crypt fortran gdbm ncurses pam perl python readline ssl zlib"
diff --git a/profiles/vserver/x86/packages b/profiles/vserver/x86/packages
deleted file mode 100644
index 4be5af47a444..000000000000
--- a/profiles/vserver/x86/packages
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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.1 2005/04/20 17:44:59 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 163b574f0c01..ef6e70507957 100644
--- a/profiles/vserver/x86/parent
+++ b/profiles/vserver/x86/parent
@@ -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/x86/parent,v 1.2 2005/05/10 02:14:21 swegener Exp $
+# 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.3 2005/06/08 09:28:44 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 825d35923977..2a63a892ebb9 100644
--- a/profiles/vserver/x86/use.mask
+++ b/profiles/vserver/x86/use.mask
@@ -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/x86/use.mask,v 1.2 2005/05/21 01:13:42 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/use.mask,v 1.3 2005/06/08 09:28:44 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
@@ -16,4 +16,4 @@
 -3dnowext
 -win32codecs
 -divx4linux
-
+-kqemu
diff --git a/profiles/vserver/x86/virtuals b/profiles/vserver/x86/virtuals
deleted file mode 100644
index 4d8c96019cc0..000000000000
--- a/profiles/vserver/x86/virtuals
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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.1 2005/04/20 17:44:59 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/linux-sources	sys-kernel/gentoo-sources