baselayout-vserver-1.12.0 is finally ready; removing old _pre ebuilds

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

5 files changed, 28 insertions, 928 deletions

diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index 32f968bce06b..009708b6313f 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -1,66 +1,61 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX baselayout-vserver-1.11.14-adsl.patch 501 RMD160 81db918f622eba2eef3f76e0441023998b367d3f SHA1 c9a51f5a089ca1ce9ddb5baa48476fa65ea6061f SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8 size 501
+AUX baselayout-vserver-1.11.14-adsl.patch 501 RMD160 81db918f622eba2eef3f76e0441023998b367d3f SHA1 c9a51f5a089ca1ce9ddb5baa48476fa65ea6061f SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8
 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
-AUX baselayout-vserver-1.11.14-depscan.patch 3198 RMD160 75cf15798fe495f7928d0dac4a620f6b4308b4e5 SHA1 216b408f4ba4966316de1ccd85603c971f000a51 SHA256 8baf535a28e952a251d729de9c88941849dcf1e0fc1de4fa6fa143a0cc5de12c size 3198
+AUX baselayout-vserver-1.11.14-depscan.patch 3198 RMD160 75cf15798fe495f7928d0dac4a620f6b4308b4e5 SHA1 216b408f4ba4966316de1ccd85603c971f000a51 SHA256 8baf535a28e952a251d729de9c88941849dcf1e0fc1de4fa6fa143a0cc5de12c
 MD5 5651d7e5c42c69c9343cb156fc816f9d files/baselayout-vserver-1.11.14-depscan.patch 3198
 RMD160 75cf15798fe495f7928d0dac4a620f6b4308b4e5 files/baselayout-vserver-1.11.14-depscan.patch 3198
 SHA256 8baf535a28e952a251d729de9c88941849dcf1e0fc1de4fa6fa143a0cc5de12c files/baselayout-vserver-1.11.14-depscan.patch 3198
-AUX baselayout-vserver-1.11.14-essidnet.patch 619 RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e SHA1 32527571765386bf3e1521dbc34f2d89b10fc4b1 SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b size 619
+AUX baselayout-vserver-1.11.14-essidnet.patch 619 RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e SHA1 32527571765386bf3e1521dbc34f2d89b10fc4b1 SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b
 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
-AUX baselayout-vserver-1.11.14-iproute.patch 497 RMD160 70a606c98cc15338426beaa21081f1965193dec5 SHA1 478920754b0328d17f203916193644f84d17bb70 SHA256 7548f7436a42f09d224ab494cfb7979e2c406192511e01ccc8cdb70befc02672 size 497
+AUX baselayout-vserver-1.11.14-iproute.patch 497 RMD160 70a606c98cc15338426beaa21081f1965193dec5 SHA1 478920754b0328d17f203916193644f84d17bb70 SHA256 7548f7436a42f09d224ab494cfb7979e2c406192511e01ccc8cdb70befc02672
 MD5 65746e3c9ed3ed82828b005b9a5cc2ed files/baselayout-vserver-1.11.14-iproute.patch 497
 RMD160 70a606c98cc15338426beaa21081f1965193dec5 files/baselayout-vserver-1.11.14-iproute.patch 497
 SHA256 7548f7436a42f09d224ab494cfb7979e2c406192511e01ccc8cdb70befc02672 files/baselayout-vserver-1.11.14-iproute.patch 497
