Removing old ebuilds

(Portage version: 2.1_pre10-r2)
 (Signed Manifest commit)

8 files changed, 7 insertions, 1535 deletions

diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index 87d9906d5bf4..32f968bce06b 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -33,22 +33,13 @@ AUX baselayout-vserver-1.11.14-uniqify.patch 2080 RMD160 3bbe90a05bd9db1ae552217
 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
-AUX baselayout-vserver-1.12.0_pre16-depscan.patch 4318 RMD160 c14ea46e7cfcf6bf401d44438ec3a2a06e13b429 SHA1 6e4b7b304e916ef7cc285cb5c72ace0d59c7bed5 SHA256 0c2657525b1473ead7c3f891e6c25d2a4ab6e207c626bed8572016c37616084e size 4318
-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
 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd size 2099
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
-DIST baselayout-vserver-1.12.0_pre16.tar.bz2 199185 RMD160 1d88e6e75a92e7d0a96a64db4be91f015a632889 SHA256 7cf216c33888c1bc43014195635aa6b0f75824a656bc83616b7d4999c1d4a62f size 199185
 DIST baselayout-vserver-1.12.0_pre17.tar.bz2 201527 RMD160 71b9da4ea22cc11857b1965b831ea0eb3c665091 SHA256 b23f08878558e560cd2f50bfa2eb8994a7c849c8e12de536ab97823ede662d07 size 201527
 DIST baselayout-vserver-1.12.0_pre18.tar.bz2 198468 RMD160 9366ff3d932f483cdf16457e270ec7f2e8085fe4 SHA256 a78a476dbfc3a6131016351006f455fb62a0d0eee9330e8253a3dcf261c41fd5 size 198468
 DIST rc-scripts-vserver-1.6.14.tar.bz2 142704 RMD160 d4b7002d153116d6bdfb7ae4a1c9828d2f5b2eff SHA256 0c89d5c8ac7fc9d202f20b1494e8e237e37ef11cfa73cc39f5090b2055701406 size 142704
-EBUILD baselayout-vserver-1.11.14-r3.ebuild 15914 RMD160 fb52531303bd4bffbd0ec1b0c05c3631706e8a92 SHA1 11f571d75c69778752aefbcba5c69a0975a371b8 SHA256 7b2a4e9646ffb8545ad7cf22ac8914622b9b9e300157bfc1ba58c1ecf49855ad size 15914
-MD5 af3b968ad781dcb56c53a4cc0bb76038 baselayout-vserver-1.11.14-r3.ebuild 15914
-RMD160 fb52531303bd4bffbd0ec1b0c05c3631706e8a92 baselayout-vserver-1.11.14-r3.ebuild 15914
-SHA256 7b2a4e9646ffb8545ad7cf22ac8914622b9b9e300157bfc1ba58c1ecf49855ad baselayout-vserver-1.11.14-r3.ebuild 15914
 EBUILD baselayout-vserver-1.11.14-r4.ebuild 15955 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a SHA1 c997585cdb3270e49ea96bd195f750c3c4805189 SHA256 9b42983666cdf06837bb7ecb53f8bb3b85ab7efc039d23b4974c778e9380384e size 15955
 MD5 6f0c19788c06583d952eb0a384ab105a baselayout-vserver-1.11.14-r4.ebuild 15955
 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a baselayout-vserver-1.11.14-r4.ebuild 15955
@@ -57,14 +48,6 @@ EBUILD baselayout-vserver-1.11.14-r5.ebuild 13726 RMD160 e725ef7f0fd458513edc897
 MD5 d9e93a9f8242d01b3d363e3d3adbe5c9 baselayout-vserver-1.11.14-r5.ebuild 13726
 RMD160 e725ef7f0fd458513edc897ee84d292d53a36617 baselayout-vserver-1.11.14-r5.ebuild 13726
 SHA256 7925681cead66d2d3cf296f02706108e87298abe9c52d4fd117d005630dffe9a baselayout-vserver-1.11.14-r5.ebuild 13726
