From: Roy Marples <uberlord@gentoo.org>
Date: Fri, 8 Dec 2006 22:47:22 +0000 (+0000)
Subject: Punt old versions
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb6ed3bba71b1dc5bd6411e37781d99a09e81d63;p=gentoo.git

Punt old versions
Package-Manager: portage-2.1.2_rc2-r5
---

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 5641b2263f11..106849b9aca4 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -82,10 +82,6 @@ AUX baselayout-1.12.5-dmesg.patch 5202 RMD160 ce0b8e91590888fa6f9f0cc84ed29bd3a6
 MD5 05e23d7d8cd139821113afb7d6ef56cc files/baselayout-1.12.5-dmesg.patch 5202
 RMD160 ce0b8e91590888fa6f9f0cc84ed29bd3a6007156 files/baselayout-1.12.5-dmesg.patch 5202
 SHA256 837ed3be21597ae44de1debe5f48460945039cf1f4b7de9f067d5e78bb83a0c6 files/baselayout-1.12.5-dmesg.patch 5202
-AUX baselayout-1.13.0_alpha5-2364.patch 2119 RMD160 029e0c34899603e4bb822b0ad13e9daa15b2255c SHA1 de222d9ba99d8cece07e1d3665f4087e4209e8fb SHA256 6c7fcc07214fe8e88e4e3fad7fc013427354f662505fa95f657e5634cb3adbc8
-MD5 28f5df04fa58d76dd0188d9d4cb9879a files/baselayout-1.13.0_alpha5-2364.patch 2119
-RMD160 029e0c34899603e4bb822b0ad13e9daa15b2255c files/baselayout-1.13.0_alpha5-2364.patch 2119
-SHA256 6c7fcc07214fe8e88e4e3fad7fc013427354f662505fa95f657e5634cb3adbc8 files/baselayout-1.13.0_alpha5-2364.patch 2119
 AUX baselayout-1.13.0_alpha7-2380.patch 1245 RMD160 9569358ba672b873cbfdc055ef5be856493565b5 SHA1 993001c59552cff32599b55086cbde58faedcbe3 SHA256 9e08046a07819462f8042e4bf23322d1e56594fa49aa6bd5fe223d7977808074
 MD5 f58aed630c19dbfe0178f9fb69d670d7 files/baselayout-1.13.0_alpha7-2380.patch 1245
 RMD160 9569358ba672b873cbfdc055ef5be856493565b5 files/baselayout-1.13.0_alpha7-2380.patch 1245
@@ -97,8 +93,6 @@ SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/co
 DIST baselayout-1.12.4.tar.bz2 216448 RMD160 125e0b8c0f02266fa72ce95d4d3ba93311871d57 SHA1 26a2fa93db01aecd92d2ae47f193fad0949dc316 SHA256 f09ae36d84ff7f52baf44494dedafcb26a1cbb4e5a0f9ba5ef5f553bc21373da
 DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
 DIST baselayout-1.12.6.tar.bz2 221279 RMD160 4a9b6a0b3855e36a4b0214615d578e8d17dcabae SHA1 8164fe1923ccdf9d9e38ac0884e2bdd2061681e7 SHA256 c244469fa582c7733d2cf1b51865fac818beb8b2af60ec452ad147cb50eb8862
-DIST baselayout-1.13.0_alpha5.tar.bz2 255507 RMD160 bd0d391abd8cee745dfdce502d3ca78bdb7013f3 SHA1 ec76c840cd4f53757de750446ca1eefee997a390 SHA256 987e378072608480f956ff32a6c5851e98ac7c2c6653d18148bd66681592a23e
-DIST baselayout-1.13.0_alpha6.tar.bz2 253385 RMD160 012a1488fa0e26c221fd9b5f08078cf581a80474 SHA1 51e79d0cfc2cec1da5b5b65e49fd9f0322769a1a SHA256 a67c2c05948a27772b919fe9e90a3a1e03eda0f682f8423afc83c5490e88776e
 DIST baselayout-1.13.0_alpha7.tar.bz2 251963 RMD160 e29e1eba3ff47eab72979ebe991b17312e2bb891 SHA1 8637652f88583a38538b33b09ebe2cb7bf496338 SHA256 75ddf9c0c50baa5538a5d30d7e4125c6ad283ae5b598403a4625fdee081e3eef
 DIST baselayout-1.13.0_alpha8.tar.bz2 255845 RMD160 6cf6ca5f2a171674297565936195bd0a8d53199e SHA1 a6d545362c7ca1344fbd0ae798d92ba9e6c377ce SHA256 8a9c09367bd03096c7c9331874b8cc3096f6ddb78bb8f320e64b90590b76eefd
 DIST rc-scripts-1.6.13.tar.bz2 156148 RMD160 c267e0862ffb0af4e7b016332e962ad3fb54723e SHA256 89f924fffbe4b9f84970a2fa559262d24714ee5c15c3d3bf6ebd6d95e25484c0