-AUX baselayout-vserver-1.11.14-iwconfig.patch 609 RMD160 5e5178bb9e100509eefb6dc5bc8a478621941feb SHA1 3ef56b2ff98c55988b791a4be279b541d6bca1b4 SHA256 fba67a24d63c29407882894fc78bf6716329a923d7925e9f0cd2b6535afdd292 size 609
+AUX baselayout-vserver-1.11.14-iwconfig.patch 609 RMD160 5e5178bb9e100509eefb6dc5bc8a478621941feb SHA1 3ef56b2ff98c55988b791a4be279b541d6bca1b4 SHA256 fba67a24d63c29407882894fc78bf6716329a923d7925e9f0cd2b6535afdd292
 MD5 00027c12be3e1ed7ce2787cfca1b5a6c files/baselayout-vserver-1.11.14-iwconfig.patch 609
 RMD160 5e5178bb9e100509eefb6dc5bc8a478621941feb files/baselayout-vserver-1.11.14-iwconfig.patch 609
 SHA256 fba67a24d63c29407882894fc78bf6716329a923d7925e9f0cd2b6535afdd292 files/baselayout-vserver-1.11.14-iwconfig.patch 609
-AUX baselayout-vserver-1.11.14-manuser.patch 890 RMD160 e5ca7992def401d4c236022156f37587d6aabf60 SHA1 994c7fb033b0a2038764c93a9b413097cf840e5c SHA256 7f73007be5392e08711827128b8efa944ece58c5da7b5606f387b02e6a1aceb4 size 890
+AUX baselayout-vserver-1.11.14-manuser.patch 890 RMD160 e5ca7992def401d4c236022156f37587d6aabf60 SHA1 994c7fb033b0a2038764c93a9b413097cf840e5c SHA256 7f73007be5392e08711827128b8efa944ece58c5da7b5606f387b02e6a1aceb4
 MD5 739091cd6c0965fcfb1843052243dad8 files/baselayout-vserver-1.11.14-manuser.patch 890
 RMD160 e5ca7992def401d4c236022156f37587d6aabf60 files/baselayout-vserver-1.11.14-manuser.patch 890
 SHA256 7f73007be5392e08711827128b8efa944ece58c5da7b5606f387b02e6a1aceb4 files/baselayout-vserver-1.11.14-manuser.patch 890
-AUX baselayout-vserver-1.11.14-udhcpc.patch 1301 RMD160 e07f8165814a29dee4aa044e6817f8b79193403f SHA1 8e317787579b3d481f57fb57e725d3f5290b09d9 SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc size 1301
+AUX baselayout-vserver-1.11.14-udhcpc.patch 1301 RMD160 e07f8165814a29dee4aa044e6817f8b79193403f SHA1 8e317787579b3d481f57fb57e725d3f5290b09d9 SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc
 MD5 6a8967d43dfa400cdfbab80fc49a7e85 files/baselayout-vserver-1.11.14-udhcpc.patch 1301
 RMD160 e07f8165814a29dee4aa044e6817f8b79193403f files/baselayout-vserver-1.11.14-udhcpc.patch 1301
 SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc files/baselayout-vserver-1.11.14-udhcpc.patch 1301
-AUX baselayout-vserver-1.11.14-uniqify.patch 2080 RMD160 3bbe90a05bd9db1ae552217ce5043cca80abf609 SHA1 34744cda846236acc73d1a1f91c926e7d629f05b SHA256 80290bcd0292af7911e865beae03e8e53d8d45486127ae394d3a843e1cdc8962 size 2080
+AUX baselayout-vserver-1.11.14-uniqify.patch 2080 RMD160 3bbe90a05bd9db1ae552217ce5043cca80abf609 SHA1 34744cda846236acc73d1a1f91c926e7d629f05b SHA256 80290bcd0292af7911e865beae03e8e53d8d45486127ae394d3a843e1cdc8962
 MD5 08385e878922e351d020a26fed4de4de files/baselayout-vserver-1.11.14-uniqify.patch 2080
 RMD160 3bbe90a05bd9db1ae552217ce5043cca80abf609 files/baselayout-vserver-1.11.14-uniqify.patch 2080
 SHA256 80290bcd0292af7911e865beae03e8e53d8d45486127ae394d3a843e1cdc8962 files/baselayout-vserver-1.11.14-uniqify.patch 2080
-AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd size 2099
+AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
-DIST baselayout-vserver-1.12.0_pre17.tar.bz2 201527 RMD160 71b9da4ea22cc11857b1965b831ea0eb3c665091 SHA256 b23f08878558e560cd2f50bfa2eb8994a7c849c8e12de536ab97823ede662d07 size 201527
-DIST baselayout-vserver-1.12.0_pre18.tar.bz2 198468 RMD160 9366ff3d932f483cdf16457e270ec7f2e8085fe4 SHA256 a78a476dbfc3a6131016351006f455fb62a0d0eee9330e8253a3dcf261c41fd5 size 198468
-DIST rc-scripts-vserver-1.6.14.tar.bz2 142704 RMD160 d4b7002d153116d6bdfb7ae4a1c9828d2f5b2eff SHA256 0c89d5c8ac7fc9d202f20b1494e8e237e37ef11cfa73cc39f5090b2055701406 size 142704
-EBUILD baselayout-vserver-1.11.14-r4.ebuild 15955 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a SHA1 c997585cdb3270e49ea96bd195f750c3c4805189 SHA256 9b42983666cdf06837bb7ecb53f8bb3b85ab7efc039d23b4974c778e9380384e size 15955
+DIST baselayout-vserver-1.12.0.tar.bz2 198921 RMD160 6ee487c9bb5c06c243fd6f92492834821c242710 SHA1 d87d976db04eab10a0b18c676b94931c3f6490a9 SHA256 159b943669338ee122f196f51c121b1d1557187660342ed2c6d6171b1f3eb894
+DIST rc-scripts-vserver-1.6.14.tar.bz2 142704 RMD160 d4b7002d153116d6bdfb7ae4a1c9828d2f5b2eff SHA1 e238ee8feb4d8bdc4425fba6d2d2b9e0abd9b7f1 SHA256 0c89d5c8ac7fc9d202f20b1494e8e237e37ef11cfa73cc39f5090b2055701406
+EBUILD baselayout-vserver-1.11.14-r4.ebuild 15955 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a SHA1 c997585cdb3270e49ea96bd195f750c3c4805189 SHA256 9b42983666cdf06837bb7ecb53f8bb3b85ab7efc039d23b4974c778e9380384e
 MD5 6f0c19788c06583d952eb0a384ab105a baselayout-vserver-1.11.14-r4.ebuild 15955
 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a baselayout-vserver-1.11.14-r4.ebuild 15955
 SHA256 9b42983666cdf06837bb7ecb53f8bb3b85ab7efc039d23b4974c778e9380384e baselayout-vserver-1.11.14-r4.ebuild 15955
-EBUILD baselayout-vserver-1.11.14-r5.ebuild 13726 RMD160 e725ef7f0fd458513edc897ee84d292d53a36617 SHA1 bf503de6ef56d41a178981fe0ae86c00794a86fc SHA256 7925681cead66d2d3cf296f02706108e87298abe9c52d4fd117d005630dffe9a size 13726
+EBUILD baselayout-vserver-1.11.14-r5.ebuild 13726 RMD160 e725ef7f0fd458513edc897ee84d292d53a36617 SHA1 bf503de6ef56d41a178981fe0ae86c00794a86fc SHA256 7925681cead66d2d3cf296f02706108e87298abe9c52d4fd117d005630dffe9a
 MD5 d9e93a9f8242d01b3d363e3d3adbe5c9 baselayout-vserver-1.11.14-r5.ebuild 13726
 RMD160 e725ef7f0fd458513edc897ee84d292d53a36617 baselayout-vserver-1.11.14-r5.ebuild 13726
 SHA256 7925681cead66d2d3cf296f02706108e87298abe9c52d4fd117d005630dffe9a baselayout-vserver-1.11.14-r5.ebuild 13726
