1.11.14-r1 to stable x86 and amd64

(Portage version: 2.1_pre4-r1)

8 files changed, 50 insertions, 525 deletions

diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
index a392764ea9fb..4f6e84510002 100644
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ b/sys-apps/baselayout-vserver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.20 2006/01/27 13:23:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.21 2006/02/07 07:04:33 hollow Exp $
+
+  07 Feb 2006; Benedikt Boehm <hollow@gentoo.org>
+  -baselayout-vserver-1.11.14.ebuild, baselayout-vserver-1.11.14-r1.ebuild:
+  stable on amd64 and x86
 
 *baselayout-vserver-1.11.14-r1 (27 Jan 2006)
 
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index 49fd0374abfe..fe34ddf3b0c0 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -1,28 +1,48 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 75f2b2e96abff8edaa29fb0747f0b697 ChangeLog 4050
+MD5 68dd6d600746896ccb23c2f00ca9b5f4 ChangeLog 4203
+RMD160 63904464166c718c76f3dc55ae15ac3e812f80ed ChangeLog 4203
+SHA256 dd617c61ec9564da2815b0112705cfa607c9bd2b92e928e610c63054acc56632 ChangeLog 4203
 MD5 3154e9763ae2199cddf00a2fa89af3f9 baselayout-vserver-1.11.13-r1.ebuild 13273
-MD5 8280a20d31520c86c335181ecaa71157 baselayout-vserver-1.11.14-r1.ebuild 15843
-MD5 82ddd5fe1dd6afb9550e77c52e1c776d baselayout-vserver-1.11.14.ebuild 15715
+RMD160 0ddc092f0ef5baf7722364cc66c1dbd83fc612c8 baselayout-vserver-1.11.13-r1.ebuild 13273
+SHA256 dc57caa059c3f618b5af74452cfc0ca970f732c9178b1760bc038606de456470 baselayout-vserver-1.11.13-r1.ebuild 13273
+MD5 c3bf9ea0a927692edd9667b18707b9dd baselayout-vserver-1.11.14-r1.ebuild 15841
+RMD160 12da5b7fde10ac1eecd6c682df51cd354480179c baselayout-vserver-1.11.14-r1.ebuild 15841
+SHA256 ff4ef161cfe1eb4d5b9fb5eae2981736783cf30ca54b3b463f668f1d458a31ee baselayout-vserver-1.11.14-r1.ebuild 15841
 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 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
 MD5 645ee27aa823d5fb836b8f160326201e files/baselayout-vserver-1.12.0_pre8-whitelist-fixes.patch 1236
+RMD160 0f7416cfb1eeff5bf159ee64cba7c3067defb837 files/baselayout-vserver-1.12.0_pre8-whitelist-fixes.patch 1236
+SHA256 daf0e8d5db3e82977e2f0e86530005f3386dbb751aae98c214ea52b1b5d10df3 files/baselayout-vserver-1.12.0_pre8-whitelist-fixes.patch 1236
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 a551ddae4bfb1b2bd7cbc16c57f481d3 files/digest-baselayout-vserver-1.11.13-r1 78
-MD5 4fef87b907ebf15454f6d226b1562c02 files/digest-baselayout-vserver-1.11.14 78
-MD5 4fef87b907ebf15454f6d226b1562c02 files/digest-baselayout-vserver-1.11.14-r1 78
-MD5 d1b600f26f783320972a6692720df0d3 files/digest-baselayout-vserver-1.12.0_pre8-r2 83
+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 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD2h7BmPFBzbX68WERAtGlAJ9ayjpaNLz+xkpQYvzrssibY1V/RgCggNh8
-TFnVkZIMr/Hu6rA6/4/n3e8=
-=MeEM
------END PGP SIGNATURE-----
+RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
+SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata.xml 231
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r1.ebuild
index 1156f1a64c34..e9cfedb7205e 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r1.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2006/01/27 13:23:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r1.ebuild,v 1.2 2006/02/07 07:04:33 hollow Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/rc-scripts-vserver-${SV}${SVREV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bootstrap build static unicode"
 
 # This version of baselayout needs gawk in /bin, but as we do not have
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14.ebuild
deleted file mode 100644
index b7ab9eb0c6fb..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14.ebuild
+++ /dev/null
@@ -1,504 +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.14.ebuild,v 1.1 2005/12/08 22:19:26 hollow Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-SV=1.6.${PV##*.}
-SVREV=
-
-S="${WORKDIR}/rc-scripts-vserver-${SV}${SVREV}"
-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}${SVREV}.tar.bz2
-	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"
-
-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
-}
-
-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
-	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/files/digest-baselayout-vserver-1.11.13-r1 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.13-r1
index 766bbacfab04..a2df0470b99b 100644
--- 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
@@ -1 +1,3 @@
 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 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14
deleted file mode 100644
index 58e8fd0ec909..000000000000
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a534dd1fda6861b3486f192aa7a5578 rc-scripts-vserver-1.6.14.tar.bz2 142704
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r1 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r1
index 58e8fd0ec909..0f46c7b52cdd 100644
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r1
+++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r1
@@ -1 +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/digest-baselayout-vserver-1.12.0_pre8-r2 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre8-r2
index 60a4d384caef..1de3cba56144 100644
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre8-r2
+++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre8-r2
@@ -1 +1,3 @@
 MD5 7ce0e4a0b248c569a5f2dba3dede3cf3 baselayout-vserver-1.12.0_pre8.tar.bz2 142245
+RMD160 2cf48df594ed8e98c1db10cea8d50c5ff9294b90 baselayout-vserver-1.12.0_pre8.tar.bz2 142245
+SHA256 ef8b51cf903777190b8d526f2c6ba00557a64074c4d0606a1c10bf7d6671f35c baselayout-vserver-1.12.0_pre8.tar.bz2 142245