1.11.14 branch now supports the following:

- uniqify function for resolvconf-gentoo
- Added --svcdir to depscan.sh
(Portage version: 2.1_pre7-r4)

6 files changed, 681 insertions, 11 deletions

diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
index ef3a54b4e55e..cf2ca0dcd77e 100644
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ b/sys-apps/baselayout-vserver/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/baselayout-vserver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.31 2006/04/08 16:44:36 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.32 2006/04/08 17:27:03 phreak Exp $
+
+*baselayout-vserver-1.11.14-r5 (08 Apr 2006)
+
+  08 Apr 2006; Christian Heim <phreak@gentoo.org>
+  +files/baselayout-vserver-1.11.14-depscan.patch,
+  +files/baselayout-vserver-1.11.14-uniqify.patch,
+  +baselayout-vserver-1.11.14-r5.ebuild:
+  1.11.14 branch now supports the following:
+  - uniqify function for resolvconf-gentoo
+  - Added --svcdir to depscan.sh
 
 *baselayout-vserver-1.12.0_pre17 (08 Apr 2006)
 
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index 95aefca37c17..949d96b42640 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 19d9184a9313a92dde9feb402984f06f ChangeLog 6577
 RMD160 13d019f0f0b1bbe79d68be25593922167f3012f6 ChangeLog 6577
 SHA256 e6b009a9a64a21449d1500ea4760b2bf7c33ed06ffd7e6c8f13f8f68a9fd98b5 ChangeLog 6577
@@ -10,6 +7,9 @@ SHA256 7b2a4e9646ffb8545ad7cf22ac8914622b9b9e300157bfc1ba58c1ecf49855ad baselayo
 MD5 6f0c19788c06583d952eb0a384ab105a baselayout-vserver-1.11.14-r4.ebuild 15955
 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a baselayout-vserver-1.11.14-r4.ebuild 15955
 SHA256 9b42983666cdf06837bb7ecb53f8bb3b85ab7efc039d23b4974c778e9380384e baselayout-vserver-1.11.14-r4.ebuild 15955
+MD5 a1e448305a7a0de8b5560214114e34c8 baselayout-vserver-1.11.14-r5.ebuild 13726
+RMD160 510b1bbf9c29340d631e2fdca784588d1014b651 baselayout-vserver-1.11.14-r5.ebuild 13726
+SHA256 633ce9fc747b658f693a775baf0dadeb3f56b2e11dfaf53a0db24d4d7629f22c baselayout-vserver-1.11.14-r5.ebuild 13726
 MD5 c754f64f41bde63d9fb4e69982d43e9b baselayout-vserver-1.12.0_pre16-r1.ebuild 12560
 RMD160 6d4f648cc825eb7ce9f16d162a447f73c0c493a9 baselayout-vserver-1.12.0_pre16-r1.ebuild 12560
 SHA256 bd6d72758808c9ead0b800212f56500fa0424846528ccee4630192e4152b4000 baselayout-vserver-1.12.0_pre16-r1.ebuild 12560
@@ -22,6 +22,9 @@ SHA256 407f359ef068e20e4fee148b8b86d412928c69292bb9018fdc1549a237e2cbc4 baselayo
 MD5 ec29ba4690f7c58a8d562195bc9eed42 files/baselayout-vserver-1.11.14-adsl.patch 501
 RMD160 81db918f622eba2eef3f76e0441023998b367d3f files/baselayout-vserver-1.11.14-adsl.patch 501
 SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8 files/baselayout-vserver-1.11.14-adsl.patch 501
+MD5 5651d7e5c42c69c9343cb156fc816f9d files/baselayout-vserver-1.11.14-depscan.patch 3198
+RMD160 75cf15798fe495f7928d0dac4a620f6b4308b4e5 files/baselayout-vserver-1.11.14-depscan.patch 3198
+SHA256 8baf535a28e952a251d729de9c88941849dcf1e0fc1de4fa6fa143a0cc5de12c files/baselayout-vserver-1.11.14-depscan.patch 3198
 MD5 ab0d5a169769126f5c9d679a86244ee2 files/baselayout-vserver-1.11.14-essidnet.patch 619
 RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e files/baselayout-vserver-1.11.14-essidnet.patch 619
 SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b files/baselayout-vserver-1.11.14-essidnet.patch 619
