cleanup

10 files changed, 35 insertions, 14 deletions

diff --git a/profiles/vserver/make.defaults b/profiles/vserver/make.defaults
index b8646a1bfb5f..e147f224be17 100644
--- a/profiles/vserver/make.defaults
+++ b/profiles/vserver/make.defaults
@@ -1,5 +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/make.defaults,v 1.2 2005/06/08 09:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/make.defaults,v 1.3 2005/06/12 08:16:16 hollow Exp $
 
-USE="berkdb crypt gdbm ncurses nls pam perl python readline ssl zlib"
+# make sure toolchain has sane defaults
+USE="fortran"
diff --git a/profiles/vserver/packages b/profiles/vserver/packages
new file mode 100644
index 000000000000..5c94a0eaa742
--- /dev/null
+++ b/profiles/vserver/packages
@@ -0,0 +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/packages,v 1.3 2005/06/12 08:16:16 hollow Exp $
+
+# useless inside vservers
+-*sys-fs/e2fsprogs
+-*virtual/dev-manager
+-*virtual/modutils
+-*virtual/ssh
diff --git a/profiles/vserver/packages.build b/profiles/vserver/packages.build
index 38c2734dd4c5..f9a44d360291 100644
--- a/profiles/vserver/packages.build
+++ b/profiles/vserver/packages.build
@@ -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/packages.build,v 1.2 2005/06/08 09:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/packages.build,v 1.3 2005/06/12 08:16:16 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 a385455bf835..79e113f4153f 100644
--- a/profiles/vserver/parent
+++ b/profiles/vserver/parent
@@ -1,8 +1,7 @@
 # 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.2 2005/06/08 09:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/parent,v 1.3 2005/06/12 08:16:16 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.mask b/profiles/vserver/use.mask
index 4b66f3faf4ee..6493dc9ec6cf 100644
--- a/profiles/vserver/use.mask
+++ b/profiles/vserver/use.mask
@@ -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/use.mask,v 1.4 2005/06/08 09:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/use.mask,v 1.5 2005/06/12 08:16:16 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
diff --git a/profiles/vserver/virtuals b/profiles/vserver/virtuals
index 6df080b50254..70f47acd50ea 100644
--- a/profiles/vserver/virtuals
+++ b/profiles/vserver/virtuals
@@ -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/virtuals,v 1.2 2005/06/08 09:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/virtuals,v 1.3 2005/06/12 08:16:16 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 f34671248e0e..f1955bdbb153 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.2 2005/06/08 09:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/make.defaults,v 1.3 2005/06/12 08:16:16 hollow Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
@@ -8,3 +8,6 @@ ACCEPT_KEYWORDS="x86"
 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"
diff --git a/profiles/vserver/x86/parent b/profiles/vserver/x86/parent
index ef6e70507957..03060cfc60e5 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.3 2005/06/08 09:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/vserver/x86/parent,v 1.4 2005/06/12 08:16:16 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 2a63a892ebb9..07182ffd6ff5 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.3 2005/06/08 09:28:44 hollow 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/use.mask,v 1.4 2005/06/12 08:16:16 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
diff --git a/profiles/vserver/x86/virtuals b/profiles/vserver/x86/virtuals
new file mode 100644
index 000000000000..e94ebb3d3434
--- /dev/null
+++ b/profiles/vserver/x86/virtuals
@@ -0,0 +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/x86/virtuals,v 1.3 2005/06/12 08:16:16 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