Punt old versions

Package-Manager: portage-2.1.3.7

15 files changed, 0 insertions, 1768 deletions

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 76aa3ca12ef6..6085d8ee7544 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -18,24 +18,12 @@ AUX baselayout-1.12.9-wireless-deprecate.patch 664 RMD160 9bcd7f2b7e0f104e3345cc
 MD5 65436e2104eb96e5153bac819bbe4f11 files/baselayout-1.12.9-wireless-deprecate.patch 664
 RMD160 9bcd7f2b7e0f104e3345cc018b3f0861e3c69c8d files/baselayout-1.12.9-wireless-deprecate.patch 664
 SHA256 2ebf280db2954783a55f1045cf5f9b2100dd257f7b34d0ad5664bc1ee286886e files/baselayout-1.12.9-wireless-deprecate.patch 664
-AUX baselayout-2.0.0_rc2-console.patch 896 RMD160 29b2deed1c178b9cbad14ec5947c268e663beb91 SHA1 41555bcbcc21fa860bba26df8da6372cb4c11984 SHA256 83a3b09658b6e54925e3643f8e698c5dcffc791d717a96a23c9bf80770e0aa76
-MD5 7ba791fea4e489de86033ea9c62c62b0 files/baselayout-2.0.0_rc2-console.patch 896
-RMD160 29b2deed1c178b9cbad14ec5947c268e663beb91 files/baselayout-2.0.0_rc2-console.patch 896
-SHA256 83a3b09658b6e54925e3643f8e698c5dcffc791d717a96a23c9bf80770e0aa76 files/baselayout-2.0.0_rc2-console.patch 896
-AUX baselayout-2.0.0_rc3-ppp.patch 387 RMD160 4d94a4fcbda6c4a59f2cf1351c09601902de64f5 SHA1 88260e685ba29c74ee7f4f6cbef69ecc836850a2 SHA256 fefc7258d06fe4a32059c2ddba99f68eb8137021e0fe14522c799c2cbd60deb0
-MD5 1236c860ba98193591ba2e5a9c9bd228 files/baselayout-2.0.0_rc3-ppp.patch 387
-RMD160 4d94a4fcbda6c4a59f2cf1351c09601902de64f5 files/baselayout-2.0.0_rc3-ppp.patch 387
-SHA256 fefc7258d06fe4a32059c2ddba99f68eb8137021e0fe14522c799c2cbd60deb0 files/baselayout-2.0.0_rc3-ppp.patch 387
 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-1.12.10.tar.bz2 218940 RMD160 e499c08af4d73d43c2e354febbf09e48916ac24c SHA1 306090e733eaf059d0849291d6327f7ea9bae5cc SHA256 1d64cdb9cc42bca7a8eec4045ad0e7e8cafba1d6c3f92b377bc7f6f7ee668674
 DIST baselayout-1.12.9.tar.bz2 218939 RMD160 c80a3e4434bd8ce58c89ab1b988b64c012741d00 SHA1 0e5745d95412db3427961c5f796827f7867aa35b SHA256 ab89a131d0a12fa8b411189fb51b15216c3f27a422ff539767eb0d134e40dd94
-DIST baselayout-2.0.0_alpha4.tar.bz2 135316 RMD160 9404971a51dcc83f8f7da153908e0cc414b6e9eb SHA1 af5db75479dc8fdfca07b60342d78ecdea80bc34 SHA256 eb54db160380f65d2986bc80165c45859eee4f58bbe694fd093a7c5fdd91359b
-DIST baselayout-2.0.0_rc1.tar.bz2 136379 RMD160 03b39a777d59009766374f80062c8766105743b6 SHA1 f26c39e0c6cb1ab9649ea0d1a5841bf8b9d2de70 SHA256 d46d4d635f8ef14028deb4cafa543988fce336c19cddc449debfd969b731d07a
-DIST baselayout-2.0.0_rc2.tar.bz2 135882 RMD160 8d8e6f457c522803406f29df71db4dfd63635a95 SHA1 edc86306ff1b73d2ad17f3003161ca65226bd304 SHA256 f65e245d47bad75949e0edfa9c4b0a0992aa43f9e0cd572146c48a3c1f47138d
-DIST baselayout-2.0.0_rc3.tar.bz2 136734 RMD160 d1b1c78197a8e429e369628ef72aef3bc444f7ab SHA1 8278b7206650678714b13915ec847e801ad3282d SHA256 36dd8065b09f34b91a7ff9b90baa4c98e9f3480d261a81dacf5495c5c58751ed
 DIST baselayout-2.0.0_rc4.tar.bz2 137154 RMD160 d257f6a6340ea46f56e3e975b096e9a2133ba27b SHA1 8f73a0ccb17bba13be8408f0803260cda376025c SHA256 2c00b8141d6188eec223484453508efceb12afa3a1427994ca823eb594746a92
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
 EBUILD baselayout-1.11.15-r3.ebuild 18811 RMD160 53374dd4f21d0cec96852c5a346a5f791ad9e3a8 SHA1 722ec91ba2dbe8b80d5c1194d779e1d3450dc7d9 SHA256 427b2761578b65293daa82a81d8a4163c8ab11b540df2cd5f98f397f1b864b49
@@ -54,30 +42,6 @@ EBUILD baselayout-1.12.9-r2.ebuild 18710 RMD160 7879bfd15fe63fd128517cbfef988e66
 MD5 d84c12175eb5e6ac9e86001cb5e21991 baselayout-1.12.9-r2.ebuild 18710
 RMD160 7879bfd15fe63fd128517cbfef988e66f4d8b6e8 baselayout-1.12.9-r2.ebuild 18710
 SHA256 4d2bfc07cf36f7282996cf109ede3e145f2f5365ed1ba3db446180411c9ac54b baselayout-1.12.9-r2.ebuild 18710