@@ -37,6 +40,9 @@ SHA256 7f73007be5392e08711827128b8efa944ece58c5da7b5606f387b02e6a1aceb4 files/ba
 MD5 6a8967d43dfa400cdfbab80fc49a7e85 files/baselayout-vserver-1.11.14-udhcpc.patch 1301
 RMD160 e07f8165814a29dee4aa044e6817f8b79193403f files/baselayout-vserver-1.11.14-udhcpc.patch 1301
 SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc files/baselayout-vserver-1.11.14-udhcpc.patch 1301
+MD5 08385e878922e351d020a26fed4de4de files/baselayout-vserver-1.11.14-uniqify.patch 2080
+RMD160 3bbe90a05bd9db1ae552217ce5043cca80abf609 files/baselayout-vserver-1.11.14-uniqify.patch 2080
+SHA256 80290bcd0292af7911e865beae03e8e53d8d45486127ae394d3a843e1cdc8962 files/baselayout-vserver-1.11.14-uniqify.patch 2080
 MD5 b0fcc01c0f6a56b14f5c8e9cb86197a7 files/baselayout-vserver-1.12.0_pre16-depscan.patch 4318
 RMD160 c14ea46e7cfcf6bf401d44438ec3a2a06e13b429 files/baselayout-vserver-1.12.0_pre16-depscan.patch 4318
 SHA256 0c2657525b1473ead7c3f891e6c25d2a4ab6e207c626bed8572016c37616084e files/baselayout-vserver-1.12.0_pre16-depscan.patch 4318
@@ -49,6 +55,9 @@ SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/di
 MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r4 280
 RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r4 280
 SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r4 280
+MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r5 280
+RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r5 280
+SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r5 280
 MD5 df8b7ff09184684431afa2d74667a3e6 files/digest-baselayout-vserver-1.12.0_pre16 298
 RMD160 7272acfb7faca410ef2d90c5c12c775775608d20 files/digest-baselayout-vserver-1.12.0_pre16 298
 SHA256 89d7211dc57314c1709e05326f364247de371e76df6b10299115362360431414 files/digest-baselayout-vserver-1.12.0_pre16 298
