fix bug 113298; cleanup

(Portage version: 2.1_pre4-r1)

13 files changed, 109 insertions, 1208 deletions

diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
index 12c6c4bd793c..caa915e5844f 100644
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ b/sys-apps/baselayout-vserver/ChangeLog
@@ -1,6 +1,18 @@
 # 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.24 2006/02/20 12:44:19 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.25 2006/02/22 06:06:05 hollow Exp $
+
+*baselayout-vserver-1.11.14-r3 (22 Feb 2006)
+
+  22 Feb 2006; Benedikt Boehm <hollow@gentoo.org>
+  -files/baselayout-vserver-1.11.13-cleanup.patch,
+  +files/baselayout-vserver-1.11.14-iwconfig.patch,
+  +files/baselayout-vserver-1.11.14-manuser.patch,
+  +files/baselayout-vserver-1.11.14-udhcpc.patch, -files/fakelog.initd,
+  -files/vserver-changes, -baselayout-vserver-1.11.13-r1.ebuild,
+  -baselayout-vserver-1.11.14-r2.ebuild,
+  +baselayout-vserver-1.11.14-r3.ebuild:
+  bad you again; don't release svn as tarball..; fix bug 113298; cleanup
 
 *baselayout-vserver-1.11.14-r2 (20 Feb 2006)
 
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index bde53094ce65..034c69aedd7f 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -1,33 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dcfa9b55e84a9d3fe9de8c430a325c95 ChangeLog 4817
-RMD160 6563d8eb0140cce377bb97ea1c4db4b04c4f2089 ChangeLog 4817
-SHA256 eaaec00cae258c3e344bef8cffe8bf04dbac1c13a8d108c25536e3462b3d8357 ChangeLog 4817
-MD5 3154e9763ae2199cddf00a2fa89af3f9 baselayout-vserver-1.11.13-r1.ebuild 13273
-RMD160 0ddc092f0ef5baf7722364cc66c1dbd83fc612c8 baselayout-vserver-1.11.13-r1.ebuild 13273
-SHA256 dc57caa059c3f618b5af74452cfc0ca970f732c9178b1760bc038606de456470 baselayout-vserver-1.11.13-r1.ebuild 13273
+MD5 e07c5ba9cce5825aea4d18e3632d93a4 ChangeLog 5360
+RMD160 89a15413be70edc5ec684479acdec1c91b4b46cb ChangeLog 5360
+SHA256 c06cf47d8f54eaccd669fe6596306f5a3d282c9b8cf9a155a62963564ffa8d6c ChangeLog 5360
 MD5 28ead1d66338b46a6ecab7953139b45b baselayout-vserver-1.11.14-r1.ebuild 15841
 RMD160 55e3401d76818284cfa11937de549598e7a0eaf4 baselayout-vserver-1.11.14-r1.ebuild 15841
 SHA256 c24501625dd556bf46f543db281880d1773c9317cc770e4af1a2a88ee760b13a baselayout-vserver-1.11.14-r1.ebuild 15841
-MD5 27786899989d1f2c1a64b3cc49fcd1d0 baselayout-vserver-1.11.14-r2.ebuild 15694
-RMD160 dd606c5a0648c9c66503a4194521955f21030c9a baselayout-vserver-1.11.14-r2.ebuild 15694
-SHA256 5f190fa57b5dd0db3721247e4b22868f749dc8a14a477bd765012bca1e6eb13c baselayout-vserver-1.11.14-r2.ebuild 15694
+MD5 ac8af517888624d0f2621d37bc452088 baselayout-vserver-1.11.14-r3.ebuild 16026
+RMD160 4bc71624158fbbd121b9f0c23e25f05268f30019 baselayout-vserver-1.11.14-r3.ebuild 16026
+SHA256 38253b1b3ee9578d9f7a415ab0d75e2a79580c05ac34d32213055a0d43a8e5fe baselayout-vserver-1.11.14-r3.ebuild 16026
 MD5 f8f4314afe00de037943e53171b12d48 baselayout-vserver-1.12.0_pre16.ebuild 12515
 RMD160 a78a7db00b11b6173996753d65a5043fffc4dc8a baselayout-vserver-1.12.0_pre16.ebuild 12515
 SHA256 32e485bf21282130ef1cb6d223c35be39cc4d2b02a02b89859e60681409e4615 baselayout-vserver-1.12.0_pre16.ebuild 12515
 MD5 8bbf6c606bd60a3825fd79aaab624805 baselayout-vserver-1.12.0_pre8-r2.ebuild 12601
 RMD160 e7de602a8614ec2a406cfb1e8583392564bc86d6 baselayout-vserver-1.12.0_pre8-r2.ebuild 12601
 SHA256 8017e9a3a4e1cf6233dbfad9fda6c173a3f0b3c864e9c27c8b915e6920ca4dd9 baselayout-vserver-1.12.0_pre8-r2.ebuild 12601
-MD5 cf693ea87e77c1dc6f72cf58c32b7143 files/baselayout-vserver-1.11.13-cleanup.patch 18552
-RMD160 43c6a15f392dfb471a25cc6d5bb0a56c09548a92 files/baselayout-vserver-1.11.13-cleanup.patch 18552
-SHA256 aac649ad7db46034817d376bf396b3a13d306da0371cc9bcebeedc1a88364c9e files/baselayout-vserver-1.11.13-cleanup.patch 18552
 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 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
