multilib fixes

3 files changed, 157 insertions, 16 deletions

diff --git a/profiles/default-linux/amd64/vserver/packages b/profiles/default-linux/amd64/vserver/packages
index 22b0bda0faf1..1d65e89ed3ab 100644
--- a/profiles/default-linux/amd64/vserver/packages
+++ b/profiles/default-linux/amd64/vserver/packages
@@ -1,20 +1,9 @@
 # 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.2 2006/02/24 14:34:53 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/packages,v 1.3 2006/02/28 07:13:45 hollow Exp $
 
 # we don't want those by default
 -*sys-apps/hdparm
 -*sys-apps/kbd
 -*sys-fs/e2fsprogs
 -*virtual/modutils
-
-*>=sys-devel/binutils-2.15.90.0.1.1-r4
-*>=sys-devel/gcc-3.4.3-r1
-
-# ${CHOST} over ${ABI} changes went into 2.3.5-r2
-*>=sys-libs/glibc-2.3.5-r2
-
-# Sandbox broken out
-*>=sys-apps/portage-2.0.51.22
-
-*>=sys-apps/baselayout-vserver-1.11.13-r1
diff --git a/profiles/default-linux/amd64/vserver/packages.build b/profiles/default-linux/amd64/vserver/packages.build
index d681c8d3b9e1..f4350a0c34f8 100644
--- a/profiles/default-linux/amd64/vserver/packages.build
+++ b/profiles/default-linux/amd64/vserver/packages.build
@@ -1,6 +1,82 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 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.build,v 1.1 2006/02/23 04:58:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/packages.build,v 1.2 2006/02/28 07:13:45 hollow Exp $
 
+# This file describes the packages needed to build a stage 1 based on this
+# profile.  Packages in this file are built in order.
+
+# Please do not move perl before baselayout doing so will break lib -> lib64
+# symlinks on systems that use them.
+
+# While shadow could be in here, it breaks stage 1 and stage 2 building for the
+# releases.  PLEASE DO NOT ENABLE THIS UNLESS YOU HAVE THOROUGHLY TEST IT!
+
+# We need to remove all packages, and add them afterwards to get
+# the right order of packages. Not doing so will break lib -> lib64
+# symlinks due to baselayout-vserver getting injected in the end
+
+-app-arch/bzip2
+-app-arch/tar
+-app-shells/bash
+-net-misc/rsync
+-net-misc/wget
 -sys-apps/baselayout
+-sys-apps/coreutils
+-sys-apps/debianutils
+-sys-apps/diffutils
+-sys-apps/file
+-sys-apps/findutils
+-sys-apps/gawk
+-sys-apps/grep
+-sys-apps/less
+-sys-apps/net-tools
+-sys-apps/portage
+-sys-apps/sed
+-sys-apps/texinfo
+-sys-devel/binutils
+-sys-devel/bison
+-sys-devel/flex
+-sys-devel/gcc
+-sys-devel/gettext
+-sys-devel/gnuconfig
+-sys-devel/make
+-sys-devel/patch
+-dev-lang/perl
+-dev-lang/python
+-virtual/editor
+-virtual/gzip
+-virtual/libc
+-virtual/os-headers
+
+app-arch/bzip2
+app-arch/tar
+app-shells/bash
+net-misc/rsync
+net-misc/wget
 sys-apps/baselayout-vserver
+sys-apps/coreutils
+sys-apps/debianutils
+sys-apps/diffutils
+sys-apps/file
+sys-apps/findutils
+sys-apps/gawk
+sys-apps/grep
+sys-apps/less
+sys-apps/net-tools
+sys-apps/portage
+sys-apps/sed
+sys-apps/texinfo
+sys-devel/binutils
+sys-devel/bison
+sys-devel/flex
+sys-devel/gcc
+sys-devel/gettext
+sys-devel/gnuconfig
+sys-devel/make
+sys-devel/patch
+dev-lang/perl
+dev-lang/python
+virtual/editor
+virtual/gzip
+virtual/libc
+virtual/os-headers
diff --git a/profiles/default-linux/x86/vserver/packages.build b/profiles/default-linux/x86/vserver/packages.build
index 8cdcb2998836..099f7a651931 100644
--- a/profiles/default-linux/x86/vserver/packages.build
+++ b/profiles/default-linux/x86/vserver/packages.build
@@ -1,6 +1,82 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 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.build,v 1.1 2006/02/23 04:58:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/vserver/packages.build,v 1.2 2006/02/28 07:13:45 hollow Exp $
 
+# This file describes the packages needed to build a stage 1 based on this
+# profile.  Packages in this file are built in order.
+
+# Please do not move perl before baselayout doing so will break lib -> lib64
+# symlinks on systems that use them.
+
+# While shadow could be in here, it breaks stage 1 and stage 2 building for the
+# releases.  PLEASE DO NOT ENABLE THIS UNLESS YOU HAVE THOROUGHLY TEST IT!
+
+# We need to remove all packages, and add them afterwards to get
+# the right order of packages. Not doing so will break lib -> lib64
+# symlinks due to baselayout-vserver getting injected in the end
+
+-app-arch/bzip2
+-app-arch/tar
+-app-shells/bash
+-net-misc/rsync
+-net-misc/wget
 -sys-apps/baselayout
+-sys-apps/coreutils
+-sys-apps/debianutils
+-sys-apps/diffutils
+-sys-apps/file
+-sys-apps/findutils
+-sys-apps/gawk
+-sys-apps/grep
+-sys-apps/less
+-sys-apps/net-tools
+-sys-apps/portage
+-sys-apps/sed
+-sys-apps/texinfo
+-sys-devel/binutils
+-sys-devel/bison
+-sys-devel/flex
+-sys-devel/gcc
+-sys-devel/gettext
+-sys-devel/gnuconfig
+-sys-devel/make
+-sys-devel/patch
+-dev-lang/perl
+-dev-lang/python
+-virtual/editor
+-virtual/gzip
+-virtual/libc
+-virtual/os-headers
+
+app-arch/bzip2
+app-arch/tar
+app-shells/bash
+net-misc/rsync
+net-misc/wget
 sys-apps/baselayout-vserver
+sys-apps/coreutils
+sys-apps/debianutils
+sys-apps/diffutils
+sys-apps/file
+sys-apps/findutils
+sys-apps/gawk
+sys-apps/grep
+sys-apps/less
+sys-apps/net-tools
+sys-apps/portage
+sys-apps/sed
+sys-apps/texinfo
+sys-devel/binutils
+sys-devel/bison
+sys-devel/flex
+sys-devel/gcc
+sys-devel/gettext
+sys-devel/gnuconfig
+sys-devel/make
+sys-devel/patch
+dev-lang/perl
+dev-lang/python
+virtual/editor
+virtual/gzip
+virtual/libc
+virtual/os-headers