@@ -128,26 +122,10 @@ EBUILD baselayout-1.12.6.ebuild 19713 RMD160 2a19aa08e7a497843b40d2678ba8695580e
 MD5 bd19081e2814fc4989fb0648ba5fa709 baselayout-1.12.6.ebuild 19713
 RMD160 2a19aa08e7a497843b40d2678ba8695580e6f75f baselayout-1.12.6.ebuild 19713
 SHA256 c39675983cc1a94ddedb5822490cb3504230d8dad3df60d36f71e8d035b5d57a baselayout-1.12.6.ebuild 19713
-EBUILD baselayout-1.13.0_alpha5-r1.ebuild 9153 RMD160 68c623365cca7613a15bdc8ea43d6cdfca453bee SHA1 0cd5a1d67769e73cc856028f9f0776613254d8e9 SHA256 4e9827ec374154287a3a77586579725864e286b57a3b4770fd2a070f00a33ca7
-MD5 3e3e80b2ac3e67a57c43bf89a04d8588 baselayout-1.13.0_alpha5-r1.ebuild 9153
-RMD160 68c623365cca7613a15bdc8ea43d6cdfca453bee baselayout-1.13.0_alpha5-r1.ebuild 9153
-SHA256 4e9827ec374154287a3a77586579725864e286b57a3b4770fd2a070f00a33ca7 baselayout-1.13.0_alpha5-r1.ebuild 9153
-EBUILD baselayout-1.13.0_alpha5.ebuild 9089 RMD160 1b12e9c963e219edeac3d736e10cb7530104fe7a SHA1 6b217a09866f6223c7e0894eb18d997d1d56bd7d SHA256 d30fb2f1d79a88b4f71e85a0184532080e2f1b7b61ace28b10eca866e802897f
-MD5 db8c9169bf375ba0ea2d0c3c496a2606 baselayout-1.13.0_alpha5.ebuild 9089
-RMD160 1b12e9c963e219edeac3d736e10cb7530104fe7a baselayout-1.13.0_alpha5.ebuild 9089
-SHA256 d30fb2f1d79a88b4f71e85a0184532080e2f1b7b61ace28b10eca866e802897f baselayout-1.13.0_alpha5.ebuild 9089
-EBUILD baselayout-1.13.0_alpha6.ebuild 9089 RMD160 81bd86a70ddcb92a16c327a6bb116e437880524d SHA1 158be39274cb45b94ca265f4af3fd6caad679dda SHA256 8b4b67c227581f48c27c920d8e8013a383844c142ddb72157fdb0f7b4761f24a
-MD5 a3d7543bf1cff40c11c713edb607988c baselayout-1.13.0_alpha6.ebuild 9089
-RMD160 81bd86a70ddcb92a16c327a6bb116e437880524d baselayout-1.13.0_alpha6.ebuild 9089
-SHA256 8b4b67c227581f48c27c920d8e8013a383844c142ddb72157fdb0f7b4761f24a baselayout-1.13.0_alpha6.ebuild 9089
 EBUILD baselayout-1.13.0_alpha7-r1.ebuild 10230 RMD160 c7917177f114fe0417b317014d097e05fa578d7a SHA1 f4493209e0e49a16955d91817b3299bdc4db5c45 SHA256 45a29874c4d312626407e6f092811dc806aa3b49954779099fc8b72f551a79b6
 MD5 e0c1072935993a2cad3e418d51d14659 baselayout-1.13.0_alpha7-r1.ebuild 10230
 RMD160 c7917177f114fe0417b317014d097e05fa578d7a baselayout-1.13.0_alpha7-r1.ebuild 10230
 SHA256 45a29874c4d312626407e6f092811dc806aa3b49954779099fc8b72f551a79b6 baselayout-1.13.0_alpha7-r1.ebuild 10230