+MD5 00027c12be3e1ed7ce2787cfca1b5a6c files/baselayout-vserver-1.11.14-iwconfig.patch 609
+RMD160 5e5178bb9e100509eefb6dc5bc8a478621941feb files/baselayout-vserver-1.11.14-iwconfig.patch 609
+SHA256 fba67a24d63c29407882894fc78bf6716329a923d7925e9f0cd2b6535afdd292 files/baselayout-vserver-1.11.14-iwconfig.patch 609
+MD5 739091cd6c0965fcfb1843052243dad8 files/baselayout-vserver-1.11.14-manuser.patch 890
+RMD160 e5ca7992def401d4c236022156f37587d6aabf60 files/baselayout-vserver-1.11.14-manuser.patch 890
+SHA256 7f73007be5392e08711827128b8efa944ece58c5da7b5606f387b02e6a1aceb4 files/baselayout-vserver-1.11.14-manuser.patch 890
+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 cd1ba3815d5592a3c65f185cc7585107 files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch 339
 RMD160 8972ac7a0318a57b35047d754235aacc9d3ca6f7 files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch 339
 SHA256 c44f7c4de01c604d60e52968f9c393c7b50fc72a378b945ff7e1b1df775aa8c1 files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch 339
@@ -37,34 +37,18 @@ SHA256 daf0e8d5db3e82977e2f0e86530005f3386dbb751aae98c214ea52b1b5d10df3 files/ba
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
-MD5 f219b6eb745e1af5a07b0929df98abc0 files/digest-baselayout-vserver-1.11.13-r1 280
-RMD160 cfff56f51e40bc2104d2c1d182ef8f3f47423246 files/digest-baselayout-vserver-1.11.13-r1 280
-SHA256 40ad57218af373af66ae7be6a0848a3cb2088f34e99d1a70c1c12d4c924b23e0 files/digest-baselayout-vserver-1.11.13-r1 280
 MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r1 280
 RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r1 280
 SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r1 280
-MD5 f287fdf36c50c68516f7ec17e3d96159 files/digest-baselayout-vserver-1.11.14-r2 283
-RMD160 28b46baf2c808cc7c70ce026ba3391aee720f97c files/digest-baselayout-vserver-1.11.14-r2 283
-SHA256 f71f32b136b2a4020647a4f6daa942a8e926dc219deb66a67bf48fef17dd2701 files/digest-baselayout-vserver-1.11.14-r2 283
+MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r3 280
+RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r3 280
+SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r3 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
 MD5 f6300fc5175902aa7e634664ac6d96bc files/digest-baselayout-vserver-1.12.0_pre8-r2 295
 RMD160 d1fa69c9a21dae4478179be846da9a1ead707d40 files/digest-baselayout-vserver-1.12.0_pre8-r2 295
 SHA256 0d9ccc11eb84db164243b6be1d1bf6fd6a52a9a626d2b17d7cc3c3db56cd260a files/digest-baselayout-vserver-1.12.0_pre8-r2 295