-EBUILD baselayout-vserver-1.12.0_pre17.ebuild 13632 RMD160 4b1338dfc1ee8acdbbe7744cff442814c3e28434 SHA1 69d9de146068488726c9acb28271929921c0da5e SHA256 407f359ef068e20e4fee148b8b86d412928c69292bb9018fdc1549a237e2cbc4 size 13632
-MD5 ce60032846eef2aac8b43c3e31707799 baselayout-vserver-1.12.0_pre17.ebuild 13632
-RMD160 4b1338dfc1ee8acdbbe7744cff442814c3e28434 baselayout-vserver-1.12.0_pre17.ebuild 13632
-SHA256 407f359ef068e20e4fee148b8b86d412928c69292bb9018fdc1549a237e2cbc4 baselayout-vserver-1.12.0_pre17.ebuild 13632
-EBUILD baselayout-vserver-1.12.0_pre18.ebuild 13632 RMD160 3b42fab8bfe5d4324047218511a95e7434b9a8ee SHA1 13b8990c8b7bdef3252667e73a0c046e8892ac60 SHA256 9e52aa062a41a1598de9a12c0be765d4e763a0f6649814e99d492c8f0929390e size 13632
-MD5 7e2b460b86a0a44bc45dd3793fcc58cd baselayout-vserver-1.12.0_pre18.ebuild 13632
-RMD160 3b42fab8bfe5d4324047218511a95e7434b9a8ee baselayout-vserver-1.12.0_pre18.ebuild 13632
-SHA256 9e52aa062a41a1598de9a12c0be765d4e763a0f6649814e99d492c8f0929390e baselayout-vserver-1.12.0_pre18.ebuild 13632
-MISC ChangeLog 7531 RMD160 790ff35f4c44ff0faecd54cb75c3047ee4e6ccbe SHA1 79cf2da1b37d9c2e40754f1a274dba906308da55 SHA256 7891dd7cca5a8fd0db5fdad34f400ff3354066d08881366397014b1adc4805a1 size 7531
-MD5 5c482039d83f3e46e192045839d7334d ChangeLog 7531
-RMD160 790ff35f4c44ff0faecd54cb75c3047ee4e6ccbe ChangeLog 7531
-SHA256 7891dd7cca5a8fd0db5fdad34f400ff3354066d08881366397014b1adc4805a1 ChangeLog 7531
-MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 size 231
+EBUILD baselayout-vserver-1.12.0.ebuild 13540 RMD160 4d5c2104eaab1d74a316ff3c07c61660151cf810 SHA1 67c92ee24903baad161d84dd04d538450573fac7 SHA256 7c30a53ac671169e6fec5f296daf7b14a67bf089066e16a0f604011658207025
+MD5 2f6a966452603d89eb4c86fb64162724 baselayout-vserver-1.12.0.ebuild 13540
+RMD160 4d5c2104eaab1d74a316ff3c07c61660151cf810 baselayout-vserver-1.12.0.ebuild 13540
+SHA256 7c30a53ac671169e6fec5f296daf7b14a67bf089066e16a0f604011658207025 baselayout-vserver-1.12.0.ebuild 13540
+MISC ChangeLog 7819 RMD160 bcff44ae04f0fbd3690f3dc0f4d03a0997ca7a24 SHA1 e7a67b2f195942a2069c2242560bdf8a8c315325 SHA256 fd630e138369ad40f463433d4efd063df8b42210494e7b5b192dc312b117d686
+MD5 058fb9fc580df3cf6bb94072362405e1 ChangeLog 7819
+RMD160 bcff44ae04f0fbd3690f3dc0f4d03a0997ca7a24 ChangeLog 7819
+SHA256 fd630e138369ad40f463433d4efd063df8b42210494e7b5b192dc312b117d686 ChangeLog 7819
+MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata.xml 231
@@ -70,16 +65,13 @@ SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/di
 MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r5 280
 RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r5 280
 SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r5 280