-EBUILD baselayout-2.0.0_alpha4.ebuild 9634 RMD160 f6f295ee7924184f7917dfea39d32dbfe17d400f SHA1 95630043b80b139a81f86b498ed362a8b18167dd SHA256 2be58c10a90a9916bb1aa4080ff36851c6f60aa57d9b3a9d4f5d4d686e7a23a3
-MD5 af0066ef7238a39ccfc878d10696a443 baselayout-2.0.0_alpha4.ebuild 9634
-RMD160 f6f295ee7924184f7917dfea39d32dbfe17d400f baselayout-2.0.0_alpha4.ebuild 9634
-SHA256 2be58c10a90a9916bb1aa4080ff36851c6f60aa57d9b3a9d4f5d4d686e7a23a3 baselayout-2.0.0_alpha4.ebuild 9634
-EBUILD baselayout-2.0.0_rc1.ebuild 9582 RMD160 f771870dc060617a1a182a890d0502799ab554f1 SHA1 76e0b75aa9fcfc2ea2b4068b97c21a8f1cf7801c SHA256 593e4ed3236181f01a1fcc3633d5613cb92b03aa42827ef61d526bd24621747b
-MD5 c102b8914f2767853b22e80ce8eb8285 baselayout-2.0.0_rc1.ebuild 9582
-RMD160 f771870dc060617a1a182a890d0502799ab554f1 baselayout-2.0.0_rc1.ebuild 9582
-SHA256 593e4ed3236181f01a1fcc3633d5613cb92b03aa42827ef61d526bd24621747b baselayout-2.0.0_rc1.ebuild 9582
-EBUILD baselayout-2.0.0_rc2-r1.ebuild 9455 RMD160 ac4b2c37478d8289983f228036acc463a36a1af3 SHA1 05794f640c1d814f39adda0cacdf22b220f9b81a SHA256 b5b6a6e900e3c878b656956b3a5de3ea6974c086324c7aa2aa3ad563f8c5654b
-MD5 8172c981cb43aec5b1cfc0ab9a7744de baselayout-2.0.0_rc2-r1.ebuild 9455
-RMD160 ac4b2c37478d8289983f228036acc463a36a1af3 baselayout-2.0.0_rc2-r1.ebuild 9455
-SHA256 b5b6a6e900e3c878b656956b3a5de3ea6974c086324c7aa2aa3ad563f8c5654b baselayout-2.0.0_rc2-r1.ebuild 9455
-EBUILD baselayout-2.0.0_rc2.ebuild 9584 RMD160 3cb00c0b9cd094a3ef38a958892ea7d813efb824 SHA1 ab807272d9f0915ebde6ea53a873bf72fc7f27e4 SHA256 f0e8f40884932a0e9bf2519073585c84454fcccf617e4193a1d673de105602b1
-MD5 6c0b7287b0b31255ea79bca9efa40e41 baselayout-2.0.0_rc2.ebuild 9584
-RMD160 3cb00c0b9cd094a3ef38a958892ea7d813efb824 baselayout-2.0.0_rc2.ebuild 9584
-SHA256 f0e8f40884932a0e9bf2519073585c84454fcccf617e4193a1d673de105602b1 baselayout-2.0.0_rc2.ebuild 9584
-EBUILD baselayout-2.0.0_rc3-r1.ebuild 9469 RMD160 9fd60c4a68eff01f05d3812b15ae1d05c2b1b548 SHA1 4d93d9b2a5b37a96d34ff11b731cca5f77def132 SHA256 2c70edbcccffe765a3ea48507efc6ce2dcef427dfd23186bd6e5aaff2acbb7d2
-MD5 ea465768a015e1e786b65d3a9773052c baselayout-2.0.0_rc3-r1.ebuild 9469
-RMD160 9fd60c4a68eff01f05d3812b15ae1d05c2b1b548 baselayout-2.0.0_rc3-r1.ebuild 9469
-SHA256 2c70edbcccffe765a3ea48507efc6ce2dcef427dfd23186bd6e5aaff2acbb7d2 baselayout-2.0.0_rc3-r1.ebuild 9469
-EBUILD baselayout-2.0.0_rc3.ebuild 9416 RMD160 39f86f42a6db64743a616e1f11904646d2262bc6 SHA1 e6e5048f46fc6bc1d3d5b575e9db6094791d59e6 SHA256 cefa3e39f5de82411a52993eb46e1e43753eb5bb9236ed352a9fdfbaf6ae30e0
-MD5 2b5ecbafd96c10f639ed751c6223f248 baselayout-2.0.0_rc3.ebuild 9416
-RMD160 39f86f42a6db64743a616e1f11904646d2262bc6 baselayout-2.0.0_rc3.ebuild 9416
-SHA256 cefa3e39f5de82411a52993eb46e1e43753eb5bb9236ed352a9fdfbaf6ae30e0 baselayout-2.0.0_rc3.ebuild 9416
 EBUILD baselayout-2.0.0_rc4.ebuild 9429 RMD160 02831d6ab4bf219cde2b3ae0ddca60be7be0555c SHA1 ca8b9322fc6058f5bc4b5f21deeff90f2f647cbe SHA256 cf636dcc354e5441a5177d22cdb75506da85a19e95fe4a0199384381e31a5c40
 MD5 e75516cf74b7293aca1b250ca3f678de baselayout-2.0.0_rc4.ebuild 9429
 RMD160 02831d6ab4bf219cde2b3ae0ddca60be7be0555c baselayout-2.0.0_rc4.ebuild 9429