-EBUILD baselayout-1.13.0_alpha7.ebuild 10111 RMD160 ccebe113a6d0001a68f081820ead74a27588b639 SHA1 3842b74b72d612c4cf58b12cb9cec764c47d0433 SHA256 3fff04126b3616e72eb84d7557faf6f876e3b8de3324887ae73aba02da6bb8e2
-MD5 8c4c4940baedfd98bc936090d503dce5 baselayout-1.13.0_alpha7.ebuild 10111
-RMD160 ccebe113a6d0001a68f081820ead74a27588b639 baselayout-1.13.0_alpha7.ebuild 10111
-SHA256 3fff04126b3616e72eb84d7557faf6f876e3b8de3324887ae73aba02da6bb8e2 baselayout-1.13.0_alpha7.ebuild 10111
 EBUILD baselayout-1.13.0_alpha8.ebuild 10111 RMD160 be9a56c5d7a7783d98173e18e9334d34948d45ba SHA1 41ea65903957811c2d51905c7522fbd9267a139d SHA256 de353e0a897b07fac7a0778c1d60e8f387896170cf2cb4cd0d8831430b20c35e
 MD5 3809ea091f7b23d5f4ed5c4e494d900f baselayout-1.13.0_alpha8.ebuild 10111
 RMD160 be9a56c5d7a7783d98173e18e9334d34948d45ba baselayout-1.13.0_alpha8.ebuild 10111
@@ -178,18 +156,6 @@ SHA256 e2664f4f2035a0dffe9e01dad95a8f05e30e9aa277c0c0df51febbe3f05bdc03 files/di
 MD5 646df4c5861a383867d4188f27d8b7d0 files/digest-baselayout-1.12.6 256
 RMD160 19fbf407d2819bb6917b330252c1ed71cc0322bb files/digest-baselayout-1.12.6 256
 SHA256 7d0ed81c4a5f1131c77c84febb52dcb9949dcfd9ce3bbc18ad4299780c92c74b files/digest-baselayout-1.12.6 256
