punt

15 files changed, 0 insertions, 2085 deletions

diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
deleted file mode 100644
index 2c06f14cdce8..000000000000
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ /dev/null
@@ -1,272 +0,0 @@
-# ChangeLog for sys-apps/baselayout-vserver
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.45 2011/03/31 11:55:26 ulm Exp $
-
-  31 Mar 2011; Ulrich Mueller <ulm@gentoo.org>
-  baselayout-vserver-1.11.14-r4.ebuild, baselayout-vserver-1.12.3.ebuild,
-  baselayout-vserver-1.12.6.ebuild:
-  Old-style virtual/baselayout was punted three years ago, don't PROVIDE it.
-  Bug 358823.
-
-  13 Oct 2008; Peter Volkov <pva@gentoo.org>
-  files/baselayout-vserver-1.11.14-iwconfig.patch:
-  Fixed broken patch, bug #238588, thank Tom Penndorf for report and fix.
-
-  14 Mar 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
-  fix metadata
-
-*baselayout-vserver-1.12.6 (05 Nov 2006)
-
-  05 Nov 2006; Benedikt Böhm <hollow@gentoo.org>
-  -baselayout-vserver-1.11.15.ebuild, -baselayout-vserver-1.12.1.ebuild,
-  -baselayout-vserver-1.12.2.ebuild, +baselayout-vserver-1.12.6.ebuild:
-  version bump to 1.12.6; 1.11.15 is broken; cleanup
-
-*baselayout-vserver-1.12.3 (06 Oct 2006)
-
-  06 Oct 2006; Christian Heim <phreak@gentoo.org>
-  +baselayout-vserver-1.12.3.ebuild:
-  Version bump. We are in sync now with baselayout-1.12.5-r2.
-
-  06 Oct 2006; Christian Heim <phreak@gentoo.org>
-  baselayout-vserver-1.11.14-r4.ebuild, baselayout-vserver-1.11.15.ebuild,
-  baselayout-vserver-1.12.1.ebuild, baselayout-vserver-1.12.2.ebuild:
-  Fix the PROVIDE, inside vps/ve's there's no need for sys-apps/udev. So
-  baselayout-vserver becomes our primary provider for virtual/dev-manager.
-
-*baselayout-vserver-1.12.2 (25 Sep 2006)
-
-  25 Sep 2006; Christian Heim <phreak@gentoo.org>
-  +baselayout-vserver-1.12.2.ebuild:
-  Version bump, we're no at the same level as baselayout-1.12.5.
-
-  22 Jun 2006; Benedikt Böhm <hollow@gentoo.org>
-  -baselayout-vserver-1.11.14-r5.ebuild, -baselayout-vserver-1.12.0.ebuild,
-  baselayout-vserver-1.12.1.ebuild:
-  fix keywords; cleanup
-
-*baselayout-vserver-1.11.15 (05 Jun 2006)
-*baselayout-vserver-1.12.1 (05 Jun 2006)
-
-  05 Jun 2006; Christian Heim <phreak@gentoo.org>
-  +baselayout-vserver-1.11.15.ebuild, +baselayout-vserver-1.12.1.ebuild:
-  Another version bump, merging changes from baselayout svn
-
-*baselayout-vserver-1.12.0 (24 May 2006)
-
-  24 May 2006; Christian Heim <phreak@gentoo.org>
-  -baselayout-vserver-1.12.0_pre17.ebuild,
-  -baselayout-vserver-1.12.0_pre18.ebuild,
-  +baselayout-vserver-1.12.0.ebuild:
-  baselayout-vserver-1.12.0 is finally ready; removing old _pre ebuilds
-
-  02 May 2006; Christian Heim <phreak@gentoo.org>
-  -files/baselayout-vserver-1.12.0_pre16-depscan.patch,
-  -baselayout-vserver-1.11.14-r3.ebuild,
-  -baselayout-vserver-1.12.0_pre16.ebuild,
-  -baselayout-vserver-1.12.0_pre16-r1.ebuild:
-  Removing old ebuilds
-
-*baselayout-vserver-1.12.0_pre18 (02 May 2006)
-
-  02 May 2006; Christian Heim <phreak@gentoo.org>
-  +baselayout-vserver-1.12.0_pre18.ebuild:
-  Version bump, based on baselayout-1.12_pre19-r1
-
-  27 Apr 2006; Alec Warner <antarus@gentoo.org>
-  files/digest-baselayout-vserver-1.12.0_pre17, Manifest:
-  Fixing SHA256 digest, pass four
-
-*baselayout-vserver-1.11.14-r5 (08 Apr 2006)
-
-  08 Apr 2006; Christian Heim <phreak@gentoo.org>
-  +files/baselayout-vserver-1.11.14-depscan.patch,
-  +files/baselayout-vserver-1.11.14-uniqify.patch,
-  +baselayout-vserver-1.11.14-r5.ebuild:
-  1.11.14 branch now supports the following:
-  - uniqify function for resolvconf-gentoo
-  - Added --svcdir to depscan.sh
-
-*baselayout-vserver-1.12.0_pre17 (08 Apr 2006)
-
-  08 Apr 2006; Christian Heim <phreak@gentoo.org>
-  +baselayout-vserver-1.12.0_pre17.ebuild:
-  New release - load of changes!
-
-  17 Mar 2006; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.11.14-r4.ebuild:
-  1.11.14-r4 stable on x86/amd64
-
-*baselayout-vserver-1.12.0_pre16-r1 (11 Mar 2006)
-
-  11 Mar 2006; Christian Heim <phreak@gentoo.org>
-  +files/baselayout-vserver-1.12.0_pre16-depscan.patch,
-  +baselayout-vserver-1.12.0_pre16-r1.ebuild:
-  Another revision bump, this time for the ~x86/~amd64 branch
-
-*baselayout-vserver-1.11.14-r4 (11 Mar 2006)
-
-  11 Mar 2006; Christian Heim <phreak@gentoo.org>
-  +files/baselayout-vserver-1.11.14-iproute.patch,
-  -baselayout-vserver-1.11.14-r1.ebuild,
-  baselayout-vserver-1.11.14-r3.ebuild,
-  +baselayout-vserver-1.11.14-r4.ebuild:
-  Revision bump, fixing #125786 thanks to Jason Stubbs and Roy Marples
-
-  11 Mar 2006; Christian Heim <phreak@gentoo.org>
-  -files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch,
-  -baselayout-vserver-1.12.0_pre8-r2.ebuild:
-  Cleaning out old version
-
-  23 Feb 2006; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.11.14-r3.ebuild:
-  1.11.14-r3 to stable amd64,x86
-
-*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)
-
-  20 Feb 2006; Christian Heim <phreak@gentoo.org>
-  +baselayout-vserver-1.11.14-r2.ebuild, -baselayout-vserver-1.11.15.ebuild:
-  Bad me, commiting a non-existing baselayout-version. Newest rc-scripts
-  version is now -1.11.14-r2
-
-*baselayout-vserver-1.12.0_pre16 (18 Feb 2006)
-
-  18 Feb 2006; Christian Heim <phreak@gentoo.org>
-  +baselayout-vserver-1.12.0_pre16.ebuild:
-  Version bump; syncing with original baselayout
-
-*baselayout-vserver-1.11.15 (18 Feb 2006)
-
-  18 Feb 2006; Christian Heim <phreak@gentoo.org>
-  +baselayout-vserver-1.11.15.ebuild:
-  Version bump
-
-  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)
-
-  27 Jan 2006; Benedikt Boehm <hollow@gentoo.org>
-  +files/baselayout-vserver-1.11.14-adsl.patch,
-  +files/baselayout-vserver-1.11.14-essidnet.patch,
-  +baselayout-vserver-1.11.14-r1.ebuild:
-  copy bugfixes from baselayout
-
-  26 Dec 2005; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.11.14.ebuild:
-  1.11.14 stable on amd64 and x86
-
-*baselayout-vserver-1.11.14 (08 Dec 2005)
-
-  08 Dec 2005; Benedikt Boehm <hollow@gentoo.org>
-  +baselayout-vserver-1.11.14.ebuild:
-  Version bump
-
-  01 Dec 2005; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.11.13-r1.ebuild:
-  mark stable amd64
-
-  26 Nov 2005; Christian Heim <phreak@gentoo.org>
-  baselayout-vserver-1.11.13-r1.ebuild,
-  baselayout-vserver-1.12.0_pre8-r2.ebuild:
-  Once again, fixing the SRC_URI (and this time for real)
-
-  12 Nov 2005; Benedikt Boehm <hollow@gentoo.org>
-  -baselayout-vserver-1.11.13.ebuild, baselayout-vserver-1.11.13-r1.ebuild,
-  baselayout-vserver-1.12.0_pre8-r2.ebuild:
-  add ~amd64 keywords
-
-  03 Oct 2005; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.11.13-r1.ebuild:
-  1.11.13-r1 to stable
-
-  30 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
-  +files/baselayout-vserver-1.11.13-cleanup.patch,
-  -files/baselayout-vserver-1.11.13-init-timeout-fix.patch,
-  baselayout-vserver-1.11.13-r1.ebuild:
-  fix halt/reboot borkage + minor fixes
-
-*baselayout-vserver-1.11.13-r1 (27 Sep 2005)
-
-  27 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
-  +files/baselayout-vserver-1.11.13-init-timeout-fix.patch,
-  -baselayout-vserver-1.11.12-r4.ebuild,
-  +baselayout-vserver-1.11.13-r1.ebuild,
-  -baselayout-vserver-1.12.0_pre8-r1.ebuild:
-  cleanup; backport init timeout fix to 1.11.13; sync with baselayout-1.11.13-r1
-
-*baselayout-vserver-1.12.0_pre8-r2 (22 Sep 2005)
-
-  22 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
-  +files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch,
-  +baselayout-vserver-1.12.0_pre8-r2.ebuild:
-  adapt r2 + fix init timeout issues
-
-*baselayout-vserver-1.12.0_pre8-r1 (04 Sep 2005)
-
-  04 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
-  +files/baselayout-vserver-1.12.0_pre8-whitelist-fixes.patch,
-  baselayout-vserver-1.11.13.ebuild,
-  +baselayout-vserver-1.12.0_pre8-r1.ebuild:
-  add 1.12.0_pre8 (with gentoo init style support); 1.11.13 to stable
-
-  31 Aug 2005; Christian Heim <phreak@gentoo.org>
-  baselayout-vserver-1.11.12-r4.ebuild:
-  Stable on x86
-
-*baselayout-vserver-1.11.13 (03 Aug 2005)
-
-  03 Aug 2005; Benedikt Boehm <hollow@gentoo.org>
-  +baselayout-vserver-1.11.13.ebuild:
-  Version bump
-
-  15 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.11.12-r4.ebuild:
-  fixed dummy linking
-
-  12 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.11.12-r4.ebuild:
-  minor fixes + cleanup
-
-*baselayout-vserver-1.11.12-r4 (08 Jun 2005)
-
-  08 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
-  -baselayout-vserver-1.0.ebuild, +baselayout-vserver-1.11.12-r4.ebuild:
-  added compatible versioning with sys-apps/baselayout; new, revised patch;
-  1.0 is obsolete
-
-  29 May 2005; <solar@gentoo.org> baselayout-vserver-1.0.ebuild:
-  - update baselayout-vserver to use libc expanded variable elibc_uclibc vs
-  uclibc so USE=-* works
-
-  21 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
-  baselayout-vserver-1.0.ebuild:
-  needs deps before going stable
-
-  18 May 2005; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.0.ebuild:
-  moved to stable, but still in p.mask
-
-  20 Apr 2005; Benedikt Boehm <hollow@gentoo.org>
-  baselayout-vserver-1.0.ebuild:
-  fixed patch
-
-*baselayout-vserver-1.0 (20 Apr 2005)
-
-  20 Apr 2005; Benedikt Boehm <hollow@gentoo.org> +files/copyright,
-  +files/vserver-changes, +metadata.xml, +baselayout-vserver-1.0.ebuild:
-  Initial version of baselayout-vserver (using rc-scripts-1.7.0)
-
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
deleted file mode 100644
index cb5afc1a4610..000000000000
--- a/sys-apps/baselayout-vserver/Manifest
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX baselayout-vserver-1.11.14-adsl.patch 501 RMD160 81db918f622eba2eef3f76e0441023998b367d3f SHA1 c9a51f5a089ca1ce9ddb5baa48476fa65ea6061f SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8
-AUX baselayout-vserver-1.11.14-depscan.patch 3198 RMD160 75cf15798fe495f7928d0dac4a620f6b4308b4e5 SHA1 216b408f4ba4966316de1ccd85603c971f000a51 SHA256 8baf535a28e952a251d729de9c88941849dcf1e0fc1de4fa6fa143a0cc5de12c
-AUX baselayout-vserver-1.11.14-essidnet.patch 619 RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e SHA1 32527571765386bf3e1521dbc34f2d89b10fc4b1 SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b
-AUX baselayout-vserver-1.11.14-iproute.patch 497 RMD160 70a606c98cc15338426beaa21081f1965193dec5 SHA1 478920754b0328d17f203916193644f84d17bb70 SHA256 7548f7436a42f09d224ab494cfb7979e2c406192511e01ccc8cdb70befc02672
-AUX baselayout-vserver-1.11.14-iwconfig.patch 607 RMD160 f3e681b56e2cf96a3760239fc3b8f1b4e8c6a781 SHA1 ca30a700694841600edbb61426e3806caef2bb52 SHA256 2b7125608399f084e833ab5cf1dca977bf5163374048ec295735b47fbf705991
-AUX baselayout-vserver-1.11.14-manuser.patch 890 RMD160 e5ca7992def401d4c236022156f37587d6aabf60 SHA1 994c7fb033b0a2038764c93a9b413097cf840e5c SHA256 7f73007be5392e08711827128b8efa944ece58c5da7b5606f387b02e6a1aceb4
-AUX baselayout-vserver-1.11.14-udhcpc.patch 1301 RMD160 e07f8165814a29dee4aa044e6817f8b79193403f SHA1 8e317787579b3d481f57fb57e725d3f5290b09d9 SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc
-AUX baselayout-vserver-1.11.14-uniqify.patch 2080 RMD160 3bbe90a05bd9db1ae552217ce5043cca80abf609 SHA1 34744cda846236acc73d1a1f91c926e7d629f05b SHA256 80290bcd0292af7911e865beae03e8e53d8d45486127ae394d3a843e1cdc8962
-AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd
-DIST baselayout-vserver-1.12.3.tar.bz2 212326 RMD160 d4a8927d429650f635e27a172c01fc54170a4fb4 SHA1 fc4fe2b72515f9493b9d73e151c64f1d1ea7272a SHA256 42845156855aaeea37771b1dc727a2439de10076ecd8024f5fa81cc55f84b027
-DIST baselayout-vserver-1.12.6.tar.bz2 213189 RMD160 e37a45cacaddf3fe8909d3dfc1abced5f5ae83fa SHA1 864f72fc6301072042686147720ebf9f1cd77e89 SHA256 32876093b6ceae1c2a4323691738391171c6516f50777edd7e9a54476e7bda01
-DIST rc-scripts-vserver-1.6.14.tar.bz2 142704 RMD160 d4b7002d153116d6bdfb7ae4a1c9828d2f5b2eff SHA1 e238ee8feb4d8bdc4425fba6d2d2b9e0abd9b7f1 SHA256 0c89d5c8ac7fc9d202f20b1494e8e237e37ef11cfa73cc39f5090b2055701406
-EBUILD baselayout-vserver-1.11.14-r4.ebuild 15948 RMD160 f5a0faa4962c30f2bf4a1f0157246b527b5b5621 SHA1 a08fe99f05977074fcd7873d9ed2a9a544009bdb SHA256 cee2a0095f9bf08c7a6f7bb1c0d3f57a1d6bb42dd4b71a6d9a6753045f75807f
-EBUILD baselayout-vserver-1.12.3.ebuild 13664 RMD160 f2e2fa827703d4d8834c3749c0dd98396f93669b SHA1 918860b310777c44b52932bc3b4023f59dc36cb1 SHA256 2e4030fcc706ccdb470a4daa5d000f2f46350df738a703f0281140f9f447eb3b
-EBUILD baselayout-vserver-1.12.6.ebuild 14275 RMD160 a9e4dc83219391729fcacc4d9f29a867b12859da SHA1 0f3886ea0a1178411643789079a5e70af3a01e90 SHA256 960ed65dafd6f349545106de5a0b154a4f66eba3076b85381264f194fd3c35f3
-MISC ChangeLog 9793 RMD160 25995bf482dd41b45f453618739821c24af71dc2 SHA1 e8a3e94bcc4fdbd0565a3a6a8d20a165837f167e SHA256 7a95595795237a7ffd0a8c5498c016fe2b9b2a7934857648c9111ad120ae808e
-MISC metadata.xml 161 RMD160 a1aed45336df9f7b57f564f926018a4c277b03c1 SHA1 c318cf6e67d7853ef0bea05927ec90929724d058 SHA256 5ff36ee3cfe624685d817ff9d877acca89247016b6b7464ffaeae075c9022ae7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2Ua+8ACgkQOeoy/oIi7uzvHwCbBns9TdRdxkMdNd6wiUW9kLrx
-lXUAmwQ43kQiHXhHAdjYwRZ6tdOkLzIg
-=PmKp
------END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
deleted file mode 100644
index d437689c6809..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 1999-2011 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-r4.ebuild,v 1.7 2011/03/31 11:55:26 ulm 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/dev-manager"
-
-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
-	epatch "${FILESDIR}"/${P}-iproute.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} > ${D}/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.3.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.3.ebuild
deleted file mode 100644
index 3aa57fca574a..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.3.ebuild
+++ /dev/null
@@ -1,447 +0,0 @@
-# Copyright 1999-2011 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.3.ebuild,v 1.2 2011/03/31 11:55:26 ulm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-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="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="bootstrap build static"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-
-# We need to block old dhcpcd versions as they are no longer in system
-# but may not be in users world file either. See bug #143885
-
-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
-	) )
-	!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/dev-manager"
-
-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
-if [ ! -d "\${ROOT}/${d}" ] ; then \\
-	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"
-fi
-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
-
-	# Benedikt Boehm <hollow@gentoo.org>
-	# vserver-devs don't support old stuff
-	rcscripts_dir="/lib/rcscripts"
-
-	einfo "Creating directories..."
-	kdir /usr
-	kdir /usr/local
-	kdir /dev
-	kdir /dev/pts
-	kdir /dev/shm
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	kdir /etc/opt
-	kdir /home
-	kdir ${rcscripts_dir}
-	kdir ${rcscripts_dir}/awk
-	kdir ${rcscripts_dir}/sh
-	kdir ${rcscripts_dir}/net
-	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"
-
-	# 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
-
-	# Benedikt Boehm <hollow@gentoo.org>
-	# baselayout-vserver provides it's own!
-	#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
-
-	# Original design had these in /etc/net.modules.d but that is too
-	# problematic with CONFIG_PROTECT
-	dodir ${rcscripts_dir}
-	cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir}
-	chown -R root:0 ${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}" LIBDIR="$(get_libdir)" 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 vps
-	#
-	# 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.
-
-	# Christian Heim <phreak@gentoo.org>
-	# use the MAKEDEV in ${D}/sbin, otherwise we'll rely on the hosts MAKEDEV
-	# which is baad
-	cd ${D}/dev || die
-	ebegin "Populating /dev with safe device nodes..."
-	"${D}"/sbin/MAKEDEV generic-vserver &> /dev/null
-	eend $? || die
-
-	# Hack to fix bug 9849, continued in pkg_postinst
-	unkdir
-}
-
-pkg_postinst() {
-	local x y
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files."
-	einfo "Some of these might fail if they're read-only mounted"
-	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source "${ROOT}"/usr/share/baselayout/mkdirs.sh
-	source "${ROOT}"/usr/share/baselayout/mklinks.sh
-	echo
-
-	# 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 nonetwork single; do
-			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p "${ROOT}"/etc/runlevels/${x}
-			for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
-				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
-					ewarn "init.d/${y} not found -- ignoring"
-				else
-					ln -sfn /etc/init.d/${y} \
-						"${ROOT}"/etc/runlevels/${x}/${y}
-				fi
-			done
-		done
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly...  see src_install() for why they
-	# are in /usr/share/baselayout/
-	for x in passwd shadow group ; do
-		if [[ -e ${ROOT}/etc/${x} ]] ; then
-			touch "${ROOT}/etc/${x}"
-		else
-			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
-		fi
-	done
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh --update &>/dev/null
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && \
-	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
-	then
-		if /usr/sbin/grpck -r &>/dev/null; then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f ${ROOT}/etc/._cfg????_gentoo-release
-	echo "Gentoo Base System version ${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
-
-	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
-
-	# Remove old stuff that may cause problems.
-	if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then
-		rm -f "${ROOT}"/etc/env.d/01hostname
-	fi
-	if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then
-		rm -f "${ROOT}"/etc/init.d/domainname
-		rm -f "${ROOT}"/etc/runlevels/*/domainname
-		ewarn "The domainname init script has been removed in this version."
-		ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how"
-		ewarn "to apply dns/nis information to the loopback interface."
-	fi
-}
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.6.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.6.ebuild
deleted file mode 100644
index 1f40ec4795e4..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.6.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2011 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.6.ebuild,v 1.2 2011/03/31 11:55:26 ulm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-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="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="bootstrap build static"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-
-# We need to block old dhcpcd versions as they are no longer in system
-# but may not be in users world file either. See bug #143885
-
-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
-	) )
-	!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/dev-manager"
-
-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
-if [ ! -d "\${ROOT}/${d}" ] ; then \\
-	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"
-fi
-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
-
-	# Benedikt Boehm <hollow@gentoo.org>
-	# vserver-devs don't support old stuff
-	rcscripts_dir="/lib/rcscripts"
-
-	einfo "Creating directories..."
-	kdir /usr
-	kdir /usr/local
-	kdir /dev
-	kdir /dev/pts
-	kdir /dev/shm
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	kdir /etc/opt
-	kdir /home
-	kdir ${rcscripts_dir}
-	kdir ${rcscripts_dir}/awk
-	kdir ${rcscripts_dir}/sh
-	kdir ${rcscripts_dir}/net
-	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"
-
-	# 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
-
-	# Benedikt Boehm <hollow@gentoo.org>
-	# baselayout-vserver provides it's own!
-	#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
-
-	# Original design had these in /etc/net.modules.d but that is too
-	# problematic with CONFIG_PROTECT
-	dodir ${rcscripts_dir}
-	cp -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir}
-	chown -R root:0 ${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}" LIBDIR="$(get_libdir)" 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 vps
-	#
-	# 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.
-
-	# Christian Heim <phreak@gentoo.org>
-	# use the MAKEDEV in ${D}/sbin, otherwise we'll rely on the hosts MAKEDEV
-	# which is baad
-	cd ${D}/dev || die
-	ebegin "Populating /dev with safe device nodes..."
-	"${D}"/sbin/MAKEDEV generic-vserver &> /dev/null
-	eend $? || die
-
-	# Hack to fix bug 9849, continued in pkg_postinst
-	unkdir
-}
-
-pkg_postinst() {
-	local x y
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files."
-	einfo "Some of these might fail if they're read-only mounted"
-	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source "${ROOT}"/usr/share/baselayout/mkdirs.sh
-	source "${ROOT}"/usr/share/baselayout/mklinks.sh
-	echo
-
-	# 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 nonetwork single; do
-			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p "${ROOT}"/etc/runlevels/${x}
-			for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
-				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
-					ewarn "init.d/${y} not found -- ignoring"
-				else
-					ln -sfn /etc/init.d/${y} \
-						"${ROOT}"/etc/runlevels/${x}/${y}
-				fi
-			done
-		done
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly...  see src_install() for why they
-	# are in /usr/share/baselayout/
-	for x in passwd shadow group ; do
-		if [[ -e ${ROOT}/etc/${x} ]] ; then
-			touch "${ROOT}/etc/${x}"
-		else
-			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
-		fi
-	done
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh --update &>/dev/null
-	fi
-
-	# 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
-
-	for f in ${ROOT}etc/init.d/net.* ; do
-		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/net.lo" ]] && continue
-		echo
-		einfo "WARNING: You have older net.* 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 ${ROOT}etc/init.d/net.* | grep -v '/net.lo$' | 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 '\<(iface_|gateway=|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
-
-	# Remove old stuff that may cause problems.
-	if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then
-		rm -f "${ROOT}"/etc/env.d/01hostname
-	fi
-	if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then
-		rm -f "${ROOT}"/etc/init.d/domainname
-		rm -f "${ROOT}"/etc/runlevels/*/domainname
-		ewarn "The domainname init script has been removed in this version."
-		ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how"
-		ewarn "to apply dns/nis information to the loopback interface."
-	fi
-}
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-adsl.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-adsl.patch
deleted file mode 100644
index a2f4740bdea2..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-adsl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/rcscripts/net.modules.d/adsl
-===================================================================
---- lib/rcscripts/net.modules.d/adsl	(revision 1838)
-+++ lib/rcscripts/net.modules.d/adsl	(working copy)
-@@ -114,7 +114,7 @@
- 	einfo "Stopping ADSL for ${iface}"
- 	${exe} <(cat "${cfgfile}"; \
- 		echo "ETH=${iface}"; \
--		echo "PIDFILE=/var/run/rp-pppoe-${iface}.pid" \
-+		echo "PIDFILE=/var/run/rp-pppoe-${iface}.pid"; \
- 		[[ -n ${user} ]] && echo "USER=${user}") \
- 		>${devnull}
- 	eend $?
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-depscan.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-depscan.patch
deleted file mode 100644
index ea1573439aa8..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-depscan.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- sbin/depscan.sh	2005-07-22 01:24:27.000000000 +0100
-+++ sbin/depscan.sh	2006-03-02 23:31:55.000000000 +0000
-@@ -5,54 +5,62 @@
- 
- source /etc/init.d/functions.sh
- 
--if [[ $1 == "--debug" ]] ; then
-+mysvcdir="${svcdir}"
-+update=false
-+
-+while [[ -n $1 ]] ; do
-+	case "$1" in
-+		--debug|-d)
-+			set -x
-+			;;
-+		--svcdir|-s)
-+			if [[ -z $2 || $2 == -* ]] ; then
-+				eerror "No svcdir specified"
-+			else
-+				shift
-+				mysvcdir="$1"
-+			fi
-+			;;
-+		--update|-u)
-+			update=true
-+			;;
-+	esac
- 	shift
--	set -x
--fi
-+done
- 
--if [ ! -d "${svcdir}" ]
--then
--	if ! mkdir -p -m 0755 "${svcdir}" 2>/dev/null
--	then
--		eerror " Could not create needed directory '${svcdir}'!"
-+if [[ ! -d ${mysvcdir} ]] ; then
-+	if ! mkdir -p -m 0755 "${mysvcdir}" 2>/dev/null ; then
-+		eerror "Could not create needed directory '${mysvcdir}'!"
- 	fi
- fi
- 
--for x in softscripts snapshot options started
--do
--	if [ ! -d "${svcdir}/${x}" ]
--	then
--		if ! mkdir -p -m 0755 "${svcdir}/${x}" 2>/dev/null
--		then
--			eerror " Could not create needed directory '${svcdir}/${x}'!"
-+for x in softscripts snapshot options started ; do
-+	if [[ ! -d "${mysvcdir}/${x}" ]] ; then
-+		if ! mkdir -p -m 0755 "${mysvcdir}/${x}" 2>/dev/null ; then
-+			eerror "Could not create needed directory '${mysvcdir}/${x}'!"
- 		fi
- 	fi
- done
- 
- # Only update if files have actually changed
--update=1
--if [ "$1" == "-u" ]
--then
--	update=0
--	for config in /etc/conf.d /etc/init.d /etc/rc.conf
--	do
--		if [ "${config}" -nt "${svcdir}/depcache" ]
--		then
--			update=1
-+if ! ${update} ; then
-+	for config in /etc/conf.d /etc/init.d /etc/rc.conf ; do
-+		if [[ ${config} -nt "${mysvcdir}/depcache" ]] ; then
-+			update=true	
- 			break
- 		fi
- 	done
--	shift
- fi
--[ ${update} -eq 0 ] && exit 0
-+
-+! ${update} && exit 0
- 
- ebegin "Caching service dependencies"
- 
- # Clean out the non volitile directories ...
--rm -rf "${svcdir}"/dep{cache,tree} "${svcdir}"/{broken,snapshot}/*
-+rm -rf "${mysvcdir}"/dep{cache,tree} "${mysvcdir}"/{broken,snapshot}/*
- 
- retval=0
--SVCDIR="${svcdir}"
-+SVCDIR="${mysvcdir}"
- DEPTYPES="${deptypes}"
- ORDTYPES="${ordtypes}"
- 
-@@ -65,17 +73,17 @@
- 	-f /lib/rcscripts/awk/cachedepends.awk || \
- 	retval=1
- 
--bash "${svcdir}/depcache" | \
-+bash "${mysvcdir}/depcache" | \
- /bin/gawk \
- 	-f /lib/rcscripts/awk/functions.awk \
- 	-f /lib/rcscripts/awk/gendepends.awk || \
- 	retval=1
- 
--touch -m "${svcdir}"/dep{cache,tree}
-+touch "${mysvcdir}"/dep{cache,tree}
-+chmod 0644 "${mysvcdir}"/dep{cache,tree}
- 
- eend ${retval} "Failed to cache service dependencies"
- 
- exit ${retval}
- 
--
- # vim:ts=4
---- sbin/rc-services.sh	2005-03-08 16:07:30.000000000 +0000
-+++ sbin/rc-services.sh	2006-03-02 20:28:03.000000000 +0000
-@@ -10,7 +10,7 @@
- 
- if [ "${RC_GOT_DEPTREE_INFO}" != "yes" ]
- then
--	if ! /sbin/depscan.sh -u
-+	if ! /sbin/depscan.sh
- 	then
- 		echo
- 		eerror "Error running '/sbin/depscan.sh'!"
---- sbin/rc	2006-03-02 23:22:31.000000000 +0000
-+++ sbin/rc	2006-03-02 20:28:03.000000000 +0000
-@@ -407,7 +407,7 @@
- 	         grep -ve '\(depcache\|deptree\|envcache\)')
- 
- 	# Update the dependency cache
--	/sbin/depscan.sh -u
-+	/sbin/depscan.sh
- 
- 	# Now that the dependency cache are up to date, make sure these
- 	# are marked as started ...
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-essidnet.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-essidnet.patch
deleted file mode 100644
index 925edad41ebd..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-essidnet.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: net-scripts/net.modules.d/essidnet
-===================================================================
---- lib/rcscripts/net.modules.d/essidnet	(revision 1828)
-+++ net-scripts/net.modules.d/essidnet	(working copy)
-@@ -83,7 +83,8 @@
- 	done
- 
- 	# Nameserver setup for the essid if required
--	local -a nameservers=( \"\$\{mac_dns_servers_${mac}\[@\]\}\" )
-+	local -a nameservers
-+	eval nameservers=( \"\$\{mac_dns_servers_${mac}\[@\]\}\" )
- 	[[ -z ${nameservers} ]] && eval nameservers=( \"\$\{dns_servers_${essid}\[@\]\}\" )
- 	if [[ -n ${nameservers} ]]; then
- 		# Make a backup of the origional file if necessary
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iproute.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iproute.patch
deleted file mode 100644
index d6ba47a2192d..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iproute.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/rcscripts/net.modules.d/ifconfig	(revision 276)
-+++ lib/rcscripts/net.modules.d/ifconfig	(revision 278)
-@@ -278,9 +278,9 @@ ifconfig_post_start() {
- 		ebegin "${x}"
- 		# Support adding IPv6 addresses easily
- 		if [[ ${x} == *:* && ${x} != *'-A inet6'* ]]; then
--			/sbin/route add -A inet6 ${x} &>${devnull}
-+			/sbin/route add -A inet6 ${x} dev ${iface} &>${devnull}
- 		else
--			/sbin/route add ${x} &>${devnull}
-+			/sbin/route add ${x} dev ${iface} &>${devnull}
- 		fi
- 		eend $?
- 	done
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
deleted file mode 100644
index 7616251cbedd..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iwconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/rcscripts/net.modules.d/iwconfig	(revision 1770)
-+++ lib/rcscripts/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
deleted file mode 100644
index 1fa72f7c7548..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-manuser.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 7b8163be0f2e..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-udhcpc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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/baselayout-vserver-1.11.14-uniqify.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-uniqify.patch
deleted file mode 100644
index 371a090b4f79..000000000000
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-uniqify.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: sbin/functions.sh
-===================================================================
---- sbin/functions.sh	(revision 1964)
-+++ sbin/functions.sh	(working copy)
-@@ -757,6 +757,18 @@
- 	return 1
- }
- 
-+# char* uniqify(char *arg, ...)
-+#
-+#   Ensure that params are unique
-+#
-+uniqify() {
-+    local result= x=
-+    while [[ -n "$1" ]] ; do
-+		[[ " ${result} " != *" $1 "* ]] && result="${result} $1"
-+		shift
-+	done
-+    echo "${result# *}"
-+}
- 
- ##############################################################################
- #                                                                            #
-Index: sbin/runscript.sh
-===================================================================
---- sbin/runscript.sh	(revision 1964)
-+++ sbin/runscript.sh	(working copy)
-@@ -130,7 +130,7 @@
- 		ewarn "WARNING:  you are stopping a boot service."
- 	fi
- 
--	if [[ ${svcpause} != "yes" ]] ; then
-+	if [[ ${svcpause} != "yes" && ${RC_NODEPS} != "yes" ]] ; then
- 		if [[ ${NETSERVICE} == "yes" ]] ; then
- 			# A net.* service
- 			if in_runlevel "${myservice}" "${BOOTLEVEL}" || \
-@@ -238,13 +238,15 @@
- 		mark_service_started "${myservice}"
- 
- 		# On rc change, start all services "before $myservice" first
--		if is_runlevel_start ; then
--			startupservices="$(ineed "${myservice}") \
--				$(valid_iuse "${myservice}") \
--				$(valid_iafter "${myservice}")"
--		else
--			startupservices="$(ineed "${myservice}") \
--				$(valid_iuse "${myservice}")"
-+		if [[ ${RC_NODEPS} != "yes" ]] ; then
-+			if is_runlevel_start ; then
-+				startupservices="$(ineed "${myservice}") \
-+					$(valid_iuse "${myservice}") \
-+					$(valid_iafter "${myservice}")"
-+			else
-+				startupservices="$(ineed "${myservice}") \
-+					$(valid_iuse "${myservice}")"
-+			fi
- 		fi
- 
- 		# Start dependencies, if any
-@@ -418,6 +420,8 @@
- 	--verbose)
- 		RC_VERBOSE="yes"
- 		;;
-+	--nodeps)
-+		RC_NODEPS="yes"
- 	esac
- done
- for arg in $* ; do
-@@ -488,7 +492,7 @@
- 		svc_stop
- 		svcpause="no"
- 		;;
--	--quiet|--nocolor)
-+	--quiet|--nocolor|--nodeps)
- 		;;
- 	help)
- 		exec "${svclib}"/sh/rc-help.sh "${myscript}" help
diff --git a/sys-apps/baselayout-vserver/files/copyright b/sys-apps/baselayout-vserver/files/copyright
deleted file mode 100644
index 2bdf95eb73a1..000000000000
--- a/sys-apps/baselayout-vserver/files/copyright
+++ /dev/null
@@ -1,45 +0,0 @@
-This package is maintained for Debian by Bdale Garbee, <bdale@gag.com>.
-
-It was downloaded from ftp.redhat.com, as a source .rpm from the 5.1 release
-tree.
-
-Copyright:
-
-No explicit copyright is asserted.  Nick Holloway is the earliest author 
-recorded in the sourcecode.  I queried him for an explicit statement 
-regarding the license status of this work, and this is his reply:
-  
- Date: Tue, 21 Jul 1998 19:57:10 +0100
- From: Nick Holloway <Nick.Holloway@alfie.demon.co.uk>
- Message-Id: <199807211857.TAA19068@alfie.demon.co.uk>
- To: Bdale Garbee <bdale@gag.com>
- Subject: Re: makedev license?
- 
- > I maintain the makedev package for Debian GNU/Linux.  I am about to move 
- > from the ill-fated makedev-1.6 to the makedev-2.3.1 derived from your work 
- > by the folks at Redhat.  I don't see any evidence of a copyright assertion 
- > or explicit license statement in the source.  Your name appears to be the 
- > earliest attached to the current sourcecode.  Am I correct in assuming the 
- > GPL?  We try to be meticulous about having our base system be compliant 
- > with our Debian Free Software Guidelines, so I'd like an explicit statement.
- 
- It was never explictly released as GPL, as that would have required
- including the file COPYING which would have been much larger than the
- actual MAKEDEV script (I was also too lazy to find out what incantations
- needed to be made).  However, it is intended to be used as anyone sees
- fit, and the statement under "Copying Policy" is "Freely Redistributable"
- (see MAKEDEV.lsm from any of the releases I made).
- 
- The more recent modifications were done by Michael K. Johnson at
- Redhat.  I think the understanding was that he would be taking over the
- maintenance of MAKEDEV (our discussion took place last September).
- 
- The only previous history was (according to an old posting to
- comp.os.linux) that I started with Jim Winstead's script.
- 
- So, as far as I am concerned, it is consistentwith the Debian FSG.
- 
- -- 
-  `O O'  | Home: Nick.Holloway@alfie.demon.co.uk  http://www.alfie.demon.co.uk/
- // ^ \\ | Work: Nick.Holloway@parallax.co.uk
- 
diff --git a/sys-apps/baselayout-vserver/metadata.xml b/sys-apps/baselayout-vserver/metadata.xml
deleted file mode 100644
index 34e72b1b5275..000000000000
--- a/sys-apps/baselayout-vserver/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>vserver</herd>
-</pkgmetadata>