@@ -102,24 +66,6 @@ SHA256 fc42fbfcf2988b6545dc38fd1f31ea5d21da6a25c8bb68ec6cb9c8100a639993 files/di
 MD5 0739a7f44d72e74a1f977dcd81030c18 files/digest-baselayout-1.12.9-r2 256
 RMD160 0aaebaf00ed5d13cb4eaeb420ac7859ccc666503 files/digest-baselayout-1.12.9-r2 256
 SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/digest-baselayout-1.12.9-r2 256
-MD5 8d208679a6932a9800e5f02a6cfff101 files/digest-baselayout-2.0.0_alpha4 274
-RMD160 0eb4c4400e8441f25c1d45df91649b83b41d9323 files/digest-baselayout-2.0.0_alpha4 274
-SHA256 bea07cd22ff04224be86785c762617e491ea569bb6fca339a0aa7311ea20ec15 files/digest-baselayout-2.0.0_alpha4 274
-MD5 cc3a02735c354ff9efe764cef393fb83 files/digest-baselayout-2.0.0_rc1 265
-RMD160 623dfebcc1c5bf519c74501346ad757c42dc40a6 files/digest-baselayout-2.0.0_rc1 265
-SHA256 f8a9a22ef18d182a6cd85731438885221920982d60af9f928b34307f971f9375 files/digest-baselayout-2.0.0_rc1 265
-MD5 29f7289af6187a5d7047b5aaab722779 files/digest-baselayout-2.0.0_rc2 265
-RMD160 62082426e4f5cd389121f376b9654d9556d08d09 files/digest-baselayout-2.0.0_rc2 265
-SHA256 e898bece87591c6ce27963629c112a9f359225f6d1fea3b71a60a995037a128c files/digest-baselayout-2.0.0_rc2 265
-MD5 29f7289af6187a5d7047b5aaab722779 files/digest-baselayout-2.0.0_rc2-r1 265
-RMD160 62082426e4f5cd389121f376b9654d9556d08d09 files/digest-baselayout-2.0.0_rc2-r1 265
-SHA256 e898bece87591c6ce27963629c112a9f359225f6d1fea3b71a60a995037a128c files/digest-baselayout-2.0.0_rc2-r1 265
-MD5 c439f8e64ba84f87850a0558be731d05 files/digest-baselayout-2.0.0_rc3 265
-RMD160 23afe8848ca500bac755c1d4774ae71d815e9472 files/digest-baselayout-2.0.0_rc3 265
-SHA256 d93a71d08f004198383da6a900d7334d8e9e30ec6c49991954fddd9a3825f646 files/digest-baselayout-2.0.0_rc3 265
-MD5 c439f8e64ba84f87850a0558be731d05 files/digest-baselayout-2.0.0_rc3-r1 265
-RMD160 23afe8848ca500bac755c1d4774ae71d815e9472 files/digest-baselayout-2.0.0_rc3-r1 265
-SHA256 d93a71d08f004198383da6a900d7334d8e9e30ec6c49991954fddd9a3825f646 files/digest-baselayout-2.0.0_rc3-r1 265
 MD5 f1d98e9596ba0fa2c88bc6c2b5d9d3a5 files/digest-baselayout-2.0.0_rc4 265
 RMD160 285c61e9e4a33c9b6fa99e53f003466825089553 files/digest-baselayout-2.0.0_rc4 265
 SHA256 d7e42ef1e4435ac575689e2fdb8297b6b826db53b560818caec86520cc9912d7 files/digest-baselayout-2.0.0_rc4 265