-EBUILD baselayout-vserver-1.12.0_pre16-r1.ebuild 12560 RMD160 6d4f648cc825eb7ce9f16d162a447f73c0c493a9 SHA1 5c2ed83d39e95a621dbbabe054dd643726748f34 SHA256 bd6d72758808c9ead0b800212f56500fa0424846528ccee4630192e4152b4000 size 12560
-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
-EBUILD baselayout-vserver-1.12.0_pre16.ebuild 12515 RMD160 a78a7db00b11b6173996753d65a5043fffc4dc8a SHA1 649e46e040d5bc4c3455747192a40e5c766248dc SHA256 32e485bf21282130ef1cb6d223c35be39cc4d2b02a02b89859e60681409e4615 size 12515
-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
 EBUILD baselayout-vserver-1.12.0_pre17.ebuild 13632 RMD160 4b1338dfc1ee8acdbbe7744cff442814c3e28434 SHA1 69d9de146068488726c9acb28271929921c0da5e SHA256 407f359ef068e20e4fee148b8b86d412928c69292bb9018fdc1549a237e2cbc4 size 13632
 MD5 ce60032846eef2aac8b43c3e31707799 baselayout-vserver-1.12.0_pre17.ebuild 13632
 RMD160 4b1338dfc1ee8acdbbe7744cff442814c3e28434 baselayout-vserver-1.12.0_pre17.ebuild 13632
@@ -73,29 +56,20 @@ EBUILD baselayout-vserver-1.12.0_pre18.ebuild 13632 RMD160 3b42fab8bfe5d43240472
 MD5 7e2b460b86a0a44bc45dd3793fcc58cd baselayout-vserver-1.12.0_pre18.ebuild 13632
 RMD160 3b42fab8bfe5d4324047218511a95e7434b9a8ee baselayout-vserver-1.12.0_pre18.ebuild 13632
 SHA256 9e52aa062a41a1598de9a12c0be765d4e763a0f6649814e99d492c8f0929390e baselayout-vserver-1.12.0_pre18.ebuild 13632
-MISC ChangeLog 7271 RMD160 99d2d4011e8b4e64e46eda7e2fb19298a5da3e33 SHA1 f3a436a3a9820b47a0bdb712c6cfd7c09c4a515c SHA256 bc67887ede25f2bb624e47c0adecb5809411e2060d07752e38b6f17f8ab734a4 size 7271
-MD5 e0e330ed9a7d1de04d51c6dcbd09fc1e ChangeLog 7271
-RMD160 99d2d4011e8b4e64e46eda7e2fb19298a5da3e33 ChangeLog 7271
-SHA256 bc67887ede25f2bb624e47c0adecb5809411e2060d07752e38b6f17f8ab734a4 ChangeLog 7271
+MISC ChangeLog 7531 RMD160 790ff35f4c44ff0faecd54cb75c3047ee4e6ccbe SHA1 79cf2da1b37d9c2e40754f1a274dba906308da55 SHA256 7891dd7cca5a8fd0db5fdad34f400ff3354066d08881366397014b1adc4805a1 size 7531
+MD5 5c482039d83f3e46e192045839d7334d ChangeLog 7531
+RMD160 790ff35f4c44ff0faecd54cb75c3047ee4e6ccbe ChangeLog 7531
+SHA256 7891dd7cca5a8fd0db5fdad34f400ff3354066d08881366397014b1adc4805a1 ChangeLog 7531
 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 size 231
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata.xml 231
-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 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
-MD5 df8b7ff09184684431afa2d74667a3e6 files/digest-baselayout-vserver-1.12.0_pre16-r1 298
-RMD160 7272acfb7faca410ef2d90c5c12c775775608d20 files/digest-baselayout-vserver-1.12.0_pre16-r1 298
-SHA256 89d7211dc57314c1709e05326f364247de371e76df6b10299115362360431414 files/digest-baselayout-vserver-1.12.0_pre16-r1 298
 MD5 ea2d093be38643c2c04797e3210445cf files/digest-baselayout-vserver-1.12.0_pre17 298
 RMD160 851ebab3604a459a88b814faea3250cb2ba6f742 files/digest-baselayout-vserver-1.12.0_pre17 298
 SHA256 2dad0239d52c2f23e573968ce518ebdac2c24563942b8865e377978c4389f3d6 files/digest-baselayout-vserver-1.12.0_pre17 298
