adapt 2006.0 for vserver profile

4 files changed, 57 insertions, 2 deletions

diff --git a/profiles/default-linux/amd64/vserver/make.defaults b/profiles/default-linux/amd64/vserver/make.defaults
new file mode 100644
index 000000000000..2142c138e26c
--- /dev/null
+++ b/profiles/default-linux/amd64/vserver/make.defaults
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/make.defaults,v 1.1 2006/02/24 14:34:53 hollow Exp $
+
+FEATURES="sandbox autoconfig"
+
+MULTILIB_ABIS="x86 amd64"
+DEFAULT_ABI="amd64"
+ABI=${DEFAULT_ABI}
+
+#CFLAGS_amd64="-m64"
+#LDFLAGS_amd64="-m elf_x86_64"
+CHOST_amd64="x86_64-pc-linux-gnu"
+CDEFINE_amd64="__x86_64__"
+LIBDIR_amd64="lib64"
+
+# Added -L/emul* workaround to aid compilation of 32bit packages
+# See bug #88725 for more info - Herbie Hopkins <herbs@gentoo.org> 2005/04/19
+CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
+LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
+CHOST_x86="i686-pc-linux-gnu"
+CDEFINE_x86="__i386__"
+LIBDIR_x86="lib32"
+
+# In case someone wants to help out by setting FEATURES="multilib-strict"
+MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
+MULTILIB_STRICT_DENY="64-bit.*shared object"
+MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3|debug|portage)"
+
+# Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib
+SYMLINK_LIB="yes"
+
+# Switch to nptl, but no nptlonly yet.
+USE="nptl -nptlonly"
diff --git a/profiles/default-linux/amd64/vserver/package.mask b/profiles/default-linux/amd64/vserver/package.mask
index 582a0ce33341..b4e4747d77f6 100644
--- a/profiles/default-linux/amd64/vserver/package.mask
+++ b/profiles/default-linux/amd64/vserver/package.mask
@@ -1,7 +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/package.mask,v 1.1 2006/02/23 04:58:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/package.mask,v 1.2 2006/02/24 14:34:53 hollow Exp $
 
 # Benedikt Boehm <hollow@gentoo.org>
 # Mask baselayout in vservers. Use baselayout-vserver instead!
 sys-apps/baselayout
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# These are provided by non-emul packages now
+-=app-emulation/emul-linux-x86-glibc-1000
+<app-emulation/emul-linux-x86-glibc-1000
diff --git a/profiles/default-linux/amd64/vserver/packages b/profiles/default-linux/amd64/vserver/packages
index d06ddec05307..22b0bda0faf1 100644
--- a/profiles/default-linux/amd64/vserver/packages
+++ b/profiles/default-linux/amd64/vserver/packages
@@ -1,9 +1,20 @@
 # 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.1 2006/02/23 04:58:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/packages,v 1.2 2006/02/24 14:34:53 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/use.mask b/profiles/default-linux/amd64/vserver/use.mask
new file mode 100644
index 000000000000..49dc45a61bad
--- /dev/null
+++ b/profiles/default-linux/amd64/vserver/use.mask
@@ -0,0 +1,5 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/vserver/use.mask,v 1.1 2006/02/24 14:34:53 hollow Exp $
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# multilib is forced on when we have ${MULTILIB_ABIS} defined
+multilib