convert virtual/baselayout to sys-apps/baselayout

9 files changed, 18 insertions, 16 deletions

diff --git a/profiles/base/packages b/profiles/base/packages
index 826cd1aa8d08..23dc0681c3fc 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -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/base/packages,v 1.41 2008/02/06 16:25:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/packages,v 1.42 2008/03/30 16:52:44 vapier Exp $
 
 # Gentoo Base Profile
 
@@ -24,7 +24,7 @@
 # specific information in here. This file serves as a high level description
 # of the minimum set of packages needed for any Gentoo based system.
 
-*virtual/baselayout
+*sys-apps/baselayout
 *app-arch/bzip2
 *app-arch/cpio
 *app-arch/tar
diff --git a/profiles/base/virtuals b/profiles/base/virtuals
index 6aceaa852401..9d76d4c69a3e 100644
--- a/profiles/base/virtuals
+++ b/profiles/base/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/base/virtuals,v 1.109 2008/03/21 11:21:34 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.110 2008/03/30 16:52:44 vapier Exp $
 
 # This file describes the packages that by default satisfy a certain virtual
 # That this file exists in the base profile implies that these packages will
@@ -11,7 +11,6 @@
 virtual/alsa				sys-kernel/gentoo-sources
 virtual/antivirus			app-antivirus/clamav
 virtual/aspell-dict			app-dicts/aspell-en
-virtual/baselayout			sys-apps/baselayout
 virtual/blackbox			x11-wm/blackbox
 virtual/cdrtools			app-cdr/cdrkit
 virtual/commonlisp			dev-lisp/sbcl
diff --git a/profiles/default-bsd/fbsd/packages.build b/profiles/default-bsd/fbsd/packages.build
index 106c7eac6988..4498eb023773 100644
--- a/profiles/default-bsd/fbsd/packages.build
+++ b/profiles/default-bsd/fbsd/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/default-bsd/fbsd/packages.build,v 1.2 2007/07/13 13:13:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/packages.build,v 1.3 2008/03/30 16:52:45 vapier Exp $
 
 # This file describes the packages needed to build a stage 1 based on this
 # profile.  Packages in this file are built in order.
@@ -13,7 +13,7 @@ app-arch/libarchive
 app-shells/bash
 net-misc/rsync
 net-misc/wget
-virtual/baselayout
+sys-apps/baselayout
 sys-apps/diffutils
 sys-apps/file
 sys-apps/gawk
diff --git a/profiles/default-bsd/fbsd/virtuals b/profiles/default-bsd/fbsd/virtuals
index 08cd913ce67f..632eed3eec80 100644
--- a/profiles/default-bsd/fbsd/virtuals
+++ b/profiles/default-bsd/fbsd/virtuals
@@ -1,13 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/virtuals,v 1.7 2006/10/05 10:46:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/virtuals,v 1.8 2008/03/30 16:52:45 vapier Exp $
 
 # This file defines the virtuals that Gentoo/FreeBSD needs to modify respect
 # the base profile
 
 # KEEP THIS FILE SORTED ALPHABETICALLY OR RISK WRATH
 
-virtual/baselayout		sys-apps/baselayout
 virtual/bootloader		sys-freebsd/boot0
 virtual/inetd			sys-freebsd/freebsd-usbin
 virtual/libc			sys-freebsd/freebsd-lib
diff --git a/profiles/default-linux/amd64/vserver/packages b/profiles/default-linux/amd64/vserver/packages
index 1d65e89ed3ab..aa52767dd3c0 100644
--- a/profiles/default-linux/amd64/vserver/packages
+++ b/profiles/default-linux/amd64/vserver/packages
@@ -1,9 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/packages,v 1.3 2006/02/28 07:13:45 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/packages,v 1.4 2008/03/30 16:52:46 vapier Exp $
 
 # we don't want those by default
 -*sys-apps/hdparm
 -*sys-apps/kbd
 -*sys-fs/e2fsprogs
 -*virtual/modutils
+
+-*sys-apps/baselayout
+*sys-apps/baselayout-vserver
diff --git a/profiles/default-linux/amd64/vserver/virtuals b/profiles/default-linux/amd64/vserver/virtuals
index bf60fdf2f46f..89d42768bf33 100644
--- a/profiles/default-linux/amd64/vserver/virtuals
+++ b/profiles/default-linux/amd64/vserver/virtuals
@@ -1,7 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/virtuals,v 1.1 2006/02/23 04:58:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/virtuals,v 1.2 2008/03/30 16:52:46 vapier Exp $
 
 # see bug #105616 why this is in here
 virtual/dev-manager	sys-apps/baselayout-vserver
-virtual/baselayout	sys-apps/baselayout-vserver
diff --git a/profiles/default-linux/packages.build b/profiles/default-linux/packages.build
index be47874cf430..9ef38bed7e30 100644
--- a/profiles/default-linux/packages.build
+++ b/profiles/default-linux/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/default-linux/packages.build,v 1.18 2008/02/06 16:25:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/packages.build,v 1.19 2008/03/30 16:52:46 vapier Exp $
 
 # This file describes the packages needed to build a stage 1 based on this
 # profile.  Packages in this file are built in order.
@@ -16,7 +16,7 @@ app-arch/tar
 app-shells/bash
 net-misc/rsync
 net-misc/wget
-virtual/baselayout
+sys-apps/baselayout
 sys-devel/autoconf
 sys-devel/automake
 sys-devel/libtool
diff --git a/profiles/default-linux/x86/vserver/packages b/profiles/default-linux/x86/vserver/packages
index d32436deeb5e..afcfd1f1c4bc 100644
--- a/profiles/default-linux/x86/vserver/packages
+++ b/profiles/default-linux/x86/vserver/packages
@@ -1,9 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/vserver/packages,v 1.1 2006/02/23 04:58:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/vserver/packages,v 1.2 2008/03/30 16:52:47 vapier Exp $
 
 # we don't want those by default
 -*sys-apps/hdparm
 -*sys-apps/kbd
 -*sys-fs/e2fsprogs
 -*virtual/modutils
+
+-*sys-apps/baselayout
+*sys-apps/baselayout-vserver
diff --git a/profiles/default-linux/x86/vserver/virtuals b/profiles/default-linux/x86/vserver/virtuals
index 65696e0fc495..3398bc16f952 100644
--- a/profiles/default-linux/x86/vserver/virtuals
+++ b/profiles/default-linux/x86/vserver/virtuals
@@ -1,7 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/vserver/virtuals,v 1.3 2006/02/23 04:58:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/vserver/virtuals,v 1.4 2008/03/30 16:52:47 vapier Exp $
 
 # see bug #105616 why this is in here
 virtual/dev-manager	sys-apps/baselayout-vserver
-virtual/baselayout	sys-apps/baselayout-vserver