@@ -61,10 +70,3 @@ SHA256 9ac0444b27e432cda49a8e0cac9a0ab8ee89a5839e0a7bb640e5016525025fc5 files/di
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata.xml 231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEN+xNflZ8QqxhrsMRAkltAJsF2TTcUddsCbZkbbBPtt4qXIUaxACdEvYH
-8OdbmswtYKx3Ei2Ww2QIfUU=
-=OmuF
------END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r5.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r5.ebuild
new file mode 100644
index 000000000000..009baaf3cb4d
--- /dev/null
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r5.ebuild
@@ -0,0 +1,442 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r5.ebuild,v 1.1 2006/04/08 17:27:03 phreak Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+SV=1.6.${PV##*.}
+
+S="${WORKDIR}/rc-scripts-vserver-${SV}"
+DESCRIPTION="Filesystem baselayout and init scripts for Linux-VServer"
+HOMEPAGE="http://dev.croup.de/proj/gentoo-vps"
+SRC_URI="mirror://gentoo/rc-scripts-vserver-${SV}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/rc-scripts-vserver-${SV}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/rc-scripts-vserver-${SV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bootstrap build static"
+
+# This version of baselayout needs gawk in /bin, but as we do not have
+# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
+# or "build" are in USE.
+RDEPEND=">=sys-apps/sysvinit-2.86-r3
+	!build? ( !bootstrap? (
+		>=sys-libs/readline-5.0-r1
+		>=app-shells/bash-3.0-r10
+		>=sys-apps/coreutils-5.2.1
+	) )"
+DEPEND="virtual/os-headers
+	>=sys-apps/portage-2.0.51"
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-adsl.patch
+	epatch "${FILESDIR}"/${P}-essidnet.patch
+	epatch "${FILESDIR}"/${P}-iwconfig.patch
+	epatch "${FILESDIR}"/${P}-udhcpc.patch
+	epatch "${FILESDIR}"/${P}-manuser.patch
+	epatch "${FILESDIR}"/${P}-iproute.patch
+	epatch "${FILESDIR}"/${P}-depscan.patch
+	epatch "${FILESDIR}"/${P}-uniqify.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+
+	make -C "${S}"/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" || die
+}
+
+# This is a temporary workaround until bug 9849 is completely solved
+# in portage.  We need to create the directories so they're available
+# during src_install, but when src_install is finished, call unkdir
+# to remove any empty directories instead of leaving them around.
+kdir() {
+	typeset -a args
+	typeset d
+
+	# Create the directories for the remainder of src_install, and
+	# remember how to create the directories later.
+	for d in "$@"; do
+		if [[ $d == /* ]]; then
+			install -d "${args[@]}" "${D}/${d}"
+			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
+install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+	|| ewarn "  can't create ${d}"
+touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+	|| ewarn "  can't create ${d}/.keep"
+EOF
+		else
+			args=("${args[@]}" "${d}")
+		fi
+	done
+}
+
+# Continued from kdir above...  This function removes any empty
+# directories as a temporary workaround for bug 9849.  The directories
+# (and .keep files) are re-created in pkg_postinst, which means they
+# aren't listed in CONTENTS, unfortunately.
+unkdir() {
+	einfo "Running unkdir to workaround bug 9849"
+	find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null
+	if [[ $? == 127 ]]; then
+		ewarn "Problem running unkdir: find command not found"
+	fi
+}
+
+# Same as kdir above, but for symlinks #103618
+ksym() {
+	echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn '  unable to symlink $2 to $1' ; }" \
+		>> "${D}"/usr/share/baselayout/mklinks.sh
+}
+
+src_install() {
+	local dir libdirs libdirs_env rcscripts_dir
+
+	# This directory is to stash away things that will be used in
+	# pkg_postinst; it's needed first for kdir to function
+	dodir /usr/share/baselayout
+
+	# Jeremy Huddleston <eradicator@gentoo.org>
+	# For multilib, we want to make sure that all our multilibdirs exist
+	# and make lib even if it's not listed as one (like on amd64/ppc64
+	# which sometimes has lib32/lib64 instead of lib/lib64).
+	# lib should NOT be a symlink to one of the other libdirs.
+	# Old systems with symlinks won't be affected by this change, as the
+	# symlinks already exist and won't get removed, but new systems will
+	# be setup properly.
+	#
+	# I'll be making a script to convert existing systems from symlink to
+	# nosymlink and putting it in /usr/portage/scripts.
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	# This should be /lib/rcscripts, but we have to support old profiles too.
+	if [[ ${SYMLINK_LIB} == "yes" ]]; then
+		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
+	else
+		rcscripts_dir="/lib/rcscripts"
+	fi
+
+	einfo "Creating directories..."
+	kdir /usr
+	kdir /usr/local
+	kdir /dev
+	kdir /dev/pts
+	kdir /dev/shm
+	kdir /etc/conf.d
+	kdir /etc/cron.daily
+	kdir /etc/cron.hourly
+	kdir /etc/cron.monthly
+	kdir /etc/cron.weekly
+	kdir /etc/env.d
+	dodir /etc/init.d			# .keep file might mess up init.d stuff
+	kdir /etc/opt
+	kdir /home
+	kdir ${rcscripts_dir}
+	kdir ${rcscripts_dir}/awk
+	kdir ${rcscripts_dir}/sh
+	kdir ${rcscripts_dir}/net.modules.d
+	kdir ${rcscripts_dir}/net.modules.d/helpers.d
+	kdir /mnt
+	kdir /opt
+	kdir -o root -g uucp -m0775 /var/lock
+	kdir /proc
+	kdir -m 0700 /root
+	kdir /sbin
+	kdir /usr/bin
+	kdir /usr/include
+	kdir /usr/include/asm
+	kdir /usr/include/linux
+	kdir /usr/local/bin
+	kdir /usr/local/games
+	kdir /usr/local/sbin
+	kdir /usr/local/share
+	kdir /usr/local/share/doc
+	kdir /usr/local/share/man
+	kdir /usr/local/src
+	kdir ${PORTDIR}
+	kdir /usr/sbin
+	kdir /usr/share/doc
+	kdir /usr/share/info
+	kdir /usr/share/man
+	kdir /usr/share/misc
+	kdir /usr/src
+	kdir -m 1777 /tmp
+	kdir /var
+	dodir /var/db/pkg			# .keep file messes up Portage
+	kdir /var/lib/misc
+	kdir /var/lock/subsys
+	kdir /var/log/news
+	kdir /var/run
+	kdir /var/spool
+	kdir /var/state
+	kdir -m 1777 /var/tmp
+
+	for dir in ${libdirs}; do
+		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
+		kdir /${dir}
+		kdir /usr/${dir}
+		kdir /usr/local/${dir}
+	done
+
+	# Ugly compatibility with stupid ebuilds and old profiles symlinks
+	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+	fi
+
+	# FHS compatibility symlinks stuff
+	ksym /var/tmp /usr/tmp
+	ksym share/man /usr/local/man
+
+	#
+	# Setup files in /etc
+	#
+	insopts -m0644
+	insinto /etc
+	doins -r "${S}"/etc/*
+
+	# Install some files to /usr/share/baselayout instead of /etc to keep from
+	# (1) overwriting the user's settings, (2) screwing things up when
+	# attempting to merge files, (3) accidentally packaging up personal files
+	# with quickpkg
+	fperms 0600 /etc/shadow
+	mv "${D}"/etc/{passwd,shadow,group,hosts} "${D}"/usr/share/baselayout
+
+	# doinitd doesnt respect symlinks
+	dodir /etc/init.d
+	cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd"
+	#doinitd "${S}"/init.d/* || die "doinitd"
+	doconfd "${S}"/etc/conf.d/* || die "doconfd"
+	doenvd "${S}"/etc/env.d/* || die "doenvd"
+
+	# Special-case uglyness... For people updating from lib32 -> lib amd64
+	# profiles, keep lib32 in the search path while it's around
+	if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
+		libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+	fi
+
+	# List all the multilib libdirs in /etc/env/04multilib (only if they're 
+	# actually different from the normal
+	if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then
+		echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
+	fi
+
+	# Stash the rc-lists for use during pkg_postinst
+	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
+
+	#
+	# Setup files related to /dev
+	#
+	into /
+	dosbin "${S}"/sbin/MAKEDEV
+	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
+	dosym ../sbin/MAKEDEV /dev/MAKEDEV
+
+	#
+	# Setup files in /bin
+	#
+	cd "${S}"/bin
+	dobin rc-status
+
+	#
+	# Setup files in /sbin
+	#
+	cd "${S}"/sbin
+	into /
+	dosbin rc rc-update
+	# These moved from /etc/init.d/ to /sbin to help newb systems
+	# from breaking
+	dosbin runscript.sh functions.sh
+
+	# Compat symlinks between /etc/init.d and /sbin
+	# (some stuff have hardcoded paths)
+	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
+	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
+	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
+
+	#
+	# Setup files in /lib/rcscripts
+	# These are support files for other things in baselayout that needn't be
+	# under CONFIG_PROTECTed /etc
+	#
+	cd "${S}"/sbin
+	exeinto ${rcscripts_dir}/sh
+	doexe rc-services.sh rc-daemon.sh rc-help.sh
+
+	# We can only install new, fast awk versions of scripts
+	# if 'build' or 'bootstrap' is not in USE.  This will
+	# change if we have sys-apps/gawk-3.1.1-r1 or later in
+	# the build image ...
+	if ! use build; then
+		# This is for new depscan.sh and env-update.sh
+		# written in awk
+		cd "${S}"/sbin
+		into /
+		dosbin depscan.sh
+		dosbin env-update.sh
+		insinto ${rcscripts_dir}/awk
+		doins "${S}"/src/awk/*.awk
+	fi
+
+	# Original design had these in /etc/net.modules.d but that is too
+	# problematic with CONFIG_PROTECT
+	dodir ${rcscripts_dir}
+	cp -a "${S}"/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
+	chown -R root:root ${D}${rcscripts_dir}
+
+	#
+	# Install baselayout documentation
+	#
+	if ! use build ; then
+		doman "${S}"/man/*.*
+		docinto /
+		dodoc ${FILESDIR}/copyright
+		dodoc "${S}"/ChangeLog
+		dodoc "${S}"/ChangeLog.vserver
+	fi
+
+	#
+	# Install baselayout utilities
+	#
+	cd "${S}"/src
+	make DESTDIR="${D}" install || die
+
+	# Hack to fix bug 9849, continued in pkg_postinst
+	unkdir
+}
+
+pkg_postinst() {
+	local x y
+
+	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
+	einfo "Creating directories and .keep files."
+	einfo "Some of these might fail if they're read-only mounted"
+	einfo "filesystems, for example /dev or /proc.  That's okay!"
+	source "${ROOT}"/usr/share/baselayout/mkdirs.sh
+	source "${ROOT}"/usr/share/baselayout/mklinks.sh
+
+	# We don't want to create devices if this is not a bootstrap and devfs
+	# is used, as this was the cause for all the devfs problems we had
+	if use build || use bootstrap; then
+		if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then
+			einfo "Populating /dev with device nodes..."
+			cd ${ROOT}/dev || die
+			${ROOT}/sbin/MAKEDEV generic-vserver
+		fi
+	fi
+
+	# Set up default runlevel symlinks
+	# This used to be done in src_install but required knowledge of ${ROOT},
+	# which meant that it was effectively broken for binary installs.
+	if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then
+		for x in boot default; do
+			einfo "Creating default runlevel symlinks for ${x}"
+			mkdir -p "${ROOT}"/etc/runlevels/${x}
+			for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
+				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
+					ewarn "init.d/${y} not found -- ignoring"
+				else
+					ln -sfn /etc/init.d/${y} \
+						"${ROOT}"/etc/runlevels/${x}/${y}
+				fi
+			done
+		done
+	fi
+
+	# Create /etc/hosts in pkg_postinst so we don't overwrite an
+	# existing file during bootstrap
+	if [[ ! -e ${ROOT}/etc/hosts ]]; then
+		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
+	fi
+
+	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
+	# new users do not update them properly...  see src_install() for why they
+	# are in /usr/share/baselayout/
+	for x in passwd shadow group ; do
+		if [[ -e ${ROOT}/etc/${x} ]] ; then
+			touch "${ROOT}/etc/${x}"
+		else
+			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
+		fi
+	done
+
+	# Under what circumstances would mtab be a symlink?  It would be
+	# nice if there were an explanatory comment here
+	if [[ -L ${ROOT}/etc/mtab ]]; then
+		rm -f "${ROOT}/etc/mtab"
+		if [[ ${ROOT} == / ]]; then
+			cp /proc/mounts "${ROOT}/etc/mtab"
+		else
+			touch "${ROOT}/etc/mtab"
+		fi
+	fi
+
+	# We should only install empty files if these files don't already exist.
+	[[ -e ${ROOT}/var/log/lastlog ]] || \
+		touch "${ROOT}/var/log/lastlog"
+	[[ -e ${ROOT}/var/run/utmp ]] || \
+		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
+	[[ -e ${ROOT}/var/log/wtmp ]] || \
+		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
+
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+		# Regenerate init.d dependency tree
+		/sbin/depscan.sh --update &>/dev/null
+	fi
+
+	# Enable shadow groups (we need ROOT=/ here, as grpconv only
+	# operate on / ...).
+	if [[ ${ROOT} == / && \
+	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
+	then
+		if /usr/sbin/grpck -r &>/dev/null; then
+			/usr/sbin/grpconv
+		else
+			echo
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+			echo
+		fi
+	fi
+
+	# This is also written in src_install (so it's in CONTENTS), but
+	# write it here so that the new version is immediately in the file
+	# (without waiting for the user to do etc-update)
+	rm -f ${ROOT}/etc/._cfg????_gentoo-release
+	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break at your next reboot!  You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "  # etc-update"
+	echo
+
+	if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \
+		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
+			echo
+			ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net"
+			ewarn
+			ewarn "You are advised to review the new configuration variables as"
+			ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no"
+			ewarn "guarantee that they will work in future versions."
+			echo
+	fi
+}
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-depscan.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-depscan.patch
new file mode 100644
index 000000000000..ea1573439aa8
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-depscan.patch
@@ -0,0 +1,136 @@
+--- sbin/depscan.sh	2005-07-22 01:24:27.000000000 +0100
++++ sbin/depscan.sh	2006-03-02 23:31:55.000000000 +0000
+@@ -5,54 +5,62 @@
+ 
+ source /etc/init.d/functions.sh
+ 
+-if [[ $1 == "--debug" ]] ; then
++mysvcdir="${svcdir}"
++update=false
++
++while [[ -n $1 ]] ; do
++	case "$1" in
++		--debug|-d)
++			set -x
++			;;
++		--svcdir|-s)
++			if [[ -z $2 || $2 == -* ]] ; then
++				eerror "No svcdir specified"
++			else
++				shift
++				mysvcdir="$1"
++			fi
++			;;
++		--update|-u)
++			update=true
++			;;
++	esac
+ 	shift
+-	set -x
+-fi
++done
+ 
+-if [ ! -d "${svcdir}" ]
+-then
+-	if ! mkdir -p -m 0755 "${svcdir}" 2>/dev/null
+-	then
+-		eerror " Could not create needed directory '${svcdir}'!"
++if [[ ! -d ${mysvcdir} ]] ; then
++	if ! mkdir -p -m 0755 "${mysvcdir}" 2>/dev/null ; then
++		eerror "Could not create needed directory '${mysvcdir}'!"
+ 	fi
+ fi
+ 
+-for x in softscripts snapshot options started
+-do
+-	if [ ! -d "${svcdir}/${x}" ]
+-	then
+-		if ! mkdir -p -m 0755 "${svcdir}/${x}" 2>/dev/null
+-		then
+-			eerror " Could not create needed directory '${svcdir}/${x}'!"
++for x in softscripts snapshot options started ; do
++	if [[ ! -d "${mysvcdir}/${x}" ]] ; then
++		if ! mkdir -p -m 0755 "${mysvcdir}/${x}" 2>/dev/null ; then
++			eerror "Could not create needed directory '${mysvcdir}/${x}'!"
+ 		fi
+ 	fi
+ done
+ 
+ # Only update if files have actually changed
+-update=1
+-if [ "$1" == "-u" ]
+-then
+-	update=0
+-	for config in /etc/conf.d /etc/init.d /etc/rc.conf
+-	do
+-		if [ "${config}" -nt "${svcdir}/depcache" ]
+-		then
+-			update=1
++if ! ${update} ; then
++	for config in /etc/conf.d /etc/init.d /etc/rc.conf ; do
++		if [[ ${config} -nt "${mysvcdir}/depcache" ]] ; then
++			update=true	
+ 			break
+ 		fi
+ 	done
+-	shift
+ fi
+-[ ${update} -eq 0 ] && exit 0
++
++! ${update} && exit 0
+ 
+ ebegin "Caching service dependencies"
+ 
+ # Clean out the non volitile directories ...
+-rm -rf "${svcdir}"/dep{cache,tree} "${svcdir}"/{broken,snapshot}/*
++rm -rf "${mysvcdir}"/dep{cache,tree} "${mysvcdir}"/{broken,snapshot}/*
+ 
+ retval=0
+-SVCDIR="${svcdir}"
++SVCDIR="${mysvcdir}"
+ DEPTYPES="${deptypes}"
+ ORDTYPES="${ordtypes}"
+ 
+@@ -65,17 +73,17 @@
+ 	-f /lib/rcscripts/awk/cachedepends.awk || \
+ 	retval=1
+ 
+-bash "${svcdir}/depcache" | \
++bash "${mysvcdir}/depcache" | \
+ /bin/gawk \
+ 	-f /lib/rcscripts/awk/functions.awk \
+ 	-f /lib/rcscripts/awk/gendepends.awk || \
+ 	retval=1
+ 
+-touch -m "${svcdir}"/dep{cache,tree}
++touch "${mysvcdir}"/dep{cache,tree}
++chmod 0644 "${mysvcdir}"/dep{cache,tree}
+ 
+ eend ${retval} "Failed to cache service dependencies"
+ 
+ exit ${retval}
+ 
+-
+ # vim:ts=4
+--- sbin/rc-services.sh	2005-03-08 16:07:30.000000000 +0000
++++ sbin/rc-services.sh	2006-03-02 20:28:03.000000000 +0000
+@@ -10,7 +10,7 @@
+ 
+ if [ "${RC_GOT_DEPTREE_INFO}" != "yes" ]
+ then
+-	if ! /sbin/depscan.sh -u
++	if ! /sbin/depscan.sh
+ 	then
+ 		echo
+ 		eerror "Error running '/sbin/depscan.sh'!"
+--- sbin/rc	2006-03-02 23:22:31.000000000 +0000
++++ sbin/rc	2006-03-02 20:28:03.000000000 +0000
+@@ -407,7 +407,7 @@
+ 	         grep -ve '\(depcache\|deptree\|envcache\)')
+ 
+ 	# Update the dependency cache
+-	/sbin/depscan.sh -u
++	/sbin/depscan.sh
+ 
+ 	# Now that the dependency cache are up to date, make sure these
+ 	# are marked as started ...
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-uniqify.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-uniqify.patch
new file mode 100644
index 000000000000..371a090b4f79
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-uniqify.patch
@@ -0,0 +1,77 @@
+Index: sbin/functions.sh
+===================================================================
+--- sbin/functions.sh	(revision 1964)
++++ sbin/functions.sh	(working copy)
+@@ -757,6 +757,18 @@
+ 	return 1
+ }
+ 
++# char* uniqify(char *arg, ...)
++#
++#   Ensure that params are unique
++#
++uniqify() {
++    local result= x=
++    while [[ -n "$1" ]] ; do
++		[[ " ${result} " != *" $1 "* ]] && result="${result} $1"
++		shift
++	done
++    echo "${result# *}"
++}
+ 
+ ##############################################################################
+ #                                                                            #
+Index: sbin/runscript.sh
+===================================================================
+--- sbin/runscript.sh	(revision 1964)
++++ sbin/runscript.sh	(working copy)
+@@ -130,7 +130,7 @@
+ 		ewarn "WARNING:  you are stopping a boot service."
+ 	fi
+ 
+-	if [[ ${svcpause} != "yes" ]] ; then
++	if [[ ${svcpause} != "yes" && ${RC_NODEPS} != "yes" ]] ; then
+ 		if [[ ${NETSERVICE} == "yes" ]] ; then
+ 			# A net.* service
+ 			if in_runlevel "${myservice}" "${BOOTLEVEL}" || \
+@@ -238,13 +238,15 @@
+ 		mark_service_started "${myservice}"
+ 
+ 		# On rc change, start all services "before $myservice" first
+-		if is_runlevel_start ; then
+-			startupservices="$(ineed "${myservice}") \
+-				$(valid_iuse "${myservice}") \
+-				$(valid_iafter "${myservice}")"
+-		else
+-			startupservices="$(ineed "${myservice}") \
+-				$(valid_iuse "${myservice}")"
++		if [[ ${RC_NODEPS} != "yes" ]] ; then
++			if is_runlevel_start ; then
++				startupservices="$(ineed "${myservice}") \
++					$(valid_iuse "${myservice}") \
++					$(valid_iafter "${myservice}")"
++			else
++				startupservices="$(ineed "${myservice}") \
++					$(valid_iuse "${myservice}")"
++			fi
+ 		fi
+ 
+ 		# Start dependencies, if any
+@@ -418,6 +420,8 @@
+ 	--verbose)
+ 		RC_VERBOSE="yes"
+ 		;;
++	--nodeps)
++		RC_NODEPS="yes"
+ 	esac
+ done
+ for arg in $* ; do
+@@ -488,7 +492,7 @@
+ 		svc_stop
+ 		svcpause="no"
+ 		;;
+-	--quiet|--nocolor)
++	--quiet|--nocolor|--nodeps)
+ 		;;
+ 	help)
+ 		exec "${svclib}"/sh/rc-help.sh "${myscript}" help
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r5 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r5
new file mode 100644
index 000000000000..0f46c7b52cdd
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r5
@@ -0,0 +1,3 @@
+MD5 7a534dd1fda6861b3486f192aa7a5578 rc-scripts-vserver-1.6.14.tar.bz2 142704
+RMD160 d4b7002d153116d6bdfb7ae4a1c9828d2f5b2eff rc-scripts-vserver-1.6.14.tar.bz2 142704
+SHA256 0c89d5c8ac7fc9d202f20b1494e8e237e37ef11cfa73cc39f5090b2055701406 rc-scripts-vserver-1.6.14.tar.bz2 142704