-MD5 efde442d3cc9833ca1767c882e52c2c5 files/digest-baselayout-1.13.0_alpha5 277
-RMD160 817f36d15a293973a46ffd6a0fd48fc07f904d58 files/digest-baselayout-1.13.0_alpha5 277
-SHA256 ef10f75c32a61411af0ed5b62d18257b1c34752776dbdec49c5479a6dda07ce2 files/digest-baselayout-1.13.0_alpha5 277
-MD5 efde442d3cc9833ca1767c882e52c2c5 files/digest-baselayout-1.13.0_alpha5-r1 277
-RMD160 817f36d15a293973a46ffd6a0fd48fc07f904d58 files/digest-baselayout-1.13.0_alpha5-r1 277
-SHA256 ef10f75c32a61411af0ed5b62d18257b1c34752776dbdec49c5479a6dda07ce2 files/digest-baselayout-1.13.0_alpha5-r1 277
-MD5 823a50271e7e969571ebfa5f54355e99 files/digest-baselayout-1.13.0_alpha6 277
-RMD160 6df251da5bbb6646d8140bb3b733de675e62e186 files/digest-baselayout-1.13.0_alpha6 277
-SHA256 26f10758985f5017d78a84ceae30d93d7715911c0a592df250f809be0b09bc55 files/digest-baselayout-1.13.0_alpha6 277
-MD5 9adcdfe0c1713bd93bd67a6fd4e9e4cb files/digest-baselayout-1.13.0_alpha7 277
-RMD160 4e7cdbd1adf20e40cef4efee0605bb6cdcf8b259 files/digest-baselayout-1.13.0_alpha7 277
-SHA256 790aafb90a5186b950fee42956a5d9bf3386a6a3a74e11e4d37ecdd52292314c files/digest-baselayout-1.13.0_alpha7 277
 MD5 9adcdfe0c1713bd93bd67a6fd4e9e4cb files/digest-baselayout-1.13.0_alpha7-r1 277
 RMD160 4e7cdbd1adf20e40cef4efee0605bb6cdcf8b259 files/digest-baselayout-1.13.0_alpha7-r1 277
 SHA256 790aafb90a5186b950fee42956a5d9bf3386a6a3a74e11e4d37ecdd52292314c files/digest-baselayout-1.13.0_alpha7-r1 277
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha5-r1.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha5-r1.ebuild
deleted file mode 100644
index c26b6284cc61..000000000000
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha5-r1.ebuild
+++ /dev/null
@@ -1,273 +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/baselayout-1.13.0_alpha5-r1.ebuild,v 1.1 2006/11/06 13:14:27 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"
-
-# This version of baselayout needs awk 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="kernel_linux? ( >=sys-apps/sysvinit-2.86-r3 )
-		!build? (
-			!bootstrap? (
-				>=sys-libs/readline-5.0-r1
-				>=app-shells/bash-3.2_p3-r1
-				kernel_linux? (
-					>=sys-apps/coreutils-5.2.1
-				)
-				kernel_FreeBSD? (
-					sys-process/fuser-bsd
-					sys-process/pidof-bsd
-				)
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix a few key bugs
-	epatch "${FILESDIR}/${P}"-2364.patch
-
-	# 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  '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
-		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
-	fi
-}
-
-make_opts() {
-	# Standard options
-	local opts="DESTDIR=\"${ROOT}\" ARCH=\"$(tc-arch)\""
-	local libdir="lib"
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	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) || 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" > "${IMAGE}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# 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=
-		: ${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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${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() {
-	# 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
-		make -C "${T}" $(make_opts) layout || die "failed to layout filesystem"
-	fi
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) runlevels_install >/dev/null
-	fi
-
-	if use kernel_linux ; then
-		if use build || use bootstrap ; then
-			# Create base directories
-			if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then
-				einfo "Creating dev nodes"
-				PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \
-					dev || die "failed to create /dev nodes"
-			fi
-		fi
-	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
-
-	# 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
-		# We need to copy svcdir if it's empty
-		if [[ ! -e ${ROOT}lib/rcscripts/init.d/deptree ]] ; then
-			(
-			source "${ROOT}etc/conf.d/rc"
-			svcdir="${svcdir:-/var/lib/init.d}"
-			if [[ -e ${ROOT}${svcdir}/deptree ]] ; then
-				cp -RPp "${ROOT}${svcdir}"/* ${ROOT}lib/rcscripts/init.d
-			fi
-			)
-		fi
-
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh --update >/dev/null
-
-		# Regenerate /etc/modules.conf, else it will fail at next boot
-		if [[ -x /sbin/modules-update ]] ; then
-			einfo "Updating module dependencies..."
-			/sbin/modules-update force >/dev/null
-		fi
-	else
-		rm -f "${ROOT}"/etc/modules.conf
-	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
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} ]] && 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}"
-		echo
-		break
-	done
-
-	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/{net,wireless} 2>/dev/null \
-		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
-			echo
-			ewarn "You have depreciated variables in ${ROOT}etc/conf.d/net"
-			ewarn "or ${ROOT}etc/conf.d/wireless"
-			ewarn
-			ewarn "domain_* -> dns_domain_*"
-			ewarn "nameservers_* -> dns_servers_*"
-			ewarn "searchdomains_* -> dns_search_domains_*"
-			ewarn
-			ewarn "They have been converted for you - ensure that you"
-			ewarn "update them via 'etc-update'"
-			echo
-	fi
-
-	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \
-		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
-			echo
-			ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example as there is no"
-			ewarn "guarantee that they will work in future versions."
-			echo
-	fi
-
-	# 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
-		ewarn "The domainname init script has been removed in this version."
-		ewarn "Consult ${ROOT}etc/conf.d/net.example for details about how"
-		ewarn "to apply dns/nis information to the loopback interface."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha5.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha5.ebuild
deleted file mode 100644
index f49b9ff2a0eb..000000000000
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha5.ebuild
+++ /dev/null
@@ -1,270 +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/baselayout-1.13.0_alpha5.ebuild,v 1.1 2006/11/02 16:45:49 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"
-
-# This version of baselayout needs awk 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="kernel_linux? ( >=sys-apps/sysvinit-2.86-r3 )
-		!build? (
-			!bootstrap? (
-				>=sys-libs/readline-5.0-r1
-				>=app-shells/bash-3.2_p3-r1
-				kernel_linux? (
-					>=sys-apps/coreutils-5.2.1
-				)
-				kernel_FreeBSD? (
-					sys-process/fuser-bsd
-					sys-process/pidof-bsd
-				)
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-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  '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
-		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
-	fi
-}
-
-make_opts() {
-	# Standard options
-	local opts="DESTDIR=\"${ROOT}\" ARCH=\"$(tc-arch)\""
-	local libdir="lib"
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	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) || 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" > "${IMAGE}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# 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=
-		: ${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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${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() {
-	# 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
-		make -C "${T}" $(make_opts) layout || die "failed to layout filesystem"
-	fi
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) runlevels_install >/dev/null
-	fi
-
-	if use kernel_linux ; then
-		if use build || use bootstrap ; then
-			# Create base directories
-			if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then
-				einfo "Creating dev nodes"
-				PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \
-					dev || die "failed to create /dev nodes"
-			fi
-		fi
-	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
-
-	# 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
-		# We need to copy svcdir if it's empty
-		if [[ ! -e ${ROOT}lib/rcscripts/init.d/deptree ]] ; then
-			(
-			source "${ROOT}etc/conf.d/rc"
-			svcdir="${svcdir:-/var/lib/init.d}"
-			if [[ -e ${ROOT}${svcdir}/deptree ]] ; then
-				cp -RPp "${ROOT}${svcdir}"/* ${ROOT}lib/rcscripts/init.d
-			fi
-			)
-		fi
-
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh --update >/dev/null
-
-		# Regenerate /etc/modules.conf, else it will fail at next boot
-		if [[ -x /sbin/modules-update ]] ; then
-			einfo "Updating module dependencies..."
-			/sbin/modules-update force >/dev/null
-		fi
-	else
-		rm -f "${ROOT}"/etc/modules.conf
-	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
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} ]] && 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}"
-		echo
-		break
-	done
-
-	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/{net,wireless} 2>/dev/null \
-		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
-			echo
-			ewarn "You have depreciated variables in ${ROOT}etc/conf.d/net"
-			ewarn "or ${ROOT}etc/conf.d/wireless"
-			ewarn
-			ewarn "domain_* -> dns_domain_*"
-			ewarn "nameservers_* -> dns_servers_*"
-			ewarn "searchdomains_* -> dns_search_domains_*"
-			ewarn
-			ewarn "They have been converted for you - ensure that you"
-			ewarn "update them via 'etc-update'"
-			echo
-	fi
-
-	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \
-		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
-			echo
-			ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example as there is no"
-			ewarn "guarantee that they will work in future versions."
-			echo
-	fi
-
-	# 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
-		ewarn "The domainname init script has been removed in this version."
-		ewarn "Consult ${ROOT}etc/conf.d/net.example for details about how"
-		ewarn "to apply dns/nis information to the loopback interface."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha6.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha6.ebuild
deleted file mode 100644
index 7d80829c4294..000000000000
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha6.ebuild
+++ /dev/null
@@ -1,270 +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/baselayout-1.13.0_alpha6.ebuild,v 1.1 2006/11/08 23:49:12 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"
-
-# This version of baselayout needs awk 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="kernel_linux? ( >=sys-apps/sysvinit-2.86-r3 )
-		!build? (
-			!bootstrap? (
-				>=sys-libs/readline-5.0-r1
-				>=app-shells/bash-3.2_p3-r1
-				kernel_linux? (
-					>=sys-apps/coreutils-5.2.1
-				)
-				kernel_FreeBSD? (
-					sys-process/fuser-bsd
-					sys-process/pidof-bsd
-				)
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-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  '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
-		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
-	fi
-}
-
-make_opts() {
-	# Standard options
-	local opts="DESTDIR=\"${ROOT}\" ARCH=\"$(tc-arch)\""
-	local libdir="lib"
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	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) || 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" > "${IMAGE}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# 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=
-		: ${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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${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() {
-	# 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
-		make -C "${T}" $(make_opts) layout || die "failed to layout filesystem"
-	fi
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) runlevels_install >/dev/null
-	fi
-
-	if use kernel_linux ; then
-		if use build || use bootstrap ; then
-			# Create base directories
-			if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then
-				einfo "Creating dev nodes"
-				PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \
-					dev || die "failed to create /dev nodes"
-			fi
-		fi
-	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
-
-	# 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
-		# We need to copy svcdir if it's empty
-		if [[ ! -e ${ROOT}lib/rcscripts/init.d/deptree ]] ; then
-			(
-			source "${ROOT}etc/conf.d/rc"
-			svcdir="${svcdir:-/var/lib/init.d}"
-			if [[ -e ${ROOT}${svcdir}/deptree ]] ; then
-				cp -RPp "${ROOT}${svcdir}"/* ${ROOT}lib/rcscripts/init.d
-			fi
-			)
-		fi
-
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh --update >/dev/null
-
-		# Regenerate /etc/modules.conf, else it will fail at next boot
-		if [[ -x /sbin/modules-update ]] ; then
-			einfo "Updating module dependencies..."
-			/sbin/modules-update force >/dev/null
-		fi
-	else
-		rm -f "${ROOT}"/etc/modules.conf
-	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
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} ]] && 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}"
-		echo
-		break
-	done
-
-	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/{net,wireless} 2>/dev/null \
-		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
-			echo
-			ewarn "You have depreciated variables in ${ROOT}etc/conf.d/net"
-			ewarn "or ${ROOT}etc/conf.d/wireless"
-			ewarn
-			ewarn "domain_* -> dns_domain_*"
-			ewarn "nameservers_* -> dns_servers_*"
-			ewarn "searchdomains_* -> dns_search_domains_*"
-			ewarn
-			ewarn "They have been converted for you - ensure that you"
-			ewarn "update them via 'etc-update'"
-			echo
-	fi
-
-	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \
-		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
-			echo
-			ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example as there is no"
-			ewarn "guarantee that they will work in future versions."
-			echo
-	fi
-
-	# 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
-		ewarn "The domainname init script has been removed in this version."
-		ewarn "Consult ${ROOT}etc/conf.d/net.example for details about how"
-		ewarn "to apply dns/nis information to the loopback interface."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha7.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha7.ebuild
deleted file mode 100644
index 66d061484559..000000000000
--- a/sys-apps/baselayout/baselayout-1.13.0_alpha7.ebuild
+++ /dev/null
@@ -1,286 +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/baselayout-1.13.0_alpha7.ebuild,v 1.3 2006/12/08 17:22:02 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"
-
-# This version of baselayout needs awk 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="kernel_linux? ( >=sys-apps/sysvinit-2.86-r3 )
-		!build? (
-			!bootstrap? (
-				>=sys-libs/readline-5.0-r1
-				>=app-shells/bash-3.2_p3-r1
-				kernel_linux? (
-					>=sys-apps/coreutils-5.2.1
-				)
-				kernel_FreeBSD? (
-					sys-process/fuser-bsd
-					sys-process/pidof-bsd
-				)
-			)
-		)
-		pam? ( virtual/pam )
-		!<net-misc/dhcpcd-2.0.0"
-DEPEND="virtual/os-headers"
-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  '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
-		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
-	fi
-}
-
-make_opts() {
-	# Standard options
-	local opts="DESTDIR=\"${ROOT}\" ARCH=\"$(tc-arch)\" CC=\"$(tc-getCC)\""
-	local libdir="lib"
-
-	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	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) || 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" > "${IMAGE}/etc/conf.d/$1"
-	fi
-}
-
-pkg_preinst() {
-	# Move our makefiles to a temporay location
-	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
-
-	# 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=
-		: ${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 /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
-			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-		fi
-		echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${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() {
-	# 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
-		make -C "${T}" $(make_opts) layout || die "failed to layout filesystem"
-	fi
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
-		einfo "Making default runlevels"
-		make -C "${T}" $(make_opts) runlevels_install >/dev/null
-	fi
-
-	if use kernel_linux ; then
-		if use build || use bootstrap ; then
-			# Create base directories
-			if [[ ! -e ${ROOT}/dev/.udev && ! -e ${ROOT}/dev/.devfsd ]] ; then
-				einfo "Creating dev nodes"
-				PATH="${ROOT}"/sbin:${PATH} make -C "${T}" $(make_opts) \
-					dev || die "failed to create /dev nodes"
-			fi
-		fi
-	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
-
-	# 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
-		# We need to copy svcdir if it's empty
-		if [[ ! -e ${ROOT}lib/rcscripts/init.d/deptree ]] ; then
-			(
-			source "${ROOT}etc/conf.d/rc"
-			svcdir="${svcdir:-/var/lib/init.d}"
-			if [[ -e ${ROOT}${svcdir}/deptree ]] ; then
-				cp -RPp "${ROOT}${svcdir}"/* ${ROOT}lib/rcscripts/init.d
-			fi
-			)
-		fi
-
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh --update >/dev/null
-
-		# Regenerate /etc/modules.conf, else it will fail at next boot
-		if [[ -x /sbin/modules-update ]] ; then
-			einfo "Updating module dependencies..."
-			/sbin/modules-update force >/dev/null
-		fi
-	else
-		rm -f "${ROOT}"/etc/modules.conf
-	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"
-
-	local lo="net.lo0"
-	use kernel_linux && lo="net.lo"
-	for f in ${ROOT}etc/init.d/net.*; do
-		[[ -L ${f} ]] && 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 depreciated variables in ${ROOT}etc/conf.d/net"
-			ewarn "or ${ROOT}etc/conf.d/wireless"
-			ewarn
-			ewarn "domain_* -> dns_domain_*"
-			ewarn "nameservers_* -> dns_servers_*"
-			ewarn "searchdomains_* -> dns_search_domains_*"
-			ewarn
-			ewarn "They have been converted for you - ensure that you"
-			ewarn "update them via 'etc-update'"
-	fi
-
-	if sed -e 's/#.*//' "${ROOT}"etc/conf.d/net 2>/dev/null \
-		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
-			echo
-			ewarn "You are using deprecated variables in ${ROOT}etc/conf.d/net"
-			ewarn
-			ewarn "You are advised to review the new configuration variables as"
-			ewarn "found in ${ROOT}etc/conf.d/net.example as there is no"
-			ewarn "guarantee that they will work in future versions."
-	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
-
-	echo
-	einfo "baselayout-1.13 and higher have dropped the RC_STRICT_NET_CHECKING"
-	einfo "variable from /etc/conf.d/rc. ${lo} now provides \"net\" and so does"
-	einfo "each net script linked to it."
-	einfo "The net dependency is now satisfied by any net.* scripts in the default"
-	einfo "runlevel, otherwise it's the last net.* script running which includes"
-	einfo "${lo}. So if you need to restart a net script that is listed in the"
-	einfo "runlevel you are in and not restart anything that needs it then you"
-	einfo "will need to use the --nodeps command line option."
-
-	echo
-	ewarn "baselayout-1.13 and higher now force \$svcdir to be mounted ramdisk."
-	ewarn "If you downgrade to a lower version you'll need to copy the directory"
-	ewarn "  /$(get_libdir)/rcscripts/init.d"
-	ewarn "to \$svcdir as defined in /etc/conf.d/rc"
-	ewarn "  /var/lib/init.d (by default)"
-	ewarn "You should also erase /$(get_libdir)/rcscripts/init.d so that when you upgrade"
-	ewarn "again your current state is automatically copied across."
-}
diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch
deleted file mode 100644
index 84ecf7d52e24..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile	(revision 2359)
-+++ Makefile	(working copy)
-@@ -23,7 +23,7 @@
- 	/var/lock /var/run
- 
- ifeq ($(OS),Linux)
--	KEEP_DIRS += /dev /proc /sys
-+	KEEP_DIRS += /dev /sys
- 	NET_LO = net.lo
- endif
- ifneq ($(OS),Linux)
-Index: ChangeLog
-===================================================================
---- ChangeLog	(revision 2359)
-+++ ChangeLog	(working copy)
-@@ -1,6 +1,11 @@
- # ChangeLog for Gentoo System Intialization ("rc") scripts
- # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
- 
-+  05 Nov 2006; Roy Marples <uberlord@gentoo.org>:
-+
-+    Don't create /proc on Linux as build scripts like to handle it now.
-+    Fixes #154126.
-+
- * baselayout-1.13.0_alpha5 (02 Nov 2006)
- 
-   02 Nov 2006; Roy Marples <uberlord@gentoo.org>:
-Index: sbin/rc
-===================================================================
---- sbin/rc	(revision 2359)
-+++ sbin/rc	(working copy)
-@@ -267,7 +267,7 @@
- 
- 	for x in $(dolisting "${svcdir}/inactive/") \
- 	         $(dolisting "${svcdir}/started/") ; do
--		list="${list} ${x##*/}"
-+		list="${x##*/} ${list}"
- 	done
- 
- 	[[ -n ${list} ]] && reverse_list $(rc-depend -ineed -iuse -iafter ${list})
-@@ -442,7 +442,7 @@
- rm -rf "${svcdir}/failed" &>/dev/null
- 
- # If $svcdir is mounted in ram, save it back to disk and unmount
--if [[ $'\n'$(get_mounts) =~ $'\n'"${svcdir} " ]] ; then
-+if [[ $'\n'$(get_mounts) =~ $'\n'${svcdir}\  ]] ; then
- 	# Function to show the timeout message
- 	timeout=
- 	do_timeout() {
-Index: sbin/depscan.sh
-===================================================================
---- sbin/depscan.sh	(revision 2359)
-+++ sbin/depscan.sh	(working copy)
-@@ -149,6 +149,7 @@
- 	if [[ ${retval} == "0" ]] ; then
- 		DEPTREE="deptree"
- 		export DEPTREE
-+		cd /etc/init.d
- 		bash "${mysvcdir}/depcache" | \
- 			awk \
- 				-f /lib/rcscripts/awk/functions.awk \
-@@ -187,6 +188,7 @@
- 	if [[ ${retval} == "0" ]] ; then
- 		DEPTREE="netdeptree"
- 		export DEPTREE
-+		cd "${svclib}/net"
- 		bash "${mysvcdir}/netdepcache" | \
- 			awk \
- 				-f /lib/rcscripts/awk/functions.awk \
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5
deleted file mode 100644
index 1cb36c05fbb1..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e6ef285409b00b435121f9326eab2d1 baselayout-1.13.0_alpha5.tar.bz2 255507
-RMD160 bd0d391abd8cee745dfdce502d3ca78bdb7013f3 baselayout-1.13.0_alpha5.tar.bz2 255507
-SHA256 987e378072608480f956ff32a6c5851e98ac7c2c6653d18148bd66681592a23e baselayout-1.13.0_alpha5.tar.bz2 255507
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1
deleted file mode 100644
index 1cb36c05fbb1..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e6ef285409b00b435121f9326eab2d1 baselayout-1.13.0_alpha5.tar.bz2 255507
-RMD160 bd0d391abd8cee745dfdce502d3ca78bdb7013f3 baselayout-1.13.0_alpha5.tar.bz2 255507
-SHA256 987e378072608480f956ff32a6c5851e98ac7c2c6653d18148bd66681592a23e baselayout-1.13.0_alpha5.tar.bz2 255507
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha6 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha6
deleted file mode 100644
index cf700944bd9f..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 04830fcfde8679c4ecad38c941dd8a0f baselayout-1.13.0_alpha6.tar.bz2 253385
-RMD160 012a1488fa0e26c221fd9b5f08078cf581a80474 baselayout-1.13.0_alpha6.tar.bz2 253385
-SHA256 a67c2c05948a27772b919fe9e90a3a1e03eda0f682f8423afc83c5490e88776e baselayout-1.13.0_alpha6.tar.bz2 253385
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha7 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha7
deleted file mode 100644
index ef51f1ef240b..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4eb388094dfd110521c9adbbc22a78a7 baselayout-1.13.0_alpha7.tar.bz2 251963
-RMD160 e29e1eba3ff47eab72979ebe991b17312e2bb891 baselayout-1.13.0_alpha7.tar.bz2 251963
-SHA256 75ddf9c0c50baa5538a5d30d7e4125c6ad283ae5b598403a4625fdee081e3eef baselayout-1.13.0_alpha7.tar.bz2 251963