@@ -105,7 +79,7 @@ SHA256 b7903c3a25269b6346a4b87f8396c77e4e8781bbeb76acb39a5d7ef9f3f11dc4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV3FaflZ8QqxhrsMRAqMMAKCdtUo42RsZTOZMmrsh7arHUYuh1QCfYFK+
-yifMu14WR7oqRCFhJ+beCAo=
-=iaMD
+iD8DBQFEV3NGflZ8QqxhrsMRAmo0AJ98w2JCeuh6VWOau/l+Am7bnpNdyQCfR4Ti
+XF017rbEVYWXIL9CUzkf8EA=
+=ovcJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild
deleted file mode 100644
index 072a22cb7b2c..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# 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-r3.ebuild,v 1.3 2006/03/11 14:53:30 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 unicode"
-
-# 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}"
-
-	# Setup unicode defaults for silly unicode users
-	if use unicode ; then
-		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
-	fi
-
-	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
-}
-
-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 /boot
-	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
-	# Only install /mnt stuff at bootstrap time #88835 / #90022
-	if use build ; then
-		kdir /mnt
-		kdir -m 0700 /mnt/cdrom
-		kdir -m 0700 /mnt/floppy
-	fi
-	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
-
-	# 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
-}
-
-# Support function for remapping old wireless dns vars
-remap_dns_vars() {
-	local f="$1"
-
-	if [[ -f ${ROOT}/etc/conf.d/${f} ]]; then
-		sed -e 's/\<domain_/dns_domain_/g' \
-			-e 's/\<mac_domain_/mac_dns_domain_/g' \
-			-e 's/\<nameservers_/dns_servers_/g' \
-			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
-			-e 's/\<searchdomains_/dns_search_domains_/g' \
-			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
-			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
-	fi
-}
-
-pkg_preinst() {
-	# Change some vars introduced in baselayout-1.11.0 before we go stable
-	# The new names make more sense and allow nis_domain
-	# for use in baselayout-1.12.0
-	remap_dns_vars net
-	remap_dns_vars wireless
-}
-
-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
-
-	# Create /boot/boot symlink in pkg_postinst because sometimes
-	# /boot is a FAT filesystem.  When that is the case, then the
-	# symlink will fail.  Consequently, if we create it in
-	# src_install, then merge will fail.  AFAIK there is no point to
-	# this symlink except for misconfigured grubs.  See bug 50108
-	# (05 May 2004 agriffis)
-	ln -sn . "${ROOT}"/boot/boot 2>/dev/null
-
-	# 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
-
-	for f in /etc/init.d/net.eth*; do
-		[[ -L ${f} ]] && continue
-		echo
-		einfo "WARNING: You have older net.eth* files in ${ROOT}/etc/init.d/"
-		einfo "They need to be converted to symlinks to net.lo.  If you haven't"
-		einfo "made personal changes to those files, you can update with the"
-		einfo "following command:"
-		einfo
-		einfo "  # /bin/ls /etc/init.d/net.eth* | xargs -n1 ln -sfvn net.lo"
-		echo
-		break
-	done
-
-	if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \
-		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
-			echo
-			ewarn "You have depreciated variables in ${ROOT}/etc/conf.d/net"
-			ewarn "or ${ROOT}/etc/conf.d/wireless"
-			ewarn
-			ewarn "domain_* -> dns_domain_*"
-			ewarn "nameservers_* -> dns_servers_*"
-			ewarn "searchdomains_* -> dns_search_domains_*"
-			ewarn
-			ewarn "They have been converted for you - ensure that you"
-			ewarn "update them via 'etc-update'"
-			echo
-	fi
-
-	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/baselayout-vserver-1.12.0_pre16-r1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre16-r1.ebuild
deleted file mode 100644
index f7a4c99ca06a..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre16-r1.ebuild
+++ /dev/null
@@ -1,414 +0,0 @@
-# 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.12.0_pre16-r1.ebuild,v 1.1 2006/03/11 14:59:28 phreak Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-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/${P}.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-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.1_p7
-		>=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}-depscan.patch
-
-	# Use correct path to filefuncs.so on multilib systems
-	sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
-		${S}/src/awk/{cachedepends,genenviron}.awk || die
-}
-
-src_compile() {
-	local libdir="lib"
-
-	use static && append-ldflags -static
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || 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.
-	# <hollow@gentoo.org> We don't support old things anyway
-	rcscripts_dir="/lib/rcscripts"
-
-	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 /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
-
-	# 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"
-
-	# 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 provide our own though...
-	#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 ${PV}" > ${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
-		dodoc "${S}"/ChangeLog.vserver
-	fi
-
-	#
-	# Install baselayout utilities
-	#
-	cd "${S}"/src
-	make DESTDIR="${D}" install || die
-
-	# Normal baselayout does this in pkg_postinst, but we keep it here because
-	# (1) devices will show up in CONTENTS
-	# (2) we just create devices if either build or bootstrap is ins USE
-	# (3) it is not likely that anyone uses devfsd or udev inside a vserver
-	#
-	# However the most common cases are that people are either updating
-	# baselayout or installing from scratch.  In both cases there is no difference
-	# to pkg_postinst as we only create devices when build or bootstrap is in USE.
-	if use build || use bootstrap; then
-		cd ${D}/dev || die
-		ebegin "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 ${PV}" > ${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.12.0_pre16.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre16.ebuild
deleted file mode 100644
index 831adb761c99..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre16.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# 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.12.0_pre16.ebuild,v 1.1 2006/02/18 17:56:26 phreak Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-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/${P}.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-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.1_p7
-		>=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}"
-
-	# Use correct path to filefuncs.so on multilib systems
-	sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
-		${S}/src/awk/{cachedepends,genenviron}.awk || die
-}
-
-src_compile() {
-	local libdir="lib"
-
-	use static && append-ldflags -static
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || 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.
-	# <hollow@gentoo.org> We don't support old things anyway
-	rcscripts_dir="/lib/rcscripts"
-
-	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 /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
-
-	# 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"
-
-	# 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 provide our own though...
-	#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 ${PV}" > ${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
-		dodoc "${S}"/ChangeLog.vserver
-	fi
-
-	#
-	# Install baselayout utilities
-	#
-	cd "${S}"/src
-	make DESTDIR="${D}" install || die
-
-	# Normal baselayout does this in pkg_postinst, but we keep it here because
-	# (1) devices will show up in CONTENTS
-	# (2) we just create devices if either build or bootstrap is ins USE
-	# (3) it is not likely that anyone uses devfsd or udev inside a vserver
-	#
-	# However the most common cases are that people are either updating
-	# baselayout or installing from scratch.  In both cases there is no difference
-	# to pkg_postinst as we only create devices when build or bootstrap is in USE.
-	if use build || use bootstrap; then
-		cd ${D}/dev || die
-		ebegin "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 ${PV}" > ${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/files/baselayout-vserver-1.12.0_pre16-depscan.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.12.0_pre16-depscan.patch
deleted file mode 100644
index 990eae3ceb0e..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.12.0_pre16-depscan.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Index: sbin/depscan.sh
-===================================================================
---- sbin/depscan.sh	(revision 211)
-+++ sbin/depscan.sh	(revision 276)
-@@ -3,68 +3,83 @@
- # Distributed under the terms of the GNU General Public License v2
- 
- source /sbin/functions.sh
-+mysvcdir="${svcdir}"
-+update=false
- 
--if [[ $1 == "--debug" ]] ; then
-+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 daemons \
- 	started starting inactive wasinactive stopping failed \
- 	exclusive exitcodes scheduled ; 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}'!"
-+	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 ! ${update} ; then
-+	clock_screw=false
-+	mtime_test="${mysvcdir}/mtime-test.$$"
- 
--if [[ $1 == "-u" ]] ; then
--	update=0
--	clock_screw=0
--	mtime_test="${svcdir}/mtime-test.$$"
--
- 	# If its not there, we have to update, and make sure its present
- 	# for next mtime testing
--	if [[ ! -e "${svcdir}/depcache" ]] ; then
--			update=1
--			touch "${svcdir}/depcache"
-+	if [[ ! -e "${mysvcdir}/depcache" ]] ; then
-+			update=true
-+			touch "${mysvcdir}/depcache"
- 	fi
- 
- 	touch "${mtime_test}"
- 	for config in /etc/conf.d /etc/init.d /etc/rc.conf
- 	do
--		[[ ${update} == 0 ]] && \
--			is_older_than "${svcdir}/depcache" "${config}" && update=1
-+		! ${update} \
-+			&& is_older_than "${mysvcdir}/depcache" "${config}" \
-+			&& update=true
- 		
--		is_older_than "${mtime_test}" "${config}" && clock_screw=1
-+		is_older_than "${mtime_test}" "${config}" && clock_screw=true
- 	done
- 	rm -f "${mtime_test}"
- 
--	[[ ${clock_screw} == 1 ]] && \
-+	${clock_screw} && \
- 		ewarn "Some file in '/etc/{conf.d,init.d}' have Modification time in the future!"
- 
- 	shift
- fi
- 
--[[ ${update} == 0 && -e "${svcdir}/deptree" ]] && exit 0
-+! ${update} && [[ -e "${mysvcdir}/deptree" ]] && 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}"
- 
-@@ -77,14 +92,14 @@
- 	-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 "${svcdir}"/dep{cache,tree}
--chmod 0644 "${svcdir}"/dep{cache,tree}
-+touch "${mysvcdir}"/dep{cache,tree}
-+chmod 0644 "${mysvcdir}"/dep{cache,tree}
- 
- eend ${retval} "Failed to cache service dependencies"
- 
-Index: sbin/rc-services.sh
-===================================================================
---- sbin/rc-services.sh	(revision 234)
-+++ sbin/rc-services.sh	(revision 276)
-@@ -9,7 +9,7 @@
- 
- if [[ ${RC_GOT_DEPTREE_INFO} != "yes" ]] ; then
- 	# Only try and update if we are root
--	if [[ ${EUID} == "0" ]] && ! /sbin/depscan.sh -u ; then
-+	if [[ ${EUID} == "0" ]] && ! /sbin/depscan.sh ; then
- 		echo
- 		eerror "Error running '/sbin/depscan.sh'!"
- 		eerror "Please correct any problems above."
-Index: sbin/rc
-===================================================================
---- sbin/rc	(revision 227)
-+++ sbin/rc	(revision 276)
-@@ -163,7 +163,7 @@
- 	check_critical_services
- 
- 	# 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/digest-baselayout-vserver-1.11.14-r3 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r3
deleted file mode 100644
index 0f46c7b52cdd..000000000000
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-baselayout-vserver-1.12.0_pre16 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre16
deleted file mode 100644
index c8553d4ff2eb..000000000000
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 65a5112191606b6576ea5d0c5c77a8c1 baselayout-vserver-1.12.0_pre16.tar.bz2 199185
-RMD160 1d88e6e75a92e7d0a96a64db4be91f015a632889 baselayout-vserver-1.12.0_pre16.tar.bz2 199185
-SHA256 7cf216c33888c1bc43014195635aa6b0f75824a656bc83616b7d4999c1d4a62f baselayout-vserver-1.12.0_pre16.tar.bz2 199185
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre16-r1 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre16-r1
deleted file mode 100644
index c8553d4ff2eb..000000000000
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre16-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 65a5112191606b6576ea5d0c5c77a8c1 baselayout-vserver-1.12.0_pre16.tar.bz2 199185
-RMD160 1d88e6e75a92e7d0a96a64db4be91f015a632889 baselayout-vserver-1.12.0_pre16.tar.bz2 199185
-SHA256 7cf216c33888c1bc43014195635aa6b0f75824a656bc83616b7d4999c1d4a62f baselayout-vserver-1.12.0_pre16.tar.bz2 199185