-MD5 ea2d093be38643c2c04797e3210445cf files/digest-baselayout-vserver-1.12.0_pre17 298
-RMD160 851ebab3604a459a88b814faea3250cb2ba6f742 files/digest-baselayout-vserver-1.12.0_pre17 298
-SHA256 2dad0239d52c2f23e573968ce518ebdac2c24563942b8865e377978c4389f3d6 files/digest-baselayout-vserver-1.12.0_pre17 298
-MD5 2a7491abeb73c265aa8bf19866d63d47 files/digest-baselayout-vserver-1.12.0_pre18 298
-RMD160 601af1c78c5a1a523cfc3bd58e0572ba13d40b43 files/digest-baselayout-vserver-1.12.0_pre18 298
-SHA256 b7903c3a25269b6346a4b87f8396c77e4e8781bbeb76acb39a5d7ef9f3f11dc4 files/digest-baselayout-vserver-1.12.0_pre18 298
+MD5 dbf5eeab51d2673430071a218c4673ea files/digest-baselayout-vserver-1.12.0 280
+RMD160 aa198cd13f3d1bd1295a685f677fae46304f4c0b files/digest-baselayout-vserver-1.12.0 280
+SHA256 4ea03fb2bca0b1a077641c7f52f5b3324a684caac22763c6bfbda0e763b3231f files/digest-baselayout-vserver-1.12.0 280
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV3NGflZ8QqxhrsMRAmo0AJ98w2JCeuh6VWOau/l+Am7bnpNdyQCfR4Ti
-XF017rbEVYWXIL9CUzkf8EA=
-=ovcJ
+iD8DBQFEdKfvflZ8QqxhrsMRAk3LAJ9fiKQrWk7hxAJiZa8X0Hhx74FQVgCeOnPA
+urgMtWrK8LzrfB4ag4rSdlU=
+=HX2N
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre17.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre17.ebuild
deleted file mode 100644
index ee2be9c05f19..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre17.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre17.ebuild,v 1.1 2006/04/08 16:44:36 phreak 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="~amd64 ~x86"
-IUSE="bootstrap build static"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND=">=sys-apps/sysvinit-2.86-r3
-	!build? ( !bootstrap? (
-		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.1_p7
-		>=sys-apps/coreutils-5.2.1
-	) )"
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Use correct path to filefuncs.so on multilib systems
-	sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
-		${S}/src/awk/{cachedepends,genenviron}.awk || die
-}
-
-src_compile() {
-	local libdir="lib"
-
-	use static && append-ldflags -static
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || die
-}
-
-# This is a temporary workaround until bug 9849 is completely solved
-# in portage.  We need to create the directories so they're available
-# during src_install, but when src_install is finished, call unkdir
-# to remove any empty directories instead of leaving them around.
-kdir() {
-	typeset -a args
-	typeset d
-
-	# Create the directories for the remainder of src_install, and
-	# remember how to create the directories later.
-	for d in "$@"; do
-		if [[ $d == /* ]]; then
-			install -d "${args[@]}" "${D}/${d}"
-			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-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
-
-	# 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...
-
-	# <hollow@gentoo.org> We don't support old things anyway
-	rcscripts_dir="/lib/rcscripts"
-
-	einfo "Creating directories..."
-	kdir /usr
-	kdir /usr/local
-	kdir /dev
-	kdir /dev/pts
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	kdir /etc/opt
-	kdir /home
-	kdir ${rcscripts_dir}
-	kdir ${rcscripts_dir}/awk
-	kdir ${rcscripts_dir}/sh
-	kdir ${rcscripts_dir}/net.modules.d
-	kdir ${rcscripts_dir}/net.modules.d/helpers.d
-	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
-	# <hollow@gentoo.org> We provide our own though...
-	#rm -f "${D}"/etc/inittab
-
-	# Stash the rc-lists for use during pkg_postinst
-	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${PV}" > ${D}/etc/gentoo-release
-
-	#
-	# Setup files related to /dev
-	#
-	into /
-	dosbin "${S}"/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	dosym ../sbin/MAKEDEV /dev/MAKEDEV
-
-	#
-	# Setup files in /bin
-	#
-	cd "${S}"/bin
-	dobin rc-status
-
-	#
-	# Setup files in /sbin
-	#
-	cd "${S}"/sbin
-	into /
-	dosbin rc rc-update
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	#
-	# Setup files in /lib/rcscripts
-	# These are support files for other things in baselayout that needn't be
-	# under CONFIG_PROTECTed /etc
-	#
-	cd "${S}"/sbin
-	exeinto ${rcscripts_dir}/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if ! use build; then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		cd "${S}"/sbin
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto ${rcscripts_dir}/awk
-		doins "${S}"/src/awk/*.awk
-	fi
-
-	# 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.modules.d ${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}" 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.
-	if use build || use bootstrap; then
-		cd ${D}/dev || die
-		ebegin "Populating /dev with safe device nodes..."
-		MAKEDEV generic-vserver
-		eend $? || die
-	fi
-
-	# Hack to fix bug 9849, continued in pkg_postinst
-	unkdir
-}
-
-pkg_postinst() {
-	local x y
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files."
-	einfo "Some of these might fail if they're read-only mounted"
-	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source "${ROOT}"/usr/share/baselayout/mkdirs.sh
-	source "${ROOT}"/usr/share/baselayout/mklinks.sh
-
-	# Set up default runlevel symlinks
-	# This used to be done in src_install but required knowledge of ${ROOT},
-	# which meant that it was effectively broken for binary installs.
-	if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then
-		for x in boot default; do
-			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p "${ROOT}"/etc/runlevels/${x}
-			for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
-				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
-					ewarn "init.d/${y} not found -- ignoring"
-				else
-					ln -sfn /etc/init.d/${y} \
-						"${ROOT}"/etc/runlevels/${x}/${y}
-				fi
-			done
-		done
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly...  see src_install() for why they
-	# are in /usr/share/baselayout/
-	for x in passwd shadow group ; do
-		if [[ -e ${ROOT}/etc/${x} ]] ; then
-			touch "${ROOT}/etc/${x}"
-		else
-			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
-		fi
-	done
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh --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
-
-	if [[ -e ${ROOT}/etc/env.d/01hostname ]] ; then
-		rm -f ${ROOT}/etc/env.d/01hostname
-	fi
-}
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre18.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre18.ebuild
deleted file mode 100644
index 5ebaee5ea8aa..000000000000
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre18.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.12.0_pre18.ebuild,v 1.1 2006/05/02 14:48:55 phreak 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="~amd64 ~x86"
-IUSE="bootstrap build static"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND=">=sys-apps/sysvinit-2.86-r3
-	!build? ( !bootstrap? (
-		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.1_p7
-		>=sys-apps/coreutils-5.2.1
-	) )"
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Use correct path to filefuncs.so on multilib systems
-	sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
-		${S}/src/awk/{cachedepends,genenviron}.awk || die
-}
-
-src_compile() {
-	local libdir="lib"
-
-	use static && append-ldflags -static
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	make -C "${S}"/src \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LIBDIR="${libdir}" || die
-}
-
-# This is a temporary workaround until bug 9849 is completely solved
-# in portage.  We need to create the directories so they're available
-# during src_install, but when src_install is finished, call unkdir
-# to remove any empty directories instead of leaving them around.
-kdir() {
-	typeset -a args
-	typeset d
-
-	# Create the directories for the remainder of src_install, and
-	# remember how to create the directories later.
-	for d in "$@"; do
-		if [[ $d == /* ]]; then
-			install -d "${args[@]}" "${D}/${d}"
-			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-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
-
-	# 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...
-
-	# <hollow@gentoo.org> We don't support old things anyway
-	rcscripts_dir="/lib/rcscripts"
-
-	einfo "Creating directories..."
-	kdir /usr
-	kdir /usr/local
-	kdir /dev
-	kdir /dev/pts
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	kdir /etc/opt
-	kdir /home
-	kdir ${rcscripts_dir}
-	kdir ${rcscripts_dir}/awk
-	kdir ${rcscripts_dir}/sh
-	kdir ${rcscripts_dir}/net.modules.d
-	kdir ${rcscripts_dir}/net.modules.d/helpers.d
-	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
-	# <hollow@gentoo.org> We provide our own though...
-	#rm -f "${D}"/etc/inittab
-
-	# Stash the rc-lists for use during pkg_postinst
-	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${PV}" > ${D}/etc/gentoo-release
-
-	#
-	# Setup files related to /dev
-	#
-	into /
-	dosbin "${S}"/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	dosym ../sbin/MAKEDEV /dev/MAKEDEV
-
-	#
-	# Setup files in /bin
-	#
-	cd "${S}"/bin
-	dobin rc-status
-
-	#
-	# Setup files in /sbin
-	#
-	cd "${S}"/sbin
-	into /
-	dosbin rc rc-update
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	#
-	# Setup files in /lib/rcscripts
-	# These are support files for other things in baselayout that needn't be
-	# under CONFIG_PROTECTed /etc
-	#
-	cd "${S}"/sbin
-	exeinto ${rcscripts_dir}/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if ! use build; then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		cd "${S}"/sbin
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto ${rcscripts_dir}/awk
-		doins "${S}"/src/awk/*.awk
-	fi
-
-	# 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.modules.d ${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}" 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.
-	if use build || use bootstrap; then
-		cd ${D}/dev || die
-		ebegin "Populating /dev with safe device nodes..."
-		MAKEDEV generic-vserver
-		eend $? || die
-	fi
-
-	# Hack to fix bug 9849, continued in pkg_postinst
-	unkdir
-}
-
-pkg_postinst() {
-	local x y
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files."
-	einfo "Some of these might fail if they're read-only mounted"
-	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source "${ROOT}"/usr/share/baselayout/mkdirs.sh
-	source "${ROOT}"/usr/share/baselayout/mklinks.sh
-
-	# Set up default runlevel symlinks
-	# This used to be done in src_install but required knowledge of ${ROOT},
-	# which meant that it was effectively broken for binary installs.
-	if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then
-		for x in boot default; do
-			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p "${ROOT}"/etc/runlevels/${x}
-			for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
-				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
-					ewarn "init.d/${y} not found -- ignoring"
-				else
-					ln -sfn /etc/init.d/${y} \
-						"${ROOT}"/etc/runlevels/${x}/${y}
-				fi
-			done
-		done
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly...  see src_install() for why they
-	# are in /usr/share/baselayout/
-	for x in passwd shadow group ; do
-		if [[ -e ${ROOT}/etc/${x} ]] ; then
-			touch "${ROOT}/etc/${x}"
-		else
-			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
-		fi
-	done
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh --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
-
-	if [[ -e ${ROOT}/etc/env.d/01hostname ]] ; then
-		rm -f ${ROOT}/etc/env.d/01hostname
-	fi
-}
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre17 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre17
deleted file mode 100644
index ec5643f38804..000000000000
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4760e22f29fc749f65b4277b2244f5ab baselayout-vserver-1.12.0_pre17.tar.bz2 201527
-RMD160 71b9da4ea22cc11857b1965b831ea0eb3c665091 baselayout-vserver-1.12.0_pre17.tar.bz2 201527
-SHA256 b23f08878558e560cd2f50bfa2eb8994a7c849c8e12de536ab97823ede662d07 baselayout-vserver-1.12.0_pre17.tar.bz2 201527
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre18 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre18
deleted file mode 100644
index d2a8f8b63586..000000000000
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.12.0_pre18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7b61a2d126c1d7ccfe22f97dc72103b7 baselayout-vserver-1.12.0_pre18.tar.bz2 198468
-RMD160 9366ff3d932f483cdf16457e270ec7f2e8085fe4 baselayout-vserver-1.12.0_pre18.tar.bz2 198468
-SHA256 a78a476dbfc3a6131016351006f455fb62a0d0eee9330e8253a3dcf261c41fd5 baselayout-vserver-1.12.0_pre18.tar.bz2 198468