-MD5 51a97031d54d767b45fb247d60727e9d files/fakelog.initd 449
-RMD160 19a12dcc05e64709e9481587de6eaea9d74a3773 files/fakelog.initd 449
-SHA256 98b3a91b3f1fb4f5d85301d65d032b42c02d47e7794aa14adbfaa9e544e27748 files/fakelog.initd 449
-MD5 76a9437d29bd77c416f76fbcf0cf2af2 files/vserver-changes 1642
-RMD160 9567f0e7e3e113fbe3e948a64da7a6fd425b6f73 files/vserver-changes 1642
-SHA256 ab3a8f7af0ae873821da319ccca2a4c251f324df7f55a050128f5806dd2d3c2d files/vserver-changes 1642
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata.xml 231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+bmuflZ8QqxhrsMRAnltAJ9L+dejvqy0t+YkARQordG9c+COWwCgw0cy
-kg9Wrtl3rC8/CjO4dme6ypo=
-=rAcB
------END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild
deleted file mode 100644
index 6ac9bf959382..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2005 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.13-r1.ebuild,v 1.7 2005/12/01 15:09:41 hollow Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-SV=1.6.13		# rc-scripts version
-SVREV=			# rc-scripts rev
-
-MY_P="rc-scripts-${SV}${SVREV}-vserver"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}-vserver"
-DESCRIPTION="Filesystem baselayout and init scripts for Linux-VServer"
-HOMEPAGE="http://dev.croup.de/proj/gentoo-vps"
-SRC_URI="http://dev.gentoo.org/~hollow/distfiles/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bootstrap build fakelog 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.84
-	!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}-cleanup.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 "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 /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 /opt
-	kdir -o root -g uucp -m0775 /var/lock
-	kdir /proc
-	kdir -m 0700 /root
-	kdir /sbin
-	kdir /sys	# for 2.6 kernels
-	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
-
-	insopts -m0755
-	insinto /etc/init.d
-	doins ${S}/init.d/*
-
-	# link dummy init scripts
-	cd ${D}/etc/init.d
-	for i in checkfs checkroot clock consolefont keymaps localmount modules net netmount numlock urandom; do
-		ln -sf dummy $i
-	done
-
-	insinto /etc/conf.d
-	doins ${S}/etc/conf.d/*
-
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/*
-
-	# 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
-
-	# As of baselayout-1.10-1-r1, sysvinit is its own package again, and
-	# provides the inittab itself
-	# <hollow@gentoo.org> We need our own inittab for vservers here
-	#rm -f "${D}"/etc/inittab
-
-	# 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
-
-	#
-	# Install baselayout documentation
-	#
-	if ! use build ; then
-		doman "${S}"/man/*.*
-		docinto /
-		dodoc ${FILESDIR}/copyright
-		dodoc "${S}"/ChangeLog
-	fi
-
-	#
-	# Install baselayout utilities
-	#
-	cd "${S}"/src
-	make DESTDIR="${D}" install || die
-
-	# Normal baselayout generate devices in pkg_postinst(), but we keep
-	# it here because
-	# (1) devices would show up in CONTENTS
-	# (2) we just generate the devices if either build or bootstrap is useflags
-	# (3) it is not likely that anyone uses devfsd inside a vserver (nor udev)
-	# The most common cases are that people are either updating
-	# baselayout or installing from scratch.  In the installation case,
-	# it's no different to have here instead of pkg_postinst().  Nor is
-	# it in the update case, as neither build nor bootstrap will be in
-	# the active use flags.
-
-	if use build || use bootstrap; then
-		cd ${D}/dev || die
-
-		ebegin "Making and populating /dev with safe device nodes..."
-		./MAKEDEV generic-vserver
-		eend $? || die
-	fi
-
-	# 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
-
-	# 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 &>/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
-}
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r2.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild
index 29f963ca981d..ddb9ce9c5215 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r2.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild
@@ -1,17 +1,17 @@
 # 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-r2.ebuild,v 1.1 2006/02/20 12:44:19 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild,v 1.1 2006/02/22 06:06:06 hollow Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
 SV=1.6.${PV##*.}
-SVREV=1
 
-S="${WORKDIR}/rc-scripts-vserver-${SV}${SVREV}"
+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="http://dev.gentoo.org/~hollow/distfiles/rc-scripts-vserver-${SV}${SVREV}.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/rc-scripts-vserver-${SV}${SVREV}.tar.bz2"
+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"
@@ -39,6 +39,12 @@ src_unpack() {
 	if use unicode ; then
 		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
 	fi
+
+	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-adsl.patch
+	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-essidnet.patch
+	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-iwconfig.patch
+	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-udhcpc.patch
+	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-manuser.patch
 }
 
 src_compile() {
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch
deleted file mode 100644
index 6de3c5f1c8eb..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch
+++ /dev/null
@@ -1,616 +0,0 @@
-diff -NurpP rc-scripts-1.6.13-vserver/etc/conf.d/keymaps rc-scripts-1.6.13-vserver2/etc/conf.d/keymaps
---- rc-scripts-1.6.13-vserver/etc/conf.d/keymaps	2005-07-17 11:58:06.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/etc/conf.d/keymaps	1970-01-01 01:00:00.000000000 +0100
-@@ -1,26 +0,0 @@
--# /etc/conf.d/keymaps
--
--# Use KEYMAP to specify the default console keymap.  There is a complete tree
--# of keymaps in /usr/share/keymaps to choose from.
--
--KEYMAP="us"
--
--
--# Should we first load the 'windowkeys' console keymap?  Most x86 users will
--# say "yes" here.  Note that non-x86 users should leave it as "no".
--
--SET_WINDOWKEYS="no"
--
--
--# The maps to load for extended keyboards.  Most users will leave this as is.
--
--EXTENDED_KEYMAPS=""
--#EXTENDED_KEYMAPS="backspace keypad euro"
--
--
--# Tell dumpkeys(1) to interpret character action codes to be 
--# from the specified character set.
--# This only matters if you set UNICODE="yes" in /etc/rc.conf.
--# For a list of valid sets, run `dumpkeys --help`
--
--DUMPKEYS_CHARSET=""
-diff -NurpP rc-scripts-1.6.13-vserver/etc/conf.d/rc rc-scripts-1.6.13-vserver2/etc/conf.d/rc
---- rc-scripts-1.6.13-vserver/etc/conf.d/rc	2005-07-17 11:58:06.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/etc/conf.d/rc	2005-09-30 15:04:56.949148250 +0200
-@@ -6,14 +6,6 @@
- RC_PARALLEL_STARTUP="no"
- 
- 
--# RC_USE_CONFIG_PROFILE allows you to have different /etc/conf.d files
--# based on your runlevel - if a conf.d file for your profile does not exist
--# then we try and use the default one.
--# To enable runlevel selection at boot, append "softlevel=foobar" to your
--# kernel line to change to the foobar runlevel. Or "rc foobar" at the command
--# prompt.
--
--RC_USE_CONFIG_PROFILE="yes"
- 
- #
- # Controlling start-stop-daemon behavior
-@@ -45,6 +37,9 @@ RC_RETRY_COUNT=5
- RC_FAIL_ON_ZOMBIE="no"
- 
- 
-+
-+
-+
- #
- # Internal configuration variables
- #
-diff -NurpP rc-scripts-1.6.13-vserver/etc/inittab rc-scripts-1.6.13-vserver2/etc/inittab
---- rc-scripts-1.6.13-vserver/etc/inittab	2005-07-17 11:58:06.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/etc/inittab	2005-09-30 15:03:36.596126500 +0200
-@@ -21,3 +21,6 @@ l4:4:wait:/sbin/rc default
- l5:5:wait:/sbin/rc default
- l6:6:wait:/sbin/rc reboot
- #z6:6:respawn:/sbin/sulogin
-+
-+# What to do at the "Three Finger Salute".
-+ca:12345:ctrlaltdel:/sbin/shutdown -r now
-diff -NurpP rc-scripts-1.6.13-vserver/etc/issue rc-scripts-1.6.13-vserver2/etc/issue
---- rc-scripts-1.6.13-vserver/etc/issue	2005-06-10 19:20:42.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/etc/issue	1970-01-01 01:00:00.000000000 +0100
-@@ -1,3 +0,0 @@
--
--This is \n.\O (\s \m \r) \t
--
-diff -NurpP rc-scripts-1.6.13-vserver/etc/issue.devfix rc-scripts-1.6.13-vserver2/etc/issue.devfix
---- rc-scripts-1.6.13-vserver/etc/issue.devfix	2005-07-17 11:58:06.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/etc/issue.devfix	1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
-------------------------------------------------------
--Your system seems to be missing critical device files 
--in /dev !  Although you may be running udev or devfs, 
--the root partition is missing these required files !
--
--To rectify this situation, please do the following:
--mkdir /mnt/fixit
--mount --bind / /mnt/fixit
--cp -a /dev/* /mnt/fixit/dev/
--umount /mnt/fixit
--rmdir /mnt/fixit
--
--You may refer to these instructions at /etc/issue.  
--If you previously had an issue file, it has been 
--backed up at /etc/issue.devfix.  Once you've fixed 
--your system, you will have to restore your old issue 
--file in order to get rid of this warning.
--
--Thanks for using Gentoo ! :)
--http://bugs.gentoo.org/show_bug.cgi?id=40987
-------------------------------------------------------
-diff -NurpP rc-scripts-1.6.13-vserver/etc/rc.conf rc-scripts-1.6.13-vserver2/etc/rc.conf
---- rc-scripts-1.6.13-vserver/etc/rc.conf	2005-07-17 11:58:06.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/etc/rc.conf	2005-09-30 15:03:52.221103000 +0200
-@@ -1,11 +1,5 @@
- # /etc/rc.conf: Global startup script configuration settings
- 
--# UNICODE specifies whether you want to have UNICODE support in the console.  
--# If you set to yes, please make sure to set a UNICODE aware CONSOLEFONT and 
--# KEYMAP in the /etc/conf.d/consolefont and /etc/conf.d/keymaps config files.
--
--UNICODE="no"
--
- # Set EDITOR to your preferred editor.
- # You may use something other than what is listed here.
- 
-diff -NurpP rc-scripts-1.6.13-vserver/init.d/bootmisc rc-scripts-1.6.13-vserver2/init.d/bootmisc
---- rc-scripts-1.6.13-vserver/init.d/bootmisc	2005-07-17 11:58:06.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/init.d/bootmisc	2005-09-30 15:35:07.526302250 +0200
-@@ -19,13 +19,7 @@ start() {
- 		cp /etc/nologin /etc/nologin.boot &> /dev/null
- 	fi
- 
--	if [[ -e /etc/sysctl.conf ]] ; then
--		ebegin "Configuring kernel parameters"
--		/sbin/sysctl -q -p /etc/sysctl.conf
--		eend 0
--	fi
--
--	if [[ -z ${CDBOOT} ]] && ! touch /var/run/.keep 2> /dev/null ; then
-+	if ! touch /var/run/.keep 2> /dev/null ; then
- 		ewarn "Skipping /var and /tmp initialization (ro root?)"
- 		return 0
- 	fi
-@@ -43,31 +37,23 @@ start() {
- 	ebegin "Cleaning /var/lock, /var/run"
- 	rm -rf /var/run/console.lock /var/run/console/*
- 
--	if [[ -z ${CDBOOT} ]] ; then
--		#
--		# Clean up any stale locks.
--		#
--		find /var/lock -type f -print0 | xargs -0 rm -f --
--		#
--		# Clean up /var/run and create /var/run/utmp so that we can login.
--		#
--		for x in $(find /var/run/ ! -type d ! -name utmp ! -name innd.pid ! -name random-seed) ; do
--			local daemon=${x##*/}
--			daemon=${daemon%*.pid}
--			# Do not remove pidfiles of already running daemons
--			if [[ -z $(ps --no-heading -C "${daemon}") ]] ; then
--				if [[ -f ${x} || -L ${x} ]] ; then
--					rm -f "${x}"
--				fi
-+	#
-+	# Clean up any stale locks.
-+	#
-+	find /var/lock -type f -print0 | xargs -0 rm -f --
-+	#
-+	# Clean up /var/run and create /var/run/utmp so that we can login.
-+	#
-+	for x in $(find /var/run/ ! -type d ! -name utmp ! -name innd.pid ! -name random-seed) ; do
-+		local daemon=${x##*/}
-+		daemon=${daemon%*.pid}
-+		# Do not remove pidfiles of already running daemons
-+		if [[ -z $(ps --no-heading -C "${daemon}") ]] ; then
-+			if [[ -f ${x} || -L ${x} ]] ; then
-+				rm -f "${x}"
- 			fi
--		done
--	fi
--
--	# Reset pam_console permissions if we are actually using it
--	if [[ -x /sbin/pam_console_apply && ! -c /dev/.devfsd && \
--	      -n $(grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep 'pam_console') ]] ; then
--		/sbin/pam_console_apply -r
--	fi
-+		fi
-+	done
- 
- 	# Create the .keep to stop portage from removing /var/lock
- 	> /var/lock/.keep
-@@ -76,7 +62,7 @@ start() {
- 	#
- 	# Clean up /tmp directory
- 	#
--	if [[ -z ${CDBOOT} ]] && [[ -d /tmp ]] ; then
-+	if [[ -d /tmp ]] ; then
- 		cd /tmp
- 		if [[ ${WIPE_TMP} == "yes" ]] ; then
- 			ebegin "Wiping /tmp directory"
-@@ -120,4 +106,5 @@ start() {
- 	[[ -f /etc/resolv.conf ]] || touch /etc/resolv.conf &> /dev/null
- }
- 
-+
- # vim:ts=4
-diff -NurpP rc-scripts-1.6.13-vserver/init.d/halt.sh rc-scripts-1.6.13-vserver2/init.d/halt.sh
---- rc-scripts-1.6.13-vserver/init.d/halt.sh	1970-01-01 01:00:00.000000000 +0100
-+++ rc-scripts-1.6.13-vserver2/init.d/halt.sh	2005-09-30 15:06:54.672505500 +0200
-@@ -0,0 +1,8 @@
-+# Copyright 1999-2005 Gentoo Foundation
-+# Distributed under the terms of the GNU General Public License v2
-+
-+# Write a reboot record to /var/log/wtmp before unmounting
-+
-+halt -w &>/dev/null
-+
-+# vim:ts=4
-diff -NurpP rc-scripts-1.6.13-vserver/init.d/reboot.sh rc-scripts-1.6.13-vserver2/init.d/reboot.sh
---- rc-scripts-1.6.13-vserver/init.d/reboot.sh	1970-01-01 01:00:00.000000000 +0100
-+++ rc-scripts-1.6.13-vserver2/init.d/reboot.sh	2005-09-30 15:07:24.242353500 +0200
-@@ -0,0 +1,8 @@
-+# Copyright 1999-2005 Gentoo Foundation
-+# Distributed under the terms of the GNU General Public License v2
-+
-+/sbin/reboot -d
-+
-+# hmm, if the above failed, that's kind of odd ...
-+# so let's force a reboot
-+/sbin/reboot -f
-diff -NurpP rc-scripts-1.6.13-vserver/init.d/shutdown.sh rc-scripts-1.6.13-vserver2/init.d/shutdown.sh
---- rc-scripts-1.6.13-vserver/init.d/shutdown.sh	1970-01-01 01:00:00.000000000 +0100
-+++ rc-scripts-1.6.13-vserver2/init.d/shutdown.sh	2005-09-30 15:07:36.583124750 +0200
-@@ -0,0 +1,8 @@
-+# Copyright 1999-2005 Gentoo Foundation
-+# Distributed under the terms of the GNU General Public License v2
-+
-+/sbin/halt -d
-+
-+# hmm, if the above failed, that's kind of odd ...
-+# so let's force a halt
-+/sbin/halt -f
-diff -NurpP rc-scripts-1.6.13-vserver/rc-lists/boot rc-scripts-1.6.13-vserver2/rc-lists/boot
---- rc-scripts-1.6.13-vserver/rc-lists/boot	2005-06-10 19:42:22.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/rc-lists/boot	2005-09-30 15:08:00.340609500 +0200
-@@ -1,5 +1,4 @@
- bootmisc
--keymaps
- rmnologin
- domainname
- hostname
-diff -NurpP rc-scripts-1.6.13-vserver/sbin/functions.sh rc-scripts-1.6.13-vserver2/sbin/functions.sh
---- rc-scripts-1.6.13-vserver/sbin/functions.sh	2005-07-17 11:58:06.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/sbin/functions.sh	2005-09-30 15:37:35.927576750 +0200
-@@ -33,7 +33,6 @@ RC_ENDCOL="yes"
- # Default values for rc system
- #
- RC_PARALLEL_STARTUP="no"
--RC_USE_CONFIG_PROFILE="yes"
- 
- #
- # Default values for e-message indentation and dots
-@@ -59,13 +58,29 @@ import_addon() {
- 	return 1
- }
- 
-+# void splash(...)
-+#
-+#  Notify bootsplash/splashutils/gensplash/whatever about
-+#  important events.
-+#
-+splash() {
-+	return 0
-+}
-+
-+# void profiling(...)
-+#
-+#  Notify bootsplash/whatever about important events.
-+#
-+profiling() {
-+	return 0
-+}
-+
- # void bootlog(...)
- #
- #  Notify bootlogger about important events.
- bootlog() {
- 	return 0
- }
--import_addon bootlogger.sh
- 
- # void get_bootconfig()
- #
-@@ -74,35 +89,13 @@ import_addon bootlogger.sh
- #    parameters.
- #
- get_bootconfig() {
--	local copt=
--	local newbootlevel=
--	local newsoftlevel=
--
--	if [[ -n ${newbootlevel} ]] ; then
--		export BOOTLEVEL=${newbootlevel}
--	else
--		export BOOTLEVEL="boot"
--	fi
--
--	if [[ -n ${newsoftlevel} ]] ; then
--		export DEFAULTLEVEL=${newsoftlevel}
--	else
--		export DEFAULTLEVEL="default"
--	fi
--
--	return 0
-+	export BOOTLEVEL="boot"
-+	export DEFAULTLEVEL="default"
- }
- 
- setup_defaultlevels() {
- 	get_bootconfig
- 
--	if [ "${RC_USE_CONFIG_PROFILE}" = "yes" -a -n "${DEFAULTLEVEL}" ] && \
--	   [ -d "/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" -o \
--	     -L "/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" ]
--	then
--		export BOOTLEVEL="${BOOTLEVEL}.${DEFAULTLEVEL}"
--	fi
--
- 	if [ -z "${SOFTLEVEL}" ] ; then
- 		if [ -f "${svcdir}/softlevel" ] ; then
- 			export SOFTLEVEL="$(< ${svcdir}/softlevel)"
-@@ -414,6 +407,16 @@ get_KV() {
- 	return $?
- }
- 
-+# bool get_bootparam(param)
-+#
-+#   return 0 if gentoo=param was passed to the kernel
-+#
-+#   EXAMPLE:  if get_bootparam "nodevfs" ; then ....
-+#
-+get_bootparam() {
-+	return 1
-+}
-+
- # Safer way to list the contents of a directory,
- # as it do not have the "empty dir bug".
- #
-@@ -495,13 +498,7 @@ get_options() {
- #    Returns a config file name with the softlevel suffix
- #    appended to it.  For use with multi-config services.
- add_suffix() {
--	if [ "${RC_USE_CONFIG_PROFILE}" = "yes" -a -e "$1.${DEFAULTLEVEL}" ]
--	then
--		echo "$1.${DEFAULTLEVEL}"
--	else
--		echo "$1"
--	fi
--
-+	echo "$1"
- 	return 0
- }
- 
-@@ -515,6 +512,76 @@ get_base_ver() {
- 	echo ${ver##* }
- }
- 
-+# Network filesystems list for common use in rc-scripts.
-+# This variable is used in is_net_fs and other places such as
-+# localmount.
-+NET_FS_LIST="afs cifs coda davfs gfs ncpfs nfs nfs4 shfs smbfs"
-+
-+# bool is_net_fs(path)
-+#
-+#   return 0 if path is the mountpoint of a networked filesystem
-+#
-+#   EXAMPLE:  if is_net_fs / ; then ...
-+#
-+is_net_fs() {
-+	local fstype
-+	# /proc/mounts is always accurate but may not always be available
-+	if [[ -e /proc/mounts ]]; then
-+		fstype=$( sed -n -e '/^rootfs/!s:.* '"$1"' \([^ ]*\).*:\1:p' /proc/mounts )
-+	else
-+		fstype=$( mount | sed -n -e 's:.* on '"$1"' type \([^ ]*\).*:\1:p' )
-+	fi
-+	[[ " ${NET_FS_LIST} " == *" ${fstype} "* ]]
-+	return $?
-+}
-+
-+# bool is_uml_sys()
-+#
-+#   return 0 if the currently running system is User Mode Linux
-+#
-+#   EXAMPLE:  if is_uml_sys ; then ...
-+#
-+is_uml_sys() {
-+	grep -qs 'UML' /proc/cpuinfo
-+	return $?
-+}
-+
-+# bool is_vserver_sys()
-+#
-+#   return 0 if the currently running system is a Linux VServer
-+#
-+#   EXAMPLE:  if is_vserver_sys ; then ...
-+#
-+is_vserver_sys() {
-+	grep -qs '^s_context:[[:space:]]*[1-9]' /proc/self/status
-+	return $?
-+}
-+
-+# bool is_xenU_sys()
-+#
-+#   return 0 if the currently running system is an unprivileged Xen domain
-+#
-+#   EXAMPLE:  if is_xenU_sys ; then ...
-+#
-+is_xenU_sys() {
-+	[[ -d /proc/xen && ! -f /proc/xen/privcmd ]]
-+}
-+
-+# bool get_mount_fstab(path)
-+#
-+#   return the parameters to pass to the mount command generated from fstab
-+#
-+#   EXAMPLE: cmd=$( get_mount_fstab /proc )
-+#            cmd=${cmd:--t proc none /proc}
-+#            mount -n ${cmd}
-+#
-+get_mount_fstab() {
-+	awk '$1 ~ "^#" { next }
-+	     $2 == "'$*'" { if (found++ == 0) { print "-t "$3,"-o "$4,$1,$2 } }
-+	     END { if (found > 1) { print "More than one entry for '$*' found in /etc/fstab!" > "/dev/stderr" } }
-+	' /etc/fstab
-+}
-+
- # char *reverse_list(list)
- #
- #   Returns the reversed order of list
-@@ -525,6 +592,26 @@ reverse_list() {
- 	done
- }
- 
-+# void start_addon(addon)
-+#
-+#   Starts addon.
-+#
-+start_addon() {
-+	local addon=$1
-+	(import_addon ${addon}-start.sh)
-+	return 0
-+}
-+
-+# void stop_addon(addon)
-+#
-+#   Stops addon.
-+#
-+stop_addon() {
-+	local addon=$1
-+	(import_addon ${addon}-stop.sh)
-+	return 0
-+}
-+
- # bool is_older_than(reference, files/dirs to check)
- #
- #   return 0 if any of the files/dirs are newer than
-@@ -577,9 +664,6 @@ if [ -z "${EBUILD}" ] ; then
- 		esac
- 	done
- 
--	if [ -r "/proc/cmdline" ] ; then
--		setup_defaultlevels
--	fi
- else
- 	# Should we use colors ?
- 	if [[ $* != *depend* ]]; then
-diff -NurpP rc-scripts-1.6.13-vserver/sbin/rc rc-scripts-1.6.13-vserver2/sbin/rc
---- rc-scripts-1.6.13-vserver/sbin/rc	2005-07-17 13:09:03.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/sbin/rc	2005-09-30 15:38:29.358916000 +0200
-@@ -15,7 +15,15 @@ check_statedir() {
- 		if ! mkdir -p "$1" &>/dev/null ; then
- 			echo
- 			eerror "For Gentoo to function properly, \"$1\" needs to exist."
--			/sbin/sulogin ${CONSOLE}
-+			if [[ ${RC_FORCE_AUTO} == "yes" ]] ; then
-+				eerror "Attempting to create \"$1\" for you ..."
-+				mkdir -p "$1"
-+			else
-+				eerror "Please mount your root partition read/write, and execute:"
-+				echo
-+				eerror "  # mkdir -p $1"
-+				echo; echo
-+			fi
- 			einfo "Rebooting"
- 			/sbin/reboot -f
- 		fi
-@@ -35,7 +43,7 @@ get_critical_services() {
- 			CRITICAL_SERVICES="${CRITICAL_SERVICES} ${x##*/}"
- 		done
- 	else
--		CRITICAL_SERVICES=""
-+		CRITICAL_SERVICES="hostname"
- 	fi
- 
- 	export CRITICAL_SERVICES
-@@ -54,10 +62,6 @@ then
- 	# Setup initial $PATH just in case
- 	PATH="/bin:/sbin:/usr/bin:/usr/sbin:${PATH}"
- 
--	# Help users recover their systems incase these go missing
--	[ -c /dev/null ] && dev_null=1 || dev_null=0
--	[ -c /dev/console ] && dev_console=1 || dev_console=0
--
- 	echo
- 	echo -e "${GOOD}Gentoo Linux${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}"
- 	echo -e " Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2"
-@@ -66,11 +70,6 @@ then
- 	check_statedir /proc
- 	check_statedir /dev
- 
--	# We set the forced softlevel from the kernel command line
--	# It needs to be run right after proc is mounted for the
--	# boot runlevel
--	setup_defaultlevels
--
- 	# $BOOT can be used by rc-scripts to test if it is the first time
- 	# the 'boot' runlevel is executed.  Now also needed by some stuff in
- 	# the 'sysinit' runlevel ...
-@@ -109,17 +108,11 @@ then
- 		then
- 			echo
- 			eerror "One of more critical startup scripts failed to start!"
--			eerror "Please correct this, and reboot ..."
--			echo; echo
--			/sbin/sulogin ${CONSOLE}
- 			einfo "Rebooting"
- 			/sbin/reboot -f
- 		fi
- 	done
- 
--	# /var/log should be writable now, so starting saving the boot output
--	bootlog sync
--
- 	# Check that $svcdir exists ...
- 	check_statedir "${svcdir}"
- 
-@@ -143,20 +136,6 @@ then
- 		done
- 	)
- 
--	# If the user's /dev/null or /dev/console are missing, we 
--	# should help them out and explain how to rectify the situation
--	if [ ${dev_null} -eq 0 -o ${dev_console} -eq 0 ] \
--	    && [ -e /usr/share/baselayout/issue.devfix ]
--	then
--		# Backup current /etc/issue
--		if [ -e /etc/issue -a ! -e /etc/issue.devfix ]
--		then
--			mv /etc/issue /etc/issue.devfix
--		fi
--
--		cp /usr/share/baselayout/issue.devfix /etc/issue
--	fi
--
- 	# Setup login records ... this has to be done here because when 
- 	# we exit this runlevel, init will write a boot record to utmp
- 	# If /var/run is readonly, then print a warning, not errors
-@@ -172,16 +151,11 @@ then
- 		ewarn "Skipping /var/run/utmp initialization (ro root?)"
- 	fi
- 
--	# All done logging
--	bootlog quit
--
- 	exit 0
- fi # Sysinit ends here
- 
- if [ "${RUNLEVEL}" = "S" -a "${argv1}" = "boot" ]
- then
--	setup_defaultlevels
--
- 	if [ -n "${DEFAULTLEVEL}" -a "${DEFAULTLEVEL}" != "default" ]
- 	then
- 		# Setup our default runlevel runlevel that will be run
-@@ -390,12 +364,14 @@ if [[ ${SOFTLEVEL} == "reboot" || ${SOFT
- 	rm -rf $(ls -d1 "${svcdir}/"* 2>/dev/null | \
- 	         grep -ve '\(depcache\|deptree\|envcache\)')
- 	
--	# Reset pam_console permissions if we are actually using it
--	if [[ -x /sbin/pam_console_apply && ! -c /dev/.devfsd && \
--	      -n $(grep -v -e '^[[:space:]]*#' /etc/pam.d/* | grep 'pam_console') ]]; then
--		/sbin/pam_console_apply -r
-+	source /etc/init.d/halt.sh
-+	
-+	if [[ ${SOFTLEVEL} == "reboot" ]] ; then
-+		source /etc/init.d/reboot.sh
-+	else
-+		source /etc/init.d/shutdown.sh
- 	fi
--
-+	
- 	# Should never get here
- 	exit 0
- fi
-@@ -452,7 +428,4 @@ rm -rf "${svcdir}/failed" &>/dev/null
- # If we were in the boot runlevel, it is done now ...
- [ -n "${BOOT}" ] && unset BOOT
- 
--# util-vserver is failing if there is no `true` here
--true
--
- # vim:ts=4
-diff -NurpP rc-scripts-1.6.13-vserver/sbin/runscript.sh rc-scripts-1.6.13-vserver2/sbin/runscript.sh
---- rc-scripts-1.6.13-vserver/sbin/runscript.sh	2005-07-17 11:58:06.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/sbin/runscript.sh	2005-09-30 15:32:20.511864500 +0200
-@@ -35,8 +35,7 @@ mylevel=$(<"${svcdir}/softlevel")
- # Source configuration files.
- # (1) Source /etc/conf.d/${myservice} to get initscript-specific
- #     configuration (if it exists).
--# (2) Source /etc/conf.d/net if it is a net.* service
--# (3) Source /etc/rc.conf to pick up potentially overriding
-+# (2) Source /etc/rc.conf to pick up potentially overriding
- #     configuration, if the system administrator chose to put it
- #     there (if it exists).
- 
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iwconfig.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iwconfig.patch
new file mode 100644
index 000000000000..fc9cb9826ec2
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iwconfig.patch
@@ -0,0 +1,11 @@
+--- lib/rcscripts/net.modules.d/iwconfig	(revision 1770)
++++ /lib/rccscripts/net.modules.d/iwconfig	(working copy)
+@@ -832,7 +832,7 @@
+ 		[[ ${unique_ap} != no ]] && iwconfig_strip_associated ${iface}
+ 
+ 		iwconfig_connect_preferred ${iface} && return 0
+-		[[ ${associate_order} == forcepreferred ]] && iwconfig_force_preferred ${iface} && return 0
++		[[ ${associate_order} == forcepreferred || ${associate_order} == forceany ]] && iwconfig_force_preferred ${iface} && return 0
+ 		[[ ${associate_order} == any || ${associate_order} == forceany ]] && iwconfig_connect_not_preferred ${iface} && return 0
+ 	fi
+ 
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-manuser.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-manuser.patch
new file mode 100644
index 000000000000..1fa72f7c7548
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-manuser.patch
@@ -0,0 +1,22 @@
+diff -urN rc-scripts-1.6.14.orig/etc/group rc-scripts-1.6.14/etc/group
+--- rc-scripts-1.6.14.orig/etc/group	2006-02-01 09:06:51.000000000 -0500
++++ rc-scripts-1.6.14/etc/group	2006-02-01 09:18:42.000000000 -0500
+@@ -13,6 +13,7 @@
+ mail::12:mail
+ news::13:news
+ uucp::14:uucp
++man::15:man
+ console::17:
+ audio::18:
+ cdrom::19:
+diff -urN rc-scripts-1.6.14.orig/etc/passwd rc-scripts-1.6.14/etc/passwd
+--- rc-scripts-1.6.14.orig/etc/passwd	2006-02-01 09:06:51.000000000 -0500
++++ rc-scripts-1.6.14/etc/passwd	2006-02-01 09:18:49.000000000 -0500
+@@ -10,6 +10,7 @@
+ news:x:9:13:news:/usr/lib/news:/bin/false
+ uucp:x:10:14:uucp:/var/spool/uucppublic:/bin/false
+ operator:x:11:0:operator:/root:/bin/bash
++man:x:13:15:man:/usr/share/man:/bin/false
+ postmaster:x:14:12:postmaster:/var/spool/mail:/bin/false
+ postgres:x:70:70::/var/lib/postgresql:/bin/bash
+ nut:x:84:84:nut:/var/state/nut:/bin/false
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-udhcpc.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-udhcpc.patch
new file mode 100644
index 000000000000..7b8163be0f2e
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-udhcpc.patch
@@ -0,0 +1,31 @@
+--- lib/rcscripts/net.modules.d/helpers.d/udhcpc-ifconfig	(revision 1866)
++++ net.modules.d/helpers.d/udhcpc-ifconfig	(working copy)
+@@ -37,7 +37,7 @@
+ 
+ # If the current address does not match or we are deconfiguring
+ # then we take the all the addresses on the interface down
+-cur=$( ifconfig ${interface} | grep 'inet ' | awk -F: '{ print $2,$3 }' | awk '{ print $1,$3 }' )
++cur=$( ifconfig ${interface} | grep 'inet ' | awk -F: '{ print $2,$4 }' | awk '{ print $1,$3 }' )
+ if [[ ${cur} != "${ip} ${subnet}" || ${action} == deconfig ]]; then
+ 	# Remove all aliases
+ 	for i in $( ifconfig | grep -o "^${interface}:[0-9]*" | tac | xargs ); do
+@@ -68,7 +68,7 @@
+     # Configure our routers
+     for r in ${router}; do
+ 	while true; do
+-	    /sbin/route del 0.0.0.0 2>/dev/null || break
++	    /sbin/route del default 2>/dev/null || break
+ 	done
+ 
+ 	# We can only have one default route!
+--- etc/init.d/net.lo	(revision 1908)
++++ init.d/net.lo	(working copy)
+@@ -19,7 +19,7 @@
+ # For pcmcia users. note that pcmcia must be added to the same
+ # runlevel as the net.* script that needs it.
+ depend() {
+-	use coldplug hotplug pcmcia usb isdn wlan
++	use coldplug hotplug pcmcia usb isdn wlan isapnp
+ 
+ 	# Load any custom depend functions for the given interface
+ 	# For example, br0 may need eth0 and eth1
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.13-r1 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.13-r1
deleted file mode 100644
index a2df0470b99b..000000000000
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.13-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5674a604ea63c1ffd4568c0b3237642b rc-scripts-1.6.13-vserver.tar.bz2 104663
-RMD160 e495bd4da89d6357e70b2ef33f3a142bcdd25ef5 rc-scripts-1.6.13-vserver.tar.bz2 104663
-SHA256 8c6cb8945f294a2dcc6c4bf9b9ce2a2b36a406da0fc1a57f116263966a8a360d rc-scripts-1.6.13-vserver.tar.bz2 104663
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r2 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r2
deleted file mode 100644
index 6cf4eb89bee9..000000000000
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1dc94e5ea43c8af9498c7e76ee995986 rc-scripts-vserver-1.6.141.tar.bz2 143694
-RMD160 7ff5f8b6ad4fc6b748f36d1e02db88b1e745b192 rc-scripts-vserver-1.6.141.tar.bz2 143694
-SHA256 82a49248d44698a10653b29c35d9f173097d45989a162062e18a75acbe876503 rc-scripts-vserver-1.6.141.tar.bz2 143694
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r3 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r3
new file mode 100644
index 000000000000..0f46c7b52cdd
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r3
@@ -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
diff --git a/sys-apps/baselayout-vserver/files/fakelog.initd b/sys-apps/baselayout-vserver/files/fakelog.initd
deleted file mode 100644
index 1662f0d53656..000000000000
--- a/sys-apps/baselayout-vserver/files/fakelog.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/files/fakelog.initd,v 1.1 2005/06/08 09:33:21 hollow Exp $
-
-depend() {
-            provide logger
-}
-
-start() {
-                ebegin "Starting fakelog"
-		                    eend $?
-}
-
-stop() {
-            ebegin "Stopping fakelog"
-	                eend $?
-
-}
diff --git a/sys-apps/baselayout-vserver/files/vserver-changes b/sys-apps/baselayout-vserver/files/vserver-changes
deleted file mode 100644
index 9156cdffb70b..000000000000
--- a/sys-apps/baselayout-vserver/files/vserver-changes
+++ /dev/null
@@ -1,87 +0,0 @@
-* bin/bashlogin
-	removed, only used by livecds
-
-* bin/rc-status
-	removed handling of single runlevel
-
-* etc/conf.d
-	removed config for init scripts (clock, crypto-loop
-	net, wireless)
-
-* etc/modules*
-	removed, no modules in vservers
-
-* etc/ppp
-	Removed
-
-* etc/inittab
-	removed tty handling, ctrlaltdel and X
-	commented runlevel 1 and 2
-
-* etc/profile
-	fixed bashrc path
-
-* etc/rc, etc/conf.d/rc
-	removed unused config options
-
-* etc/sysctl.conf
-	commented all options
-
-* etc/init.d
-	removed init scripts unusable in vservers:
-		- checkfs
-		- checkroot
-		- clock
-		- consolefont
-		- crypto-loop
-		- localmount
-		- modules
-		- net*
-		- numlock
-
-* etc/bootmisc
-	fixed depend, removed dmesg (no permission)
-
-* etc/{domainname,hostname,rmnologin,urandom}
-	fixed depend
-
-* etc/halt.sh
-	removed misc stuff (mount, devfs, ups)
-
-* etc/keymaps
-	fixed depend, removed terminal encodings (we have no terminals)
-
-* etc/{reboot.sh,shutdown.sh}
-	removed stopping of interfaces
-	added forced reboot (no initctl in vservers with init style = "gentoo") (TODO: remove gentoo init style)
-
-* lib/
-	removed (only net.* helpers in here)
-
-* man/modules*
-	removed, no modules in vservers
-
-* rc-lists/{boot,default}
-	removed unusable init scripts
-
-* rc-lists/nonetwork
-	removed, runlevel does not exist in vservers
-
-* sbin/MAKEDEV
-	added minimal vserver devices
-
-* sbin/functions
-	removed unused functions and options
-
-* sbin/{livecd-functions.sh,modules-update}
-	removed, not needed
-
-* sbin/rc-services
-	removed unused functions
-
-* sbin/rc
-	removed incompatibilities with vservers
-
-* sbin/runscript.sh
-	removed handling of net.* init scripts
-	removed single runlevel