diff --git a/sys-apps/baselayout/baselayout-2.0.0_alpha4.ebuild b/sys-apps/baselayout/baselayout-2.0.0_alpha4.ebuild
deleted file mode 100644
index 38578ca2d4ea..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.0_alpha4.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_alpha4.ebuild,v 1.1 2007/07/12 08:40:51 uberlord Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
-		!build? (
-			!bootstrap? (
-				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
-				kernel_FreeBSD? ( sys-process/fuser-bsd )
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-PDEPEND="virtual/init
-	!build? ( !bootstrap? (
-		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
-	) )"
-
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Setup unicode defaults for silly unicode users
-	if use unicode ; then
-		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
-	fi
-
-	# SPARC does not like stty, so we disable RC_INTERACTIVE which requires it
-	# see Gentoo bug #104067.
-	if use sparc ; then \
-		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
-	fi
-}
-
-make_opts() {
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-	local opts="${opts} LIB=${libdir}"
-
-	if use kernel_linux ; then
-		opts="${opts} OS=Linux"
-	else
-		opts="${opts} OS=BSD"
-	fi
-	use pam && opts="${opts} HAVE_PAM=1"
-
-	echo "${opts}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
-}
-
-# Support function for remapping old wireless dns vars
-remap_dns_vars() {
-	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; 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/$1" > "${D}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	if use build || use bootstrap ; then
-		local libdirs="$(get_all_libdirs)" dir=
-		# Create our multilib dirs - the Makefile has no knowledge of this
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			mkdir -p "${ROOT}${dir}"
-			touch "${ROOT}${dir}"/.keep
-			mkdir -p "${ROOT}usr/${dir}"
-			touch "${ROOT}usr/${dir}"/.keep
-			mkdir -p "${ROOT}usr/local/${dir}"
-			touch "${ROOT}usr/local/${dir}"/.keep
-		done
-
-		# Ugly compatibility with stupid ebuilds and old profiles symlinks
-		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
-			ln -s "${lib}" "${ROOT}lib"
-			ln -s "${lib}" "${ROOT}usr/lib"
-			ln -s "${lib}" "${ROOT}usr/local/lib"
-		fi
-
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
-	fi
-
-	# 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
-}
-
-src_install() {
-	make $(make_opts) DESTDIR="${D}" install
-	dodoc ChangeLog COPYRIGHT
-
-	# Should this belong in another ebuild? Like say binutils?
-	# 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
-		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		done
-
-		# 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
-		doenvd "${T}"/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
-
-	# Remove the installed runlevels, as we don't know about $ROOT yet
-	rm -rf "${D}/etc/runlevels"
-
-	# Copy the make files to /usr/share/baselayout so we can re-use them in
-	# postinst, otherwise binpkg will break.
-	insinto /usr/share/baselayout
-	doins -r Makefile default.mk runlevels*
-}
-
-pkg_postinst() {
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
-	fi
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[[ -e "${ROOT}etc/${x}" ]] && continue
-		[[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue
-		cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc
-	done
-
-	# We need to copy svcdir if upgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
-		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
-		rm -rf "${ROOT}"lib/rcscripts/init.d/daemons
-		umount "${ROOT}${svcdir}" 2>/dev/null
-		rm -rf "${ROOT}${svcdir}"
-		)
-	elif has_version "<sys-apps/${PN}-2.0.0_alpha" ; then
-		# The format has changed since 1.13
-		rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console}
-	fi
-
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		/$(get_libdir)/rcscripts/bin/rc-depend --update
-	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 release ${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"
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
-		echo
-		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
-		einfo "They need to be converted to symlinks to ${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 '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
-		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 deprecated 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'"
-	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 "that no longer work"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example"
-	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/{conf.d,init.d}/domainname \
-			"${ROOT}"/etc/runlevels/*/domainname
-		echo
-		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
-}
-
-# Handle our downgraders
-# We should remove this when <1.13 has been removed from the tree
-pkg_postrm() {
-	# Remove dir if downgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
-		mkdir -p "${ROOT}${svcdir}"
-		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
-		rm -rf "${ROOT}${svcdir}"/daemons
-		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
-		rm -rf "${ROOT}lib/rcscripts/init.d"
-		)
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc1.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc1.ebuild
deleted file mode 100644
index 03e250305ada..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.0_rc1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc1.ebuild,v 1.4 2007/08/03 19:27:05 cardoe Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
-		!build? (
-			!bootstrap? (
-				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
-				kernel_FreeBSD? ( sys-process/fuser-bsd )
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-PDEPEND="virtual/init
-	!build? ( !bootstrap? (
-		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
-	) )"
-
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Setup unicode defaults for silly unicode users
-	if use unicode ; then
-		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
-	fi
-
-	# SPARC does not like stty, so we disable RC_INTERACTIVE which requires it
-	# see Gentoo bug #104067.
-	if use sparc ; then \
-		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
-	fi
-}
-
-make_opts() {
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-	local opts="${opts} LIB=${libdir}"
-
-	if use kernel_linux ; then
-		opts="${opts} OS=Linux"
-	else
-		opts="${opts} OS=BSD"
-	fi
-	use pam && opts="${opts} HAVE_PAM=1"
-
-	echo "${opts}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
-}
-
-# Support function for remapping old wireless dns vars
-remap_dns_vars() {
-	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; 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/$1" > "${D}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	if use build || use bootstrap ; then
-		local libdirs="$(get_all_libdirs)" dir=
-		# Create our multilib dirs - the Makefile has no knowledge of this
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			mkdir -p "${ROOT}${dir}"
-			touch "${ROOT}${dir}"/.keep
-			mkdir -p "${ROOT}usr/${dir}"
-			touch "${ROOT}usr/${dir}"/.keep
-			mkdir -p "${ROOT}usr/local/${dir}"
-			touch "${ROOT}usr/local/${dir}"/.keep
-		done
-
-		# Ugly compatibility with stupid ebuilds and old profiles symlinks
-		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
-			ln -s "${lib}" "${ROOT}lib"
-			ln -s "${lib}" "${ROOT}usr/lib"
-			ln -s "${lib}" "${ROOT}usr/local/lib"
-		fi
-
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
-	fi
-
-	# 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
-}
-
-src_install() {
-	make $(make_opts) DESTDIR="${D}" install
-	dodoc ChangeLog COPYRIGHT
-
-	# Should this belong in another ebuild? Like say binutils?
-	# 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
-		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		done
-
-		# 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
-		doenvd "${T}"/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
-
-	# Remove the installed runlevels, as we don't know about $ROOT yet
-	rm -rf "${D}/etc/runlevels"
-
-	# Copy the make files to /usr/share/baselayout so we can re-use them in
-	# postinst, otherwise binpkg will break.
-	insinto /usr/share/baselayout
-	doins -r Makefile default.mk runlevels*
-}
-
-pkg_postinst() {
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
-	fi
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[[ -e "${ROOT}etc/${x}" ]] && continue
-		[[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue
-		cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc
-	done
-
-	# We need to copy svcdir if upgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
-		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
-		rm -rf "${ROOT}"lib/rcscripts/init.d/{daemons,console}
-		umount "${ROOT}${svcdir}" 2>/dev/null
-		rm -rf "${ROOT}${svcdir}"
-		)
-	elif has_version "<sys-apps/${PN}-2.0.0_alpha4" ; then
-		# The format has changed since 1.13
-		rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console}
-	fi
-
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		/$(get_libdir)/rcscripts/bin/rc-depend --update
-	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 release ${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"
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
-		echo
-		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
-		einfo "They need to be converted to symlinks to ${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 '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
-		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 deprecated 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'"
-	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 "that no longer work"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example"
-	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/{conf.d,init.d}/domainname \
-			"${ROOT}"/etc/runlevels/*/domainname
-		echo
-		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
-}
-
-# Handle our downgraders
-# We should remove this when <1.13 has been removed from the tree
-pkg_postrm() {
-	# Remove dir if downgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
-		mkdir -p "${ROOT}${svcdir}"
-		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
-		rm -rf "${ROOT}${svcdir}"/daemons
-		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
-		rm -rf "${ROOT}lib/rcscripts/init.d"
-		)
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc2-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc2-r1.ebuild
deleted file mode 100644
index 92baa69b3fad..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc2-r1.ebuild,v 1.3 2007/08/08 13:33:05 gustavoz Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
-		!build? (
-			!bootstrap? (
-				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
-				kernel_FreeBSD? ( sys-process/fuser-bsd )
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-PDEPEND="virtual/init
-	!build? ( !bootstrap? (
-		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
-	) )"
-
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}"-console.patch
-
-	# Setup unicode defaults for silly unicode users
-	if use unicode ; then
-		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
-	fi
-}
-
-make_opts() {
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-	local opts="${opts} LIB=${libdir}"
-
-	if use kernel_linux ; then
-		opts="${opts} OS=Linux"
-	else
-		opts="${opts} OS=BSD"
-	fi
-	use pam && opts="${opts} HAVE_PAM=1"
-
-	echo "${opts}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
-}
-
-# Support function for remapping old wireless dns vars
-remap_dns_vars() {
-	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; 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/$1" > "${D}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	if use build || use bootstrap ; then
-		local libdirs="$(get_all_libdirs)" dir=
-		# Create our multilib dirs - the Makefile has no knowledge of this
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			mkdir -p "${ROOT}${dir}"
-			touch "${ROOT}${dir}"/.keep
-			mkdir -p "${ROOT}usr/${dir}"
-			touch "${ROOT}usr/${dir}"/.keep
-			mkdir -p "${ROOT}usr/local/${dir}"
-			touch "${ROOT}usr/local/${dir}"/.keep
-		done
-
-		# Ugly compatibility with stupid ebuilds and old profiles symlinks
-		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
-			ln -s "${lib}" "${ROOT}lib"
-			ln -s "${lib}" "${ROOT}usr/lib"
-			ln -s "${lib}" "${ROOT}usr/local/lib"
-		fi
-
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
-	fi
-
-	# 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
-}
-
-src_install() {
-	make $(make_opts) DESTDIR="${D}" install
-	dodoc ChangeLog COPYRIGHT
-
-	# Should this belong in another ebuild? Like say binutils?
-	# 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
-		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		done
-
-		# 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
-		doenvd "${T}"/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
-
-	# Remove the installed runlevels, as we don't know about $ROOT yet
-	rm -rf "${D}/etc/runlevels"
-
-	# Copy the make files to /usr/share/baselayout so we can re-use them in
-	# postinst, otherwise binpkg will break.
-	insinto /usr/share/baselayout
-	doins -r Makefile default.mk runlevels*
-}
-
-pkg_postinst() {
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
-	fi
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[[ -e "${ROOT}etc/${x}" ]] && continue
-		[[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue
-		cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc
-	done
-
-	# We need to copy svcdir if upgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
-		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
-		rm -rf "${ROOT}"lib/rcscripts/init.d/{daemons,console}
-		umount "${ROOT}${svcdir}" 2>/dev/null
-		rm -rf "${ROOT}${svcdir}"
-		)
-	elif has_version "<sys-apps/${PN}-2.0.0_alpha4" ; then
-		# The format has changed since 1.13
-		rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console}
-	fi
-
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		/$(get_libdir)/rcscripts/bin/rc-depend --update
-	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 release ${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"
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
-		echo
-		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
-		einfo "They need to be converted to symlinks to ${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 '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
-		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 deprecated 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'"
-	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 "that no longer work"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example"
-	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/{conf.d,init.d}/domainname \
-			"${ROOT}"/etc/runlevels/*/domainname
-		echo
-		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
-}
-
-# Handle our downgraders
-# We should remove this when <1.13 has been removed from the tree
-pkg_postrm() {
-	# Remove dir if downgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
-		mkdir -p "${ROOT}${svcdir}"
-		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
-		rm -rf "${ROOT}${svcdir}"/daemons
-		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
-		rm -rf "${ROOT}lib/rcscripts/init.d"
-		)
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc2.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc2.ebuild
deleted file mode 100644
index 69c71f7add05..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.0_rc2.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc2.ebuild,v 1.1 2007/08/04 15:15:41 uberlord Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
-		!build? (
-			!bootstrap? (
-				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
-				kernel_FreeBSD? ( sys-process/fuser-bsd )
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-PDEPEND="virtual/init
-	!build? ( !bootstrap? (
-		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
-	) )"
-
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Setup unicode defaults for silly unicode users
-	if use unicode ; then
-		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
-	fi
-
-	# SPARC does not like stty, so we disable RC_INTERACTIVE which requires it
-	# see Gentoo bug #104067.
-	if use sparc ; then \
-		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
-	fi
-}
-
-make_opts() {
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-	local opts="${opts} LIB=${libdir}"
-
-	if use kernel_linux ; then
-		opts="${opts} OS=Linux"
-	else
-		opts="${opts} OS=BSD"
-	fi
-	use pam && opts="${opts} HAVE_PAM=1"
-
-	echo "${opts}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
-}
-
-# Support function for remapping old wireless dns vars
-remap_dns_vars() {
-	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; 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/$1" > "${D}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	if use build || use bootstrap ; then
-		local libdirs="$(get_all_libdirs)" dir=
-		# Create our multilib dirs - the Makefile has no knowledge of this
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			mkdir -p "${ROOT}${dir}"
-			touch "${ROOT}${dir}"/.keep
-			mkdir -p "${ROOT}usr/${dir}"
-			touch "${ROOT}usr/${dir}"/.keep
-			mkdir -p "${ROOT}usr/local/${dir}"
-			touch "${ROOT}usr/local/${dir}"/.keep
-		done
-
-		# Ugly compatibility with stupid ebuilds and old profiles symlinks
-		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
-			ln -s "${lib}" "${ROOT}lib"
-			ln -s "${lib}" "${ROOT}usr/lib"
-			ln -s "${lib}" "${ROOT}usr/local/lib"
-		fi
-
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
-	fi
-
-	# 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
-}
-
-src_install() {
-	make $(make_opts) DESTDIR="${D}" install
-	dodoc ChangeLog COPYRIGHT
-
-	# Should this belong in another ebuild? Like say binutils?
-	# 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
-		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		done
-
-		# 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
-		doenvd "${T}"/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
-
-	# Remove the installed runlevels, as we don't know about $ROOT yet
-	rm -rf "${D}/etc/runlevels"
-
-	# Copy the make files to /usr/share/baselayout so we can re-use them in
-	# postinst, otherwise binpkg will break.
-	insinto /usr/share/baselayout
-	doins -r Makefile default.mk runlevels*
-}
-
-pkg_postinst() {
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
-	fi
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[[ -e "${ROOT}etc/${x}" ]] && continue
-		[[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue
-		cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc
-	done
-
-	# We need to copy svcdir if upgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
-		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
-		rm -rf "${ROOT}"lib/rcscripts/init.d/{daemons,console}
-		umount "${ROOT}${svcdir}" 2>/dev/null
-		rm -rf "${ROOT}${svcdir}"
-		)
-	elif has_version "<sys-apps/${PN}-2.0.0_alpha4" ; then
-		# The format has changed since 1.13
-		rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console}
-	fi
-
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		/$(get_libdir)/rcscripts/bin/rc-depend --update
-	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 release ${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"
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
-		echo
-		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
-		einfo "They need to be converted to symlinks to ${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 '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
-		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 deprecated 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'"
-	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 "that no longer work"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example"
-	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/{conf.d,init.d}/domainname \
-			"${ROOT}"/etc/runlevels/*/domainname
-		echo
-		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
-}
-
-# Handle our downgraders
-# We should remove this when <1.13 has been removed from the tree
-pkg_postrm() {
-	# Remove dir if downgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
-		mkdir -p "${ROOT}${svcdir}"
-		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
-		rm -rf "${ROOT}${svcdir}"/daemons
-		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
-		rm -rf "${ROOT}lib/rcscripts/init.d"
-		)
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc3-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc3-r1.ebuild
deleted file mode 100644
index 4afeaa04897e..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.0_rc3-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc3-r1.ebuild,v 1.4 2007/08/28 20:32:53 corsair Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
-		!build? (
-			!bootstrap? (
-				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
-				kernel_FreeBSD? ( sys-process/fuser-bsd )
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-PDEPEND="virtual/init
-	!build? ( !bootstrap? (
-		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
-	) )"
-
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}"-ppp.patch
-
-	# Setup unicode defaults for silly unicode users
-	if use unicode ; then
-		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
-	fi
-}
-
-make_opts() {
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-	local opts="${opts} LIB=${libdir}"
-
-	if use kernel_linux ; then
-		opts="${opts} OS=Linux"
-	else
-		opts="${opts} OS=BSD"
-	fi
-	use pam && opts="${opts} HAVE_PAM=1"
-
-	echo "${opts}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
-}
-
-# Support function for remapping old wireless dns vars
-remap_dns_vars() {
-	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; 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/$1" > "${D}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	if use build || use bootstrap ; then
-		local libdirs="$(get_all_libdirs)" dir=
-		# Create our multilib dirs - the Makefile has no knowledge of this
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			mkdir -p "${ROOT}${dir}"
-			touch "${ROOT}${dir}"/.keep
-			mkdir -p "${ROOT}usr/${dir}"
-			touch "${ROOT}usr/${dir}"/.keep
-			mkdir -p "${ROOT}usr/local/${dir}"
-			touch "${ROOT}usr/local/${dir}"/.keep
-		done
-
-		# Ugly compatibility with stupid ebuilds and old profiles symlinks
-		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
-			ln -s "${lib}" "${ROOT}lib"
-			ln -s "${lib}" "${ROOT}usr/lib"
-			ln -s "${lib}" "${ROOT}usr/local/lib"
-		fi
-
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
-	fi
-
-	# 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
-}
-
-src_install() {
-	emake $(make_opts) DESTDIR="${D}" install || die
-	dodoc ChangeLog COPYRIGHT
-
-	# Should this belong in another ebuild? Like say binutils?
-	# 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
-		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		done
-
-		# 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
-		doenvd "${T}"/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
-
-	# Remove the installed runlevels, as we don't know about $ROOT yet
-	rm -rf "${D}/etc/runlevels"
-
-	# Copy the make files to /usr/share/baselayout so we can re-use them in
-	# postinst, otherwise binpkg will break.
-	insinto /usr/share/baselayout
-	doins -r Makefile default.mk runlevels*
-}
-
-pkg_postinst() {
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
-	fi
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[[ -e "${ROOT}etc/${x}" ]] && continue
-		[[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue
-		cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc
-	done
-
-	# We need to copy svcdir if upgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
-		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
-		rm -rf "${ROOT}"lib/rcscripts/init.d/{daemons,console}
-		umount "${ROOT}${svcdir}" 2>/dev/null
-		rm -rf "${ROOT}${svcdir}"
-		)
-	elif has_version "<sys-apps/${PN}-2.0.0_alpha4" ; then
-		# The format has changed since 1.13
-		rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console}
-	fi
-
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		/$(get_libdir)/rcscripts/bin/rc-depend --update
-	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 release ${PF}" > "${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"
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
-		echo
-		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
-		einfo "They need to be converted to symlinks to ${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 '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
-		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 deprecated 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'"
-	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 "that no longer work"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example"
-	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/{conf.d,init.d}/domainname \
-			"${ROOT}"/etc/runlevels/*/domainname
-		echo
-		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
-}
-
-# Handle our downgraders
-# We should remove this when <1.13 has been removed from the tree
-pkg_postrm() {
-	# Remove dir if downgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
-		mkdir -p "${ROOT}${svcdir}"
-		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
-		rm -rf "${ROOT}${svcdir}"/daemons
-		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
-		rm -rf "${ROOT}lib/rcscripts/init.d"
-		)
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.0.0_rc3.ebuild b/sys-apps/baselayout/baselayout-2.0.0_rc3.ebuild
deleted file mode 100644
index 487ec53e6a7c..000000000000
--- a/sys-apps/baselayout/baselayout-2.0.0_rc3.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_rc3.ebuild,v 1.3 2007/08/25 11:42:09 uberlord Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
-		!build? (
-			!bootstrap? (
-				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
-				kernel_FreeBSD? ( sys-process/fuser-bsd )
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-PDEPEND="virtual/init
-	!build? ( !bootstrap? (
-		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
-	) )"
-
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Setup unicode defaults for silly unicode users
-	if use unicode ; then
-		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
-	fi
-}
-
-make_opts() {
-	local libdir="lib"
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-	local opts="${opts} LIB=${libdir}"
-
-	if use kernel_linux ; then
-		opts="${opts} OS=Linux"
-	else
-		opts="${opts} OS=BSD"
-	fi
-	use pam && opts="${opts} HAVE_PAM=1"
-
-	echo "${opts}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
-}
-
-# Support function for remapping old wireless dns vars
-remap_dns_vars() {
-	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; 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/$1" > "${D}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	if use build || use bootstrap ; then
-		local libdirs="$(get_all_libdirs)" dir=
-		# Create our multilib dirs - the Makefile has no knowledge of this
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			mkdir -p "${ROOT}${dir}"
-			touch "${ROOT}${dir}"/.keep
-			mkdir -p "${ROOT}usr/${dir}"
-			touch "${ROOT}usr/${dir}"/.keep
-			mkdir -p "${ROOT}usr/local/${dir}"
-			touch "${ROOT}usr/local/${dir}"/.keep
-		done
-
-		# Ugly compatibility with stupid ebuilds and old profiles symlinks
-		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
-			ln -s "${lib}" "${ROOT}lib"
-			ln -s "${lib}" "${ROOT}usr/lib"
-			ln -s "${lib}" "${ROOT}usr/local/lib"
-		fi
-
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
-	fi
-
-	# 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
-}
-
-src_install() {
-	make $(make_opts) DESTDIR="${D}" install
-	dodoc ChangeLog COPYRIGHT
-
-	# Should this belong in another ebuild? Like say binutils?
-	# 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
-		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
-		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-		for dir in ${libdirs}; do
-			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		done
-
-		# 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
-		doenvd "${T}"/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
-
-	# Remove the installed runlevels, as we don't know about $ROOT yet
-	rm -rf "${D}/etc/runlevels"
-
-	# Copy the make files to /usr/share/baselayout so we can re-use them in
-	# postinst, otherwise binpkg will break.
-	insinto /usr/share/baselayout
-	doins -r Makefile default.mk runlevels*
-}
-
-pkg_postinst() {
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
-	fi
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[[ -e "${ROOT}etc/${x}" ]] && continue
-		[[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue
-		cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc
-	done
-
-	# We need to copy svcdir if upgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
-		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
-		rm -rf "${ROOT}"lib/rcscripts/init.d/{daemons,console}
-		umount "${ROOT}${svcdir}" 2>/dev/null
-		rm -rf "${ROOT}${svcdir}"
-		)
-	elif has_version "<sys-apps/${PN}-2.0.0_alpha4" ; then
-		# The format has changed since 1.13
-		rm -rf "${ROOT}"lib/rcscripts/{init.d/daemons,console}
-	fi
-
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		/$(get_libdir)/rcscripts/bin/rc-depend --update
-	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 release ${PF}" > "${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"
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
-		echo
-		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
-		einfo "They need to be converted to symlinks to ${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 '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
-		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 deprecated 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'"
-	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 "that no longer work"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example"
-	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/{conf.d,init.d}/domainname \
-			"${ROOT}"/etc/runlevels/*/domainname
-		echo
-		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
-}
-
-# Handle our downgraders
-# We should remove this when <1.13 has been removed from the tree
-pkg_postrm() {
-	# Remove dir if downgrading
-	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
-		(
-		source "${ROOT}etc/conf.d/rc"
-		svcdir="${svcdir:-/var/lib/init.d}"
-		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
-		mkdir -p "${ROOT}${svcdir}"
-		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
-		rm -rf "${ROOT}${svcdir}"/daemons
-		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
-		rm -rf "${ROOT}lib/rcscripts/init.d"
-		)
-	fi
-}
diff --git a/sys-apps/baselayout/files/baselayout-2.0.0_rc2-console.patch b/sys-apps/baselayout/files/baselayout-2.0.0_rc2-console.patch
deleted file mode 100644
index 0dc7f4f21f80..000000000000
--- a/sys-apps/baselayout/files/baselayout-2.0.0_rc2-console.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: src/rc.c
-===================================================================
---- src/rc.c	(revision 2814)
-+++ src/rc.c	(working copy)
-@@ -671,7 +671,7 @@
- 	} while (! WIFEXITED (status) && ! WIFSIGNALED (status));
- 
- 	if (! WIFEXITED (status) || ! WEXITSTATUS (status) == 0)
--		exit (EXIT_FAILURE);
-+		eerrorx ("%s: failed to exec `%s'", applet, script);
- }
- 
- #include "_usage.h"
-Index: sh.Linux/init-early.sh
-===================================================================
---- sh.Linux/init-early.sh	(revision 2813)
-+++ sh.Linux/init-early.sh	(working copy)
-@@ -10,6 +10,9 @@
- 		font="$(cat "${RC_LIBDIR}"/console/font)"
- 		CONSOLE="${CONSOLE:-/dev/console}"
- 		[ -c "${CONSOLE}" ] && cons="-C ${CONSOLE}"
--		setfont ${cons} "${RC_LIBDIR}"/console/"${font}"
-+		setfont ${cons} "${RC_LIBDIR}"/console/"${font}" 2>/dev/null
- 	fi
- fi
-+
-+# Ensure we exit 0 so the boot continues
-+exit 0
diff --git a/sys-apps/baselayout/files/baselayout-2.0.0_rc3-ppp.patch b/sys-apps/baselayout/files/baselayout-2.0.0_rc3-ppp.patch
deleted file mode 100644
index 3d7bd929428c..000000000000
--- a/sys-apps/baselayout/files/baselayout-2.0.0_rc3-ppp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: net.Linux/pppd.sh
-===================================================================
---- net.Linux/pppd.sh	(revision 2826)
-+++ net.Linux/pppd.sh	(working copy)
-@@ -89,7 +89,8 @@
- 	fi
- 	
- 	if ! ${hasdefaultmetric} ; then
--		local m=\$metric_${IFVAR}
-+		local m=
-+		eval m=\$metric_${IFVAR}
- 		[ -z "${m}" ] && m=$((${metric} + _ifindex))
- 		opts="${opts} defaultmetric ${m}"
- 	fi
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha4 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha4
deleted file mode 100644
index 166ffd16db0a..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b613375c009dd05f86c17183fe96f98d baselayout-2.0.0_alpha4.tar.bz2 135316
-RMD160 9404971a51dcc83f8f7da153908e0cc414b6e9eb baselayout-2.0.0_alpha4.tar.bz2 135316
-SHA256 eb54db160380f65d2986bc80165c45859eee4f58bbe694fd093a7c5fdd91359b baselayout-2.0.0_alpha4.tar.bz2 135316
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc1 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc1
deleted file mode 100644
index cf462b6f515d..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed3c84388998b1070d66ee5f9212332c baselayout-2.0.0_rc1.tar.bz2 136379
-RMD160 03b39a777d59009766374f80062c8766105743b6 baselayout-2.0.0_rc1.tar.bz2 136379
-SHA256 d46d4d635f8ef14028deb4cafa543988fce336c19cddc449debfd969b731d07a baselayout-2.0.0_rc1.tar.bz2 136379
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc2 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc2
deleted file mode 100644
index bf69496291d9..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 94e3e62f1d7b9d8c4cf4c16121203c8b baselayout-2.0.0_rc2.tar.bz2 135882
-RMD160 8d8e6f457c522803406f29df71db4dfd63635a95 baselayout-2.0.0_rc2.tar.bz2 135882
-SHA256 f65e245d47bad75949e0edfa9c4b0a0992aa43f9e0cd572146c48a3c1f47138d baselayout-2.0.0_rc2.tar.bz2 135882
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc2-r1 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc2-r1
deleted file mode 100644
index bf69496291d9..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 94e3e62f1d7b9d8c4cf4c16121203c8b baselayout-2.0.0_rc2.tar.bz2 135882
-RMD160 8d8e6f457c522803406f29df71db4dfd63635a95 baselayout-2.0.0_rc2.tar.bz2 135882
-SHA256 f65e245d47bad75949e0edfa9c4b0a0992aa43f9e0cd572146c48a3c1f47138d baselayout-2.0.0_rc2.tar.bz2 135882
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc3 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc3
deleted file mode 100644
index e674455b6fb0..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2f0eadf4c8c2839b4c15212e63dfe990 baselayout-2.0.0_rc3.tar.bz2 136734
-RMD160 d1b1c78197a8e429e369628ef72aef3bc444f7ab baselayout-2.0.0_rc3.tar.bz2 136734
-SHA256 36dd8065b09f34b91a7ff9b90baa4c98e9f3480d261a81dacf5495c5c58751ed baselayout-2.0.0_rc3.tar.bz2 136734
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc3-r1 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc3-r1
deleted file mode 100644
index e674455b6fb0..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-2.0.0_rc3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2f0eadf4c8c2839b4c15212e63dfe990 baselayout-2.0.0_rc3.tar.bz2 136734
-RMD160 d1b1c78197a8e429e369628ef72aef3bc444f7ab baselayout-2.0.0_rc3.tar.bz2 136734
-SHA256 36dd8065b09f34b91a7ff9b90baa4c98e9f3480d261a81dacf5495c5c58751ed baselayout-2.0.0_rc3.tar.bz2 136734