Prune older ebuilds for bug 48353

24 files changed, 9 insertions, 7839 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 633f7d6915a4..5e805598fe19 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,18 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.129 2004/04/16 04:00:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.130 2004/04/19 22:39:45 agriffis Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+  19 Apr 2004; Aron Griffis <agriffis@gentoo.org> baselayout-1.8.10.ebuild,
+  baselayout-1.8.5.9.ebuild, baselayout-1.8.6.10-r1.ebuild,
+  baselayout-1.8.6.12-r2.ebuild, baselayout-1.8.6.12-r3.ebuild,
+  baselayout-1.8.6.12-r4.ebuild, baselayout-1.8.6.12-r5.ebuild,
+  baselayout-1.8.6.8-r1.ebuild, baselayout-1.8.7.ebuild,
+  baselayout-1.8.8.ebuild, baselayout-1.8.9.ebuild, files/MAKEDEV.8:
+  Prune older ebuilds for bug 48353
+
 *baselayout-1.8.11 (15 Apr 2004)
 
   15 Apr 2004; Aron Griffis <agriffis@gentoo.org> +baselayout-1.8.11.ebuild:
diff --git a/sys-apps/baselayout/baselayout-1.8.10.ebuild b/sys-apps/baselayout/baselayout-1.8.10.ebuild
deleted file mode 100644
index fecb68ad77fb..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.10.ebuild
+++ /dev/null
@@ -1,555 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.10.ebuild,v 1.1 2004/04/14 18:03:51 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="bootstrap build livecd static selinux"
-
-SV="1.4.8"		# rc-scripts version
-SVREV=			# rc-scripts rev
-SVIV="2.84"		# sysvinit version
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}"
-DESCRIPTION="Base layout for Gentoo Linux (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa ia64 ppc64 s390"
-
-DEPEND="virtual/os-headers
-	selinux? ( sys-libs/libselinux )"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? !bootstrap? (
-		>=sys-apps/gawk-3.1.1-r2
-		>=sys-apps/util-linux-2.11z-r6
-	)"
-
-src_unpack() {
-	unpack ${A}
-
-	#
-	# Baselayout setup
-	#
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [[ ${ARCH} == sparc ]]; then
-		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf || die
-	fi
-
-	# Add serial console for arches that typically have it
-	case ${ARCH} in
-		sparc|mips|hppa|alpha|ia64)
-			sed -i -e \
-				's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab || die
-			;;
-	esac
-
-	#
-	# sysvinit setup
-	#
-	if ! use build; then
-		cd ${S2}/src
-
-		# Note that if sysvinit is ever built with USE=build, need to
-		# refrain from building sulogin as it needs libcrypt which is
-		# not in the build image:
-		# sed -i -e '/^PROGS/s/ sulogin//' Makefile || die
-
-		# Selinux patch for sysvinit
-		if use selinux; then
-			if has_version '>=sys-libs/libselinux-1.6'; then
-				epatch ${FILESDIR}/sysvinit-${SVIV}-selinux1.patch
-			else
-				epatch ${FILESDIR}/sysvinit-${SVIV}-selinux.patch
-			fi
-		fi
-	fi
-
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if ! use build; then
-		# Build sysvinit stuff
-		cd ${S2}/src
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" || die "problem compiling sysvinit"
-	else
-		einfo "Not building sysvinit because USE=build"
-	fi
-}
-
-# ${PATH} should include where to get MAKEDEV when calling this
-# function
-create_dev_nodes() {
-
-	case ${ARCH} in
-		# amd64 must use generic-i386 because amd64/x86_64 does not have
-		# a generic option at this time, and the default 'generic' ends
-		# up erroring out, because MAKEDEV internally doesn't know what
-		# to use
-		amd64)	suffix=-i386 ;;
-		x86)	suffix=-i386 ;;
-		ppc*)	suffix=-powerpc ;;
-		alpha)	suffix=-alpha ;;
-		ia64)	suffix=-ia64 ;;
-		sparc*)	suffix=-sparc ;;
-		mips)	suffix=-mips ;;
-		arm)	suffix=-arm ;;
-		hppa)	suffix=-hppa ;;
-	esac
-
-	einfo "Using generic${suffix} to make ${ARCH} device nodes..."
-	MAKEDEV generic${suffix}
-	MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
-}
-
-# This is a temporary workaround until bug 9849 is completely solved
-# in portage.  We need to create the directories so they're available
-# during src_install, but when src_install is finished, call unkdir
-# to remove any empty directories instead of leaving them around.
-kdir() {
-	typeset -a args
-	typeset d
-
-	# Create the directories for the remainder of src_install, and
-	# remember how to create the directories later.
-	for d in "$@"; do
-		if [[ $d == /* ]]; then
-			install -d "${args[@]}" "${D}/${d}"
-			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
-	|| ewarn "  can't create ${d}"
-touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
-	|| ewarn "  can't create ${d}/.keep"
-EOF
-		else
-			args=("${args[@]}" "${d}")
-		fi
-	done
-}
-
-# Continued from kdir above...  This function removes any empty
-# directories as a temporary workaround for bug 9849.  The directories
-# (and .keep files) are re-created in pkg_postinst, which means they
-# aren't listed in CONTENTS, unfortunately.
-unkdir() {
-	einfo "Running unkdir to workaround bug 9849"
-	find ${D} -depth -type d -exec rmdir {} \; 2>/dev/null
-	if [[ $? == 127 ]]; then
-		ewarn "Problem running unkdir: find command not found"
-	fi
-}
-
-src_install() {
-	local foo bar
-
-	# ROOT is purged from the environment prior to calling
-	# src_install.  Good thing we saved it in a temporary file.
-	# Otherwise ROOT will be NULL, which hopefully is correct!
-	# (I don't know why it was in the environment in the first
-	# place... could have just used a shell variable?)
-	if [[ -f ${T}/ROOT ]]; then
-		ROOT=$(cat ${T}/ROOT)
-	fi
-
-	# This directory is to stash away things that will be used in
-	# pkg_postinst
-	dodir /usr/share/baselayout
-
-	einfo "Creating directories..."
-	kdir /boot
-	kdir /dev
-	kdir /dev/pts
-	kdir /dev/shm
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/devfs.d
-	kdir /etc/env.d
-	kdir /etc/modules.autoload.d
-	kdir /etc/modules.d
-	kdir /etc/opt
-	kdir /home
-	kdir /lib
-	kdir /lib/dev-state
-	kdir /lib/udev-state
-	kdir /mnt
-	kdir -m 0700 /mnt/cdrom
-	kdir -m 0700 /mnt/floppy
-	kdir /opt
-	kdir -o root -g uucp -m0755 /var/lock
-	kdir /proc
-	kdir -m 0700 /root
-	kdir /sbin
-	kdir /usr
-	kdir /usr/bin
-	kdir /usr/include
-	kdir /usr/include/asm
-	kdir /usr/include/linux
-	kdir /usr/lib
-	kdir /usr/local/bin
-	kdir /usr/local/games
-	kdir /usr/local/lib
-	kdir /usr/local/sbin
-	kdir /usr/local/share
-	kdir /usr/local/share/doc
-	kdir /usr/local/share/man
-	kdir /usr/local/src
-	kdir /usr/portage
-	kdir /usr/sbin
-	kdir /usr/share/doc
-	kdir /usr/share/info
-	kdir /usr/share/man
-	kdir /usr/share/misc
-	kdir /usr/src
-	kdir /usr/X11R6/include/GL
-	kdir /usr/X11R6/include/X11
-	kdir /usr/X11R6/lib
-	kdir /usr/X11R6/lib
-	kdir /usr/X11R6/man
-	kdir /usr/X11R6/share
-	kdir -m 1777 /tmp
-	kdir /var
-	kdir /var/lib/misc
-	kdir /var/lock/subsys
-	kdir /var/log/news
-	kdir /var/run
-	kdir /var/spool
-	kdir /var/state
-	kdir -m 1777 /var/tmp
-
-	dodir /etc/init.d		# .keep file might mess up init.d stuff
-	dodir /var/db/pkg		# .keep file messes up Portage when looking in /var/db/pkg
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [[ ${ARCH} == amd64 || ${ARCH} == ppc64 ]]; then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym ../var/tmp /usr/tmp
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# Symlink /boot/boot to . so that /boot can be a separate
-	# filesystem and config files still work
-	dosym . /boot/boot
-
-	#
-	# Setup files in /etc
-	#
-	dosym  ../proc/filesystems /etc/filesystems
-
-	insopts -m0644
-	insinto /etc
-	find ${S}/etc -type f -maxdepth 1 -print0 | xargs --null doins
-
-	fperms 0600 /etc/shadow
-
-	exeinto /etc/init.d
-	doexe ${S}/init.d/*
-	insinto /etc/conf.d
-	doins ${S}/etc/conf.d/*
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/*
-	insinto /etc/modules.autoload.d
-	doins ${S}/etc/modules.autoload.d/*
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/*
-	insinto /etc/skel
-	find ${S}/etc/skel -type f -maxdepth 1 -print0 | xargs --null doins
-
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*	# now ships with net-dialup/ppp
-
-	# Set up default runlevel symlinks
-	if [[ ${ROOT} != / ]]; then
-		for foo in default boot nonetwork single; do
-			kdir /etc/runlevels/${foo}
-			for bar in $(cat ${S}/rc-lists/${foo}); do
-				[[ -e ${S}/init.d/${bar} ]] && \
-					dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-			done
-		done
-	fi
-
-	# We do not want to overwrite the user's settings during
-	# bootstrap;  put this somewhere for safekeeping until pkg_postinst
-	mv ${D}/etc/hosts ${D}/usr/share/baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
-
-	#
-	# Setup files related to /dev
-	#
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	dosym ../sbin/MAKEDEV /dev/MAKEDEV
-
-	if use build || use bootstrap || \
-			[[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
-		# Ok, create temp device nodes
-		mkdir -p "${T}/udev-$$"
-		cd "${T}/udev-$$"
-		echo
-		einfo "Making device nodes (this could take a minute or so...)"
-		PATH="${D}/sbin:${PATH}" create_dev_nodes
-
-		# Now create tarball that can also be used for udev.
-		# Need GNU tar for -j so call it by absolute path.
-		/bin/tar -cjlpf "${T}/devices-$$.tar.bz2" *
-		insinto /lib/udev-state
-		newins "${T}/devices-$$.tar.bz2" devices.tar.bz2
-	fi
-
-	#
-	# Setup files in /bin
-	#
-	cd ${S}/bin
-	dobin rc-status
-
-	#
-	# Setup files in /sbin
-	#
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-	use livecd && dosbin livecd-functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	#
-	# Setup files in /lib/rcsripts/sh
-	#
-	cd ${S}/sbin
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if ! use build; then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		cd ${S}/sbin
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		doins ${S}/src/awk/*.awk
-	fi
-
-	#
-	# Install baselayout documentation
-	#
-	doman ${S}/man/*.*
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	#
-	# Install baselayout utilities
-	#
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	#
-	# Install sysvinit
-	#
-	if ! use build; then
-		cd ${S2}/src
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-		insinto /usr/include
-		doins initreq.h
-		# sysvinit docs
-		cd ${S2}
-		doman man/*.[1-9]
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	# Hack to fix bug 9849, continued in pkg_postinst
-	unkdir
-}
-
-pkg_preinst() {
-	if [[ -f ${ROOT}/etc/modules.autoload && \
-			! -d ${ROOT}/etc/modules.autoload.d ]]; then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	if [[ -f "${ROOT}/lib/udev-state/devices.tar.bz2" &&
-			-e "${ROOT}/dev/.udev" ]]; then
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2.current"
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files"
-	source ${ROOT}/usr/share/baselayout/mkdirs.sh
-
-	if [[ -f "${ROOT}/lib/udev-state/devices.tar.bz2.current" ]]; then
-		# Rather use our current device tarball ... this was saved off
-		# in pkg_preinst
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2.current" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2"
-	else
-		# Make sure our tarball does not get removed; update the
-		# timestamp so that it doesn't match CONTENTS
-		touch "${ROOT}/lib/udev-state/devices.tar.bz2"
-	fi
-
-	# We don't want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	if use build || use bootstrap; then
-		if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then
-			einfo "Populating /dev with device nodes..."
-			cd ${ROOT}/dev
-			if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]; then
-				tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
-			else
-				# devices.tar.bz2 will not exist with binary packages ...
-				PATH="${ROOT}/sbin:${PATH}" create_dev_nodes
-			fi
-		fi
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if ! use build && ! use bootstrap; then
-		einfo "Removing invalid backup copies of critical config files..."
-		rm -f "${ROOT}"/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null
-
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh &>/dev/null
-
-		# Regenerate /etc/modules.conf, else it will fail at next boot
-		einfo "Updating module dependencies..."
-		/sbin/modules-update force &>/dev/null
-	else
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && \
-	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
-	then
-		if /usr/sbin/grpck -r &>/dev/null; then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
-	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
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.5.9.ebuild b/sys-apps/baselayout/baselayout-1.8.5.9.ebuild
deleted file mode 100644
index fe185e15cbeb..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.5.9.ebuild
+++ /dev/null
@@ -1,564 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.9.ebuild,v 1.12 2004/04/07 17:41:57 agriffis Exp $
-
-IUSE="bootstrap build"
-
-SV="1.4.2.9"
-SVREV=
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa "
-
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.23"
-# We need at least portage-2.0.23 to handle these DEPEND's properly.
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )"
-
-
-# This ebuild needs to be merged "live".  You can't simply make a package
-# of it and merge it later.
-
-pkg_setup() {
-
-	if [ "${ROOT}" = "/" ]
-	then
-		# Make sure we do not kill X because of the earlier bad /etc/inittab we used.
-		if [ -L ${svcdir}/started/xdm ] && \
-		   [ -n "`egrep 'x:3:respawn:/etc/X11/startDM.sh' /etc/inittab`" ] && \
-		   [ -n "`ps -A | egrep "X"`" ]
-		then
-			echo
-		   	einfo "!!! With the current version of baselayout installed (1.7.3-r1), merging"
-			einfo "    this version of baselayout will cause X to die if you started it"
-			einfo "    with the /etc/init.d/xdm script!!!!"
-			echo
-			einfo "Please quit X and then merge this again."
-			die
-		fi
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cd ${S}/etc
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sun":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-
-		cp inittab inittab.orig
-		sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-			inittab.orig > inittab || die
-		rm -f inittab.orig
-	fi
-
-	# Fix mips specific stuff
-	if [ "${ARCH}" = "mips" ]
-	then
-		cd ${S}/etc
-		cp inittab inittab.orig
-		sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-		rm -f inittab.orig
-	fi
-}
-
-src_compile() {
-
-	cp ${S}/sbin/runscript.c ${T}
-	cp ${S}/sbin/start-stop-daemon.c ${T}
-
-	cd ${T}
-	gcc ${CFLAGS} runscript.c -o runscript || die "cant compile runscript.c"
-	gcc ${CFLAGS} start-stop-daemon.c -o start-stop-daemon || die "cant compile start-stop-daemon.c"
-	echo ${ROOT} > ${T}/ROOT
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake LDFLAGS="" || die "problem compiling sysvinit"
-
-		if [ -z "`use bootstrap`" ]
-		then
-			if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ]
-			then
-				# Build gawk module
-				cd ${S}/src
-				einfo "Building awk module..."
-				make || {
-					eerror "Failed to build gawk module.  Make sure you have"
-					eerror "sys-apps/gawk-3.1.1-r1 or later installed"
-					die "problem compiling gawk module"
-				}
-			fi
-		fi
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	local ROOT=""
-	ROOT="`cat ${T}/ROOT`"
-	if [ -e ${ROOT}/dev/.devfsd ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-
-src_install() {
-
-	local foo=""
-	defaltmerge
-	keepdir /sbin /usr/sbin
-	exeinto /sbin
-	doexe ${T}/runscript
-	doexe ${T}/start-stop-daemon
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	doexe ${S}/sbin/modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-
-	keepdir /usr
-	keepdir /usr/bin
-	keepdir /usr/lib
-	# Dont install run-crons anymore, as sys-apps/cronbase installs it now
-	#dosbin ${S}/sbin/MAKEDEV ${S}/sbin/run-crons
-	dosbin ${S}/sbin/MAKEDEV
-	keepdir /var /var/run /var/lock/subsys /var/state
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src /usr/portage
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	keepdir /usr/X11R6/share
-	dosym ../../share/info	/usr/X11R6/share/info
-	# End FHS compatibility symlinks stuff
-
-	for foo in doman ${FILESDIR}/MAKEDEV.8 ${S}/man/*
-	do
-		[ -f ${foo} ] && doman ${foo}
-	done
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-	keepdir /usr/X11R6/lib /usr/X11R6/man
-	keepdir /var/log/news
-
-	# Supervise stuff depreciated
-	#dodir /var/lib/supervise
-	#install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/control
-	#install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/services
-	# End supervise stuff
-
-	keepdir /opt
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	keepdir /var/spool /var/tmp /var/lib/misc
-	chmod 1777 ${D}/var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	chmod go-rx ${D}/root
-	keepdir /tmp /var/lock
-	chmod 1777 ${D}/tmp
-	chmod 1777 ${D}/var/tmp
-	chown root:uucp ${D}/var/lock
-	chmod 775 ${D}/var/lock
-	insopts -m0644
-
-	# Bug #5359 (FHS complience)
-	keepdir /etc/opt
-
-	insinto /etc
-	ln -s ../proc/filesystems ${D}/etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f ${foo} ] && doins ${foo}
-	done
-	chmod go-rwx ${D}/etc/shadow
-	keepdir /lib /mnt/floppy /mnt/cdrom
-	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
-
-	keepdir /lib/dev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		dosym /usr/sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-	else
-		# Normal
-		keepdir /dev
-		keepdir /dev/pts /dev/shm
-		dosym /usr/sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-
-		# SysvInit docs
-		cd ${S2}/../
-		doman man/*.[1-9]
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f ${foo} ] && doexe ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	exeinto /sbin
-	doexe ${S}/sbin/runscript.sh
-	doexe ${S}/sbin/functions.sh
-	cp ${S}/sbin/functions.sh ${S}/sbin/functions.sh.orig
-	sed '/logger/s: \$\*: "$*":' < ${S}/sbin/functions.sh.orig > ${S}/sbin/functions.sh 2>/dev/null
-	rm -f ${S}/sbin/functions.sh.orig
-
-	doexe ${S}/sbin/rc-daemon.sh
-	doexe ${S}/sbin/rc-help.sh
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym /sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym /sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym /sbin/functions.sh /etc/init.d/functions.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# This is for new depscan and rc-envupdate.sh
-		# written in awk
-		exeinto /sbin
-		doexe ${S}/sbin/depscan.sh
-		doexe ${S}/sbin/rc-envupdate.sh
-		exeinto /lib/rcscripts
-		doexe ${S}/src/filefuncs.so
-		insinto /lib/rcscripts/awk
-		doins ${S}/src/awk/*.awk
-	else
-		# This is the old bash ones
-		exeinto /sbin
-		newexe ${S}/sbin/depscan.sh.bash depscan.sh
-		newexe ${S}/sbin/rc-envupdate.sh.bash rc-envupdate.sh
-	fi
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	local bar=""
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e ${S}/init.d/${bar} ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	# Make sure symlinks of these get installed.
-	if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/depscan.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/depscan.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/runscript.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/runscript.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/functions.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/functions.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/functions.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/rc-help.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/rc-help.sh
-	fi
-
-	# This one was borked, so make sure fixed one gets installed.
-	if [ -L ${ROOT}/usr/lib/X11 ]
-	then
-		rm -f ${ROOT}/usr/lib/X11
-	fi
-}
-
-pkg_postinst() {
-
-	# Doing device node creation in pkg_postinst() now so they aren't recorded in CONTENTS.
-	# latest CVS-only version of Portage doesn't record device nodes in CONTENTS at all.
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	if [ "${altmerge}" -eq "0" ]
-	then
-		cd ${ROOT}/dev
-		# These devices are also needed by many people and should be included
-		einfo "Making device nodes (this could take a minute or so...)"
-
-		case ${ARCH} in
-			x86)
-				einfo "Using generic-i386 to make device nodes..."
-				${ROOT}/usr/sbin/MAKEDEV generic-i386
-				;;
-			ppc)
-				einfo "Using generic-powerpc to make device nodes..."
-				${ROOT}/usr/sbin/MAKEDEV generic-powerpc
-				;;
-			sparc)
-				einfo "Using generic-sparc to make device nodes..."
-				${ROOT}/usr/sbin/MAKEDEV generic-sparc
-				;;
-			mips)
-				einfo "Using generic-mips to make device nodes..."
-				${ROOT}/usr/sbin/MAKEDEV generic-mips
-				;;
-			*)
-				einfo "Using generic-i386 to make device nodes..."
-				${ROOT}/usr/sbin/MAKEDEV generic-i386
-				;;
-		esac
-
-		${ROOT}/usr/sbin/MAKEDEV sg
-		${ROOT}/usr/sbin/MAKEDEV scd
-		${ROOT}/usr/sbin/MAKEDEV rtc
-		${ROOT}/usr/sbin/MAKEDEV audio
-		${ROOT}/usr/sbin/MAKEDEV hde
-		${ROOT}/usr/sbin/MAKEDEV hdf
-		${ROOT}/usr/sbin/MAKEDEV hdg
-		${ROOT}/usr/sbin/MAKEDEV hdh
-	fi
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	local x=""
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-
-	# Handle the ${svcdir} that changed in location
-	if [ ! -d ${ROOT}/${svcdir}/started/ ] && \
-	   [ -z "`use bootstrap`" -a -z "`use build`" ]
-	then
-		mkdir -p ${ROOT}/${svcdir}
-		mount -t tmpfs tmpfs ${ROOT}/${svcdir}
-		if [ -d ${ROOT}/dev/shm/.init.d ]
-		then
-			cp -ax ${ROOT}/dev/shm/.init.d/. ${ROOT}/${svcdir}
-		fi
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f ${ROOT}/etc/modules.conf ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	einfo "Please note that /sbin/update-modules moved to /sbin/modules-update"
-	einfo "for consistency reasons."
-	echo
-}
-
-pkg_postrm() {
-
-	# Fix problematic links
-	ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-	ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
-	ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
-}
diff --git a/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
deleted file mode 100644
index f04caa4a7055..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
+++ /dev/null
@@ -1,727 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild,v 1.15 2004/04/07 17:41:57 agriffis Exp $
-
-# This ebuild needs to be merged "live".  You can't simply make a package
-# of it and merge it later.
-
-# with hardened-gcc-2.4.2 we do not need the -lc and libs any more for fstack-protector when building static
-
-IUSE="bootstrap build static"
-
-SV="1.4.3.10"
-SVREV="p1"
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa ia64"
-
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.23"
-# We need at least portage-2.0.23 to handle these DEPEND's properly.
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )
-	!build? ( !bootstrap? ( >=sys-apps/util-linux-2.11z-r6 ) )"
-# We want a dhcpcd that supports the '-z' switch, but only if dhcpcd
-# was already installed ...
-if portageq has_version / net-misc/dhcpcd
-then
-	PDEPEND="!build? ( !bootstrap? ( >=net-misc/dhcpcd-1.3.22_p4-r1 ) )"
-fi
-
-src_unpack() {
-
-	unpack ${A}
-
-	use static && export LDFLAGS="-static"
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-	fi
-
-	# Add serial console ...
-	case ${ARCH} in
-		sparc|mips|hppa)
-			cp inittab inittab.orig
-			sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-			rm -f inittab.orig
-			;;
-	esac
-
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Sanity check to see if has version works
-		if has_version '>=sys-apps/baselayout-1.8' &> /dev/null
-		then
-			einfo "Checking if we need to tweak CONFIG_PROTECT_MASK"
-			# Make sure user get things updated first time he merge 1.8.6 ...
-			if ! has_version '>=sys-apps/baselayout-1.8.6' &> /dev/null
-			then
-				touch "${WORKDIR}/update_init_d"
-			fi
-		fi
-	fi
-}
-
-src_compile() {
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
-
-		if [ -z "`use bootstrap`" ]
-		then
-			# We let gawk now install filefuncs.so, and that is as a symlink to a
-			# versioned .so ...
-			if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ]
-			then
-				# Build gawk module
-#				cd ${S}/src/filefuncs
-#				einfo "Building awk module..."
-#				make CC="${CC:-gcc}" LD="${CC:-gcc}" || {
-#					eerror "Failed to build gawk module.  Make sure you have"
-#					eerror "sys-apps/gawk-3.1.1-r1 or later installed"
-#					die "problem compiling gawk module"
-#				}
-
-				eerror "Please install sys-apps/gawk-3.1.1-r2 or later!"
-				die "gawk too old"
-			fi
-		fi
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	local ROOT=""
-	ROOT="`cat ${T}/ROOT`"
-	if [ -e ${ROOT}/dev/.devfsd ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-# Only do a keepdir on mounts if they are not mounted ...
-keepdir_mount() {
-	local x=
-	local y=
-	local doit=0
-
-	[ -z "$1" ] && return 1
-
-	[ ! -e /proc/mounts ] && return 1
-
-	for y in $*
-	do
-		doit=0
-
-		for x in $(gawk '{print $2}' /proc/mounts)
-		do
-			[ "${x}" = "${y}" ] && doit=1
-		done
-
-		if [ "${doit}" -eq 0 ]
-		then
-			keepdir "${y}"
-		fi
-	done
-
-	return 0
-}
-
-src_install() {
-
-	local bar=
-	local foo=
-
-	defaltmerge
-	keepdir /sbin /usr/sbin
-
-	keepdir_mount /usr
-	keepdir /usr/bin
-	keepdir /lib /usr/lib
-	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
-	keepdir /var/log/news
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
-
-	# If it already exist, do not recreate, else we get
-	# problems when /usr/portage mounted as ro NFS, etc.
-	keepdir_mount /usr/portage
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	# End FHS compatibility symlinks stuff
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	chmod 1777 ${D}/var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	chmod go-rx ${D}/root
-	keepdir /tmp /var/lock
-	chmod 1777 ${D}/tmp
-	chmod 1777 ${D}/var/tmp
-	chown root:uucp ${D}/var/lock
-	chmod 775 ${D}/var/lock
-	insopts -m0644
-
-	keepdir /opt /etc/opt
-
-	insinto /etc
-	ln -s ../proc/filesystems ${D}/etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f ${foo} ] && doins ${foo}
-	done
-	chmod go-rwx ${D}/etc/shadow
-	# We do not want to overwrite the user's settings
-	[ -f "${ROOT}/etc/hosts" ] && rm -f ${D}/etc/hosts
-
-	keepdir_mount /mnt/floppy /mnt/cdrom
-	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
-
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	keepdir /lib/dev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-	else
-		# Normal
-		keepdir /dev
-		keepdir_mount /dev/pts /dev/shm
-		dosym ../sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-	cd ${S}/bin
-	dobin rc-status
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f ${foo} ] && doexe ${foo}
-	done
-
-	cd ${S}/sbin
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" ]
-	then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		for foo in ${S}/src/awk/*.awk
-		do
-			[ -f ${foo} ] && doins ${foo}
-		done
-
-#		if [ ! -L ${ROOT}/lib/rcscripts/filefuncs.so ]
-#		then
-#			exeinto /lib/rcscripts
-#			doexe ${S}/src/filefuncs/filefuncs.so
-#		fi
-	fi
-
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-
-		# SysvInit docs
-		cd ${S2}/../
-		for foo in ${S2}/../man/*.[1-9]
-		do
-			[ -f ${foo} ] && doman ${foo}
-		done
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	for foo in ${S}/man/*
-	do
-		[ -f ${foo} ] && doman ${foo}
-	done
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.autoload.d
-	insinto /etc/modules.autoload.d
-	for foo in in ${S}/etc/modules.autoload.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e ${S}/init.d/${bar} ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	# Make sure symlinks of these get installed.
-	if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/depscan.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/depscan.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/runscript.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/runscript.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/functions.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/functions.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/functions.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/rc-help.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/rc-help.sh
-	fi
-
-	# This one was borked, so make sure fixed one gets installed.
-	if [ -L ${ROOT}/usr/lib/X11 ]
-	then
-		rm -f ${ROOT}/usr/lib/X11
-	fi
-
-	if [ -f ${ROOT}/etc/modules.autoload -a ! -d ${ROOT}/etc/modules.autoload.d ]
-	then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	# Make sure user get things updated first time he merge 1.8.6 ...
-	if [ -f "${WORKDIR}/update_init_d" ]
-	then
-		# Update CONFIG_PROTECT_MASK to exclude /etc/init.d from
-		# CONFIG_PROTECT ...
-		ewarn "Changing CONFIG_PROTECT_MASK to ensure critical files are updated ..."
-		echo "CONFIG_PROTECT_MASK=\"/etc/init.d\"" \
-			> ${ROOT}/etc/env.d/99foo
-		env-update &> /dev/null
-		export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}:/etc/init.d"
-
-		if [ -d "${ROOT}/etc/init.d" ]
-		then
-			# Backup /etc/init.d if it exists ...
-			einfo "Backing up /etc/init.d ..."
-			cp -af "${ROOT}/etc/init.d" "${ROOT}/etc/init_d.old"
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	echo
-	# Doing device node creation in pkg_postinst() now so they aren't recorded
-	# in CONTENTS.  Latest CVS-only version of Portage doesn't record device
-	# nodes in CONTENTS at all.
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	if [ "${altmerge}" -eq "0" -a ! -e ${ROOT}/dev/.devfsd ]
-	then
-		cd ${ROOT}/dev
-		# These devices are also needed by many people and should be included
-		einfo "Making device nodes (this could take a minute or so...)"
-
-		case ${ARCH} in
-			amd64)
-				einfo "Using generic-i386 to make amd64 device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-i386
-				;;
-			x86)
-				einfo "Using generic-i386 to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-i386
-				;;
-			ppc)
-				einfo "Using generic-powerpc to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-powerpc
-				;;
-			sparc)
-				einfo "Using generic-sparc to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-sparc
-				;;
-			mips)
-				einfo "Using generic-mips to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-mips
-				;;
-			arm)
-				einfo "Using generic-arm to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-arm
-				;;
-			hppa)
-				einfo "Using generic-hppa to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-hppa
-				;;
-			*)
-				einfo "Using generic to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic
-				;;
-		esac
-
-		${ROOT}/sbin/MAKEDEV sg
-		${ROOT}/sbin/MAKEDEV scd
-		${ROOT}/sbin/MAKEDEV rtc
-		${ROOT}/sbin/MAKEDEV audio
-		${ROOT}/sbin/MAKEDEV hde
-		${ROOT}/sbin/MAKEDEV hdf
-		${ROOT}/sbin/MAKEDEV hdg
-		${ROOT}/sbin/MAKEDEV hdh
-	fi
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	touch ${ROOT}/boot/.keep
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-# IPV6 versions of localhost and co
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	local x=""
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-	# Make sure we get everything ready for $svcdir that moved to
-	# /var/lib/init.d ....
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		local oldsvcdir="${svcdir}"
-		local rcconfd="/etc/conf.d/rc"
-		local inittab="/etc/inittab"
-
-		# Remove old backup /etc/conf.d/rc files ...
-		rm -f ${ROOT}/etc/conf.d/._cfg????_rc
-		# Remove old backup /etc/inittab files ...
-		rm -f ${ROOT}/etc/._cfg????_inittab
-
-		# Replace and backup /etc/conf.d/rc (unless already in new format)
-		if [ -f "${ROOT}/${rcconfd}" ] && \
-		   ([ -z "$(grep '^svcmount' "${ROOT}/${rcconfd}")" ] || \
-		    [ -z "$(grep '^svcdir=\"\/var\/lib\/init.d\"' "${ROOT}/${rcconfd}")" ])
-			#svcdir="/var/lib/init.d"
-		then
-			ewarn "Backing up your old /etc/conf.d/rc, and replacing with new!"
-			ewarn "This is needed, as \$svcdir moved from /mnt/.init.d to"
-			ewarn "/var/state/init.d"
-			echo
-			cp -f "${ROOT}/${rcconfd}" "${ROOT}/${rcconfd}.old"
-			cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}"
-		fi
-
-		# Replace and backup /etc/inittab (unless already in new format)
-		if [ -f "${ROOT}/${inittab}" ] && \
-		   [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ]
-		then
-			ewarn "Backing up your old /etc/inittab, and replacing with new!"
-			ewarn "This is needed, as there were critical changes to /sbin/rc"
-			echo
-			cp -f "${ROOT}/${inittab}" "${ROOT}/${inittab}.old"
-			cp -f "${S}/${inittab}" "${ROOT}/${inittab}"
-		fi
-
-		source ${ROOT}/etc/conf.d/rc
-
-		# Handle the ${svcdir} that changed in location
-		if [ ! -d "${ROOT}/${svcdir}/started" ]
-		then
-			einfo "Trying to move SVCDIR to new location..."
-			echo
-			mkdir -p "${ROOT}/${svcdir}"
-#			mount -t tmpfs tmpfs ${ROOT}/${svcdir}
-			if [ -d "${ROOT}/${oldsvcdir}/started" ]
-			then
-				cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}"
-
-			elif [ -d "${ROOT}/mnt/.init.d/started" ]
-			then
-				cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}"
-			fi
-		fi
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		/sbin/depscan.sh &>/dev/null
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f ${ROOT}/etc/modules.conf ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated,"
-	ewarn "else things might break at your next reboot!  You can use 'etc-update'"
-	ewarn "to accomplish this:"
-	echo
-	ewarn "  # etc-update"
-	echo
-
-	if [ -f "${ROOT}/etc/env.d/99foo" ]
-	then
-		echo
-		ewarn "Due to large changes from 1.8.5 to 1.8.6, all your files in /etc/init.d"
-		ewarn "have been updated automatically.  If you did make any changes directly"
-		ewarn "to your old files, they can be found in /etc/init_d.old.  Please just"
-		ewarn "make sure to edit the new files, and not just copy the old over!"
-		echo
-
-		rm -f "${ROOT}/etc/env.d/99foo"
-	fi
-
-	echo
-	einfo "Please note that /sbin/update-modules moved to /sbin/modules-update"
-	einfo "for consistency reasons."
-	echo
-
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 8
-}
-
-pkg_postrm() {
-
-	# Fix problematic links
-	ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-	ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
-	ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild
deleted file mode 100644
index de44a4ad4e49..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild
+++ /dev/null
@@ -1,750 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild,v 1.12 2004/02/23 00:38:29 agriffis Exp $
-
-# This ebuild needs to be merged "live".  You can't simply make a package
-# of it and merge it later.
-
-IUSE="bootstrap build selinux static"
-
-SV="1.4.3.12"
-SVREV="p1"
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ppc64"
-
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.23
-	selinux? ( sys-libs/libselinux )"
-# We need at least portage-2.0.23 to handle these DEPEND's properly.
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )
-	!build? ( !bootstrap? ( >=sys-apps/util-linux-2.11z-r6 ) )"
-# We want a dhcpcd that supports the '-z' switch, but only if dhcpcd
-# was already installed ...
-if portageq has_version / net-misc/dhcpcd
-then
-	PDEPEND="!build? ( !bootstrap? ( >=net-misc/dhcpcd-1.3.22_p4-r1 ) )"
-fi
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-	# Selinux
-	use selinux && epatch ${FILESDIR}/sysvinit-${SVIV}-selinux.patch
-
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-	fi
-
-	# Add serial console ...
-	case ${ARCH} in
-		sparc|mips|hppa)
-			cp inittab inittab.orig
-			sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-			rm -f inittab.orig
-			;;
-	esac
-
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Sanity check to see if has version works
-		if has_version '>=sys-apps/baselayout-1.8' &> /dev/null
-		then
-			einfo "Checking if we need to tweak CONFIG_PROTECT_MASK"
-			# Make sure user get things updated first time he merge 1.8.6 ...
-			if ! has_version '>=sys-apps/baselayout-1.8.6' &> /dev/null
-			then
-				touch "${WORKDIR}/update_init_d"
-			fi
-		fi
-	fi
-}
-
-src_compile() {
-
-	use static && export LDFLAGS="-static"
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	local ROOT=""
-	ROOT="`cat ${T}/ROOT`"
-	if [ -e ${ROOT}/dev/.devfsd ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-# Only do a keepdir on mounts if they are not mounted ...
-keepdir_mount() {
-	local x=
-	local y=
-	local doit=0
-
-	[ -z "$1" ] && return 1
-
-	[ ! -e /proc/mounts ] && return 1
-
-	for y in $*
-	do
-		doit=0
-
-		for x in $(gawk '{print $2}' /proc/mounts)
-		do
-			[ "${x}" = "${y}" ] && doit=1
-		done
-
-		if [ "${doit}" -ne 1 ]
-		then
-			keepdir "${y}"
-		fi
-	done
-
-	return 0
-}
-
-create_dev_nodes() {
-	export PATH="${D}/sbin:${PATH}"
-
-	case ${ARCH} in
-		amd64)
-			# amd64 must use generic-i386 because amd64/x86_64 does not have
-			# a generic option at this time, and the default 'generic' ends
-			# up erroring out, because MAKEDEV internally doesn't know what
-			# to use
-			einfo "Using generic-i386 to make amd64 device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
-			;;
-		x86)
-			einfo "Using generic-i386 to make device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
-			;;
-		ppc)
-			einfo "Using generic-powerpc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-powerpc
-			;;
-		sparc)
-			einfo "Using generic-sparc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-sparc
-			;;
-		mips)
-			einfo "Using generic-mips to make device nodes..."
-			${D}/sbin/MAKEDEV generic-mips
-			;;
-		arm)
-			einfo "Using generic-arm to make device nodes..."
-			${D}/sbin/MAKEDEV generic-arm
-			;;
-		hppa)
-			einfo "Using generic-hppa to make device nodes..."
-			${D}/sbin/MAKEDEV generic-hppa
-			;;
-		*)
-			einfo "Using generic to make device nodes..."
-			${D}/sbin/MAKEDEV generic
-			;;
-	esac
-
-	${D}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
-}
-
-src_install() {
-
-	local bar=
-	local foo=
-
-	defaltmerge
-	keepdir /sbin /usr/sbin
-
-	keepdir_mount /usr
-	keepdir /usr/bin
-	keepdir /lib /usr/lib
-	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
-	keepdir /var/log/news
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
-
-	# If it already exist, do not recreate, else we get
-	# problems when /usr/portage mounted as ro NFS, etc.
-	keepdir_mount /usr/portage
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	# End FHS compatibility symlinks stuff
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	fperms 1777 /var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	fperms go-rx /root
-	keepdir /tmp /var/lock
-	fperms 1777 /tmp
-	fperms 1777 /var/tmp
-	fowners root:uucp /var/lock
-	fperms 775 /var/lock
-	insopts -m0644
-
-	keepdir /opt /etc/opt
-
-	insinto /etc
-	dosym  ../proc/filesystems /etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f ${foo} ] && doins ${foo}
-	done
-	fperms go-rwx /etc/shadow
-	# We do not want to overwrite the user's settings during bootstrap ...
-	[ -f "${ROOT}/etc/hosts" ] && rm -f ${D}/etc/hosts
-
-	keepdir /mnt
-	keepdir_mount /mnt/floppy /mnt/cdrom
-	fperms go-rwx /mnt/floppy /mnt/cdrom
-
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	keepdir /lib/dev-state /lib/udev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		#dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-		echo >/dev/null
-	else
-		# Normal
-		keepdir_mount /dev /dev/pts /dev/shm
-		#dosym ../sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-	cd ${S}/bin
-	dobin rc-status
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f ${foo} ] && doexe ${foo}
-	done
-
-	cd ${S}/sbin
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" ]
-	then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		for foo in ${S}/src/awk/*.awk
-		do
-			[ -f ${foo} ] && doins ${foo}
-		done
-	fi
-
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-		# SysvInit include
-		insinto /usr/include
-		doins initreq.h
-		# SysvInit docs
-		cd ${S2}/../
-		for foo in ${S2}/../man/*.[1-9]
-		do
-			[ -f ${foo} ] && doman ${foo}
-		done
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	for foo in ${S}/man/*
-	do
-		[ -f ${foo} ] && doman ${foo}
-	done
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.autoload.d
-	insinto /etc/modules.autoload.d
-	for foo in in ${S}/etc/modules.autoload.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	if [ -n "$(use build)" -o -n "$(use bootstrap)" -o \
-	     ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		# Ok, create temp device nodes
-		mkdir -p "${T}/udev-$$"
-		cd "${T}/udev-$$"
-		echo
-		einfo "Making device nodes (this could take a minute or so...)"
-		create_dev_nodes
-		# Now create tarball that can also be used for udev
-		tar -jclpf "${T}/devices-$$.tar.bz2" *
-		insinto /lib/udev-state
-		newins "${T}/devices-$$.tar.bz2" devices.tar.bz2
-	fi
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e ${S}/init.d/${bar} ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	# Make sure symlinks of these get installed.
-	if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/depscan.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/depscan.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/runscript.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/runscript.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/functions.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/functions.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/functions.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/rc-help.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/rc-help.sh
-	fi
-
-	# This one was borked, so make sure fixed one gets installed.
-	if [ -L ${ROOT}/usr/lib/X11 ]
-	then
-		rm -f ${ROOT}/usr/lib/X11
-	fi
-
-	if [ -f ${ROOT}/etc/modules.autoload -a ! -d ${ROOT}/etc/modules.autoload.d ]
-	then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	# Make sure user get things updated first time he merge 1.8.6 ...
-	if [ -f "${WORKDIR}/update_init_d" ]
-	then
-		# Update CONFIG_PROTECT_MASK to exclude /etc/init.d from
-		# CONFIG_PROTECT ...
-		ewarn "Changing CONFIG_PROTECT_MASK to ensure critical files are updated ..."
-		echo "CONFIG_PROTECT_MASK=\"/etc/init.d\"" \
-			> ${ROOT}/etc/env.d/99foo
-		env-update &> /dev/null
-		export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}:/etc/init.d"
-
-		if [ -d "${ROOT}/etc/init.d" ]
-		then
-			# Backup /etc/init.d if it exists ...
-			einfo "Backing up /etc/init.d ..."
-			cp -af "${ROOT}/etc/init.d" "${ROOT}/etc/init_d.old"
-		fi
-	fi
-
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" -a -e "${ROOT}/dev/.udev" ]
-	then
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2.old"
-	fi
-}
-
-pkg_postinst() {
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" ]
-	then
-		# Rather use our current device tarball ...
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2"
-	else
-		# Make sure our tarball do not get removed ...
-		touch -m "${ROOT}/lib/udev-state/devices.tar.bz2"
-	fi
-
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	# ($altmerge will be '1' if '${ROOT}/dev/.devfsd' exists ...)
-	if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" -a \
-	     -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
-		then
-			einfo "Populating /dev with device nodes..."
-			[ ! -e "${ROOT}/dev" ] && mkdir -p "${ROOT}/dev"
-			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-				-C "${ROOT}/dev" || die
-		fi
-	fi
-
-	echo
-
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	touch ${ROOT}/boot/.keep
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	if [ -d "${ROOT}/dev" ]
-	then
-		ln -snf ../sbin/MAKEDEV ${ROOT}/dev/MAKEDEV
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-# IPV6 versions of localhost and co
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	local x=
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-	# Make sure we get everything ready for $svcdir that moved to
-	# /var/lib/init.d ....
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		local oldsvcdir="${svcdir}"
-		local rcconfd="/etc/conf.d/rc"
-		local inittab="/etc/inittab"
-
-		# Remove old backup /etc/conf.d/rc files ...
-		rm -f ${ROOT}/etc/conf.d/._cfg????_rc
-		# Remove old backup /etc/inittab files ...
-		rm -f ${ROOT}/etc/._cfg????_inittab
-
-		# Replace and backup /etc/conf.d/rc (unless already in new format)
-		if [ -f "${ROOT}/${rcconfd}" ] && \
-		   ([ -z "$(grep '^svcmount' "${ROOT}/${rcconfd}")" ] || \
-		    [ -z "$(grep '^svcdir=\"\/var\/lib\/init.d\"' "${ROOT}/${rcconfd}")" ])
-			#svcdir="/var/lib/init.d"
-		then
-			ewarn "Backing up your old /etc/conf.d/rc, and replacing with new!"
-			ewarn "This is needed, as \$svcdir moved from /mnt/.init.d to"
-			ewarn "/var/state/init.d"
-			echo
-			cp -f "${ROOT}/${rcconfd}" "${ROOT}/${rcconfd}.old"
-			cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}"
-		fi
-
-		# Replace and backup /etc/inittab (unless already in new format)
-		if [ -f "${ROOT}/${inittab}" ] && \
-		   [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ]
-		then
-			ewarn "Backing up your old /etc/inittab, and replacing with new!"
-			ewarn "This is needed, as there were critical changes to /sbin/rc"
-			echo
-			cp -f "${ROOT}/${inittab}" "${ROOT}/${inittab}.old"
-			cp -f "${S}/${inittab}" "${ROOT}/${inittab}"
-		fi
-
-		source ${ROOT}/etc/conf.d/rc
-
-		# Handle the ${svcdir} that changed in location
-		if [ ! -d "${ROOT}/${svcdir}/started" ]
-		then
-			einfo "Trying to move SVCDIR to new location..."
-			echo
-			mkdir -p "${ROOT}/${svcdir}"
-#			mount -t tmpfs tmpfs ${ROOT}/${svcdir}
-			if [ -d "${ROOT}/${oldsvcdir}/started" ]
-			then
-				cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}"
-
-			elif [ -d "${ROOT}/mnt/.init.d/started" ]
-			then
-				cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}"
-			fi
-		fi
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		echo
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		/sbin/depscan.sh &>/dev/null
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		einfo "Updating module dependencies..."
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f "${ROOT}/etc/modules.conf" ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [ "${ROOT}" = "/" -a \
-	     ! -f /etc/gshadow -a -x /usr/sbin/grpconv ]
-	then
-		/usr/sbin/grpconv
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated,"
-	ewarn "else things might break at your next reboot!  You can use 'etc-update'"
-	ewarn "to accomplish this:"
-	echo
-	ewarn "  # etc-update"
-	echo
-
-	if [ -f "${ROOT}/etc/env.d/99foo" ]
-	then
-		echo
-		ewarn "Due to large changes from 1.8.5 to 1.8.6, all your files in /etc/init.d"
-		ewarn "have been updated automatically.  If you did make any changes directly"
-		ewarn "to your old files, they can be found in /etc/init_d.old.  Please just"
-		ewarn "make sure to edit the new files, and not just copy the old over!"
-		echo
-
-		rm -f "${ROOT}/etc/env.d/99foo"
-
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		sleep 8
-	fi
-}
-
-pkg_postrm() {
-
-	# Fix problematic links
-	ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-	ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
-	ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild
deleted file mode 100644
index 044c3cbef191..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild
+++ /dev/null
@@ -1,750 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild,v 1.6 2004/02/23 00:38:29 agriffis Exp $
-
-# This ebuild needs to be merged "live".  You can't simply make a package
-# of it and merge it later.
-
-IUSE="bootstrap build selinux static"
-
-SV="1.4.3.12"
-SVREV="p2"
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~ppc64"
-
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.23
-	selinux? ( sys-libs/libselinux )"
-# We need at least portage-2.0.23 to handle these DEPEND's properly.
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )
-	!build? ( !bootstrap? ( >=sys-apps/util-linux-2.11z-r6 ) )"
-# We want a dhcpcd that supports the '-z' switch, but only if dhcpcd
-# was already installed ...
-if portageq has_version / net-misc/dhcpcd
-then
-	PDEPEND="!build? ( !bootstrap? ( >=net-misc/dhcpcd-1.3.22_p4-r1 ) )"
-fi
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-	# Selinux
-	use selinux && epatch ${FILESDIR}/sysvinit-${SVIV}-selinux.patch
-
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-	fi
-
-	# Add serial console ...
-	case ${ARCH} in
-		sparc|mips|hppa)
-			cp inittab inittab.orig
-			sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-			rm -f inittab.orig
-			;;
-	esac
-
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Sanity check to see if has version works
-		if has_version '>=sys-apps/baselayout-1.8' &> /dev/null
-		then
-			einfo "Checking if we need to tweak CONFIG_PROTECT_MASK"
-			# Make sure user get things updated first time he merge 1.8.6 ...
-			if ! has_version '>=sys-apps/baselayout-1.8.6' &> /dev/null
-			then
-				touch "${WORKDIR}/update_init_d"
-			fi
-		fi
-	fi
-}
-
-src_compile() {
-
-	use static && export LDFLAGS="-static"
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	local ROOT=""
-	ROOT="`cat ${T}/ROOT`"
-	if [ -e ${ROOT}/dev/.devfsd ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-# Only do a keepdir on mounts if they are not mounted ...
-keepdir_mount() {
-	local x=
-	local y=
-	local doit=0
-
-	[ -z "$1" ] && return 1
-
-	[ ! -e /proc/mounts ] && return 1
-
-	for y in $*
-	do
-		doit=0
-
-		for x in $(gawk '{print $2}' /proc/mounts)
-		do
-			[ "${x}" = "${y}" ] && doit=1
-		done
-
-		if [ "${doit}" -ne 1 ]
-		then
-			keepdir "${y}"
-		fi
-	done
-
-	return 0
-}
-
-create_dev_nodes() {
-	export PATH="${D}/sbin:${PATH}"
-
-	case ${ARCH} in
-		amd64)
-			# amd64 must use generic-i386 because amd64/x86_64 does not have
-			# a generic option at this time, and the default 'generic' ends
-			# up erroring out, because MAKEDEV internally doesn't know what
-			# to use
-			einfo "Using generic-i386 to make amd64 device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
-			;;
-		x86)
-			einfo "Using generic-i386 to make device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
-			;;
-		ppc)
-			einfo "Using generic-powerpc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-powerpc
-			;;
-		sparc)
-			einfo "Using generic-sparc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-sparc
-			;;
-		mips)
-			einfo "Using generic-mips to make device nodes..."
-			${D}/sbin/MAKEDEV generic-mips
-			;;
-		arm)
-			einfo "Using generic-arm to make device nodes..."
-			${D}/sbin/MAKEDEV generic-arm
-			;;
-		hppa)
-			einfo "Using generic-hppa to make device nodes..."
-			${D}/sbin/MAKEDEV generic-hppa
-			;;
-		*)
-			einfo "Using generic to make device nodes..."
-			${D}/sbin/MAKEDEV generic
-			;;
-	esac
-
-	${D}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
-}
-
-src_install() {
-
-	local bar=
-	local foo=
-
-	defaltmerge
-	keepdir /sbin /usr/sbin
-
-	keepdir_mount /usr
-	keepdir /usr/bin
-	keepdir /lib /usr/lib
-	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
-	keepdir /var/log/news
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
-
-	# If it already exist, do not recreate, else we get
-	# problems when /usr/portage mounted as ro NFS, etc.
-	keepdir_mount /usr/portage
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	# End FHS compatibility symlinks stuff
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	fperms 1777 /var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	fperms go-rx /root
-	keepdir /tmp /var/lock
-	fperms 1777 /tmp
-	fperms 1777 /var/tmp
-	fowners root:uucp /var/lock
-	fperms 775 /var/lock
-	insopts -m0644
-
-	keepdir /opt /etc/opt
-
-	insinto /etc
-	dosym  ../proc/filesystems /etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f ${foo} ] && doins ${foo}
-	done
-	fperms go-rwx /etc/shadow
-	# We do not want to overwrite the user's settings during bootstrap ...
-	[ -f "${ROOT}/etc/hosts" ] && rm -f ${D}/etc/hosts
-
-	keepdir /mnt
-	keepdir_mount /mnt/floppy /mnt/cdrom
-	fperms go-rwx /mnt/floppy /mnt/cdrom
-
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	keepdir /lib/dev-state /lib/udev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		#dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-		echo >/dev/null
-	else
-		# Normal
-		keepdir_mount /dev /dev/pts /dev/shm
-		#dosym ../sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-	cd ${S}/bin
-	dobin rc-status
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f ${foo} ] && doexe ${foo}
-	done
-
-	cd ${S}/sbin
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" ]
-	then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		for foo in ${S}/src/awk/*.awk
-		do
-			[ -f ${foo} ] && doins ${foo}
-		done
-	fi
-
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-		# SysvInit include
-		insinto /usr/include
-		doins initreq.h
-		# SysvInit docs
-		cd ${S2}/../
-		for foo in ${S2}/../man/*.[1-9]
-		do
-			[ -f ${foo} ] && doman ${foo}
-		done
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	for foo in ${S}/man/*
-	do
-		[ -f ${foo} ] && doman ${foo}
-	done
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.autoload.d
-	insinto /etc/modules.autoload.d
-	for foo in in ${S}/etc/modules.autoload.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	if [ -n "$(use build)" -o -n "$(use bootstrap)" -o \
-	     ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		# Ok, create temp device nodes
-		mkdir -p "${T}/udev-$$"
-		cd "${T}/udev-$$"
-		echo
-		einfo "Making device nodes (this could take a minute or so...)"
-		create_dev_nodes
-		# Now create tarball that can also be used for udev
-		tar -jclpf "${T}/devices-$$.tar.bz2" *
-		insinto /lib/udev-state
-		newins "${T}/devices-$$.tar.bz2" devices.tar.bz2
-	fi
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e ${S}/init.d/${bar} ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	# Make sure symlinks of these get installed.
-	if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/depscan.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/depscan.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/runscript.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/runscript.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/functions.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/functions.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/functions.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/rc-help.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/rc-help.sh
-	fi
-
-	# This one was borked, so make sure fixed one gets installed.
-	if [ -L ${ROOT}/usr/lib/X11 ]
-	then
-		rm -f ${ROOT}/usr/lib/X11
-	fi
-
-	if [ -f ${ROOT}/etc/modules.autoload -a ! -d ${ROOT}/etc/modules.autoload.d ]
-	then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	# Make sure user get things updated first time he merge 1.8.6 ...
-	if [ -f "${WORKDIR}/update_init_d" ]
-	then
-		# Update CONFIG_PROTECT_MASK to exclude /etc/init.d from
-		# CONFIG_PROTECT ...
-		ewarn "Changing CONFIG_PROTECT_MASK to ensure critical files are updated ..."
-		echo "CONFIG_PROTECT_MASK=\"/etc/init.d\"" \
-			> ${ROOT}/etc/env.d/99foo
-		env-update &> /dev/null
-		export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}:/etc/init.d"
-
-		if [ -d "${ROOT}/etc/init.d" ]
-		then
-			# Backup /etc/init.d if it exists ...
-			einfo "Backing up /etc/init.d ..."
-			cp -af "${ROOT}/etc/init.d" "${ROOT}/etc/init_d.old"
-		fi
-	fi
-
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" -a -e "${ROOT}/dev/.udev" ]
-	then
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2.old"
-	fi
-}
-
-pkg_postinst() {
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" ]
-	then
-		# Rather use our current device tarball ...
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2"
-	else
-		# Make sure our tarball do not get removed ...
-		touch -m "${ROOT}/lib/udev-state/devices.tar.bz2"
-	fi
-
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	# ($altmerge will be '1' if '${ROOT}/dev/.devfsd' exists ...)
-	if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" -a \
-	     -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
-		then
-			einfo "Populating /dev with device nodes..."
-			[ ! -e "${ROOT}/dev" ] && mkdir -p "${ROOT}/dev"
-			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-				-C "${ROOT}/dev" || die
-		fi
-	fi
-
-	echo
-
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	touch ${ROOT}/boot/.keep
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	if [ -d "${ROOT}/dev" ]
-	then
-		ln -snf ../sbin/MAKEDEV ${ROOT}/dev/MAKEDEV
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-# IPV6 versions of localhost and co
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	local x=
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-	# Make sure we get everything ready for $svcdir that moved to
-	# /var/lib/init.d ....
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		local oldsvcdir="${svcdir}"
-		local rcconfd="/etc/conf.d/rc"
-		local inittab="/etc/inittab"
-
-		# Remove old backup /etc/conf.d/rc files ...
-		rm -f ${ROOT}/etc/conf.d/._cfg????_rc
-		# Remove old backup /etc/inittab files ...
-		rm -f ${ROOT}/etc/._cfg????_inittab
-
-		# Replace and backup /etc/conf.d/rc (unless already in new format)
-		if [ -f "${ROOT}/${rcconfd}" ] && \
-		   ([ -z "$(grep '^svcmount' "${ROOT}/${rcconfd}")" ] || \
-		    [ -z "$(grep '^svcdir=\"\/var\/lib\/init.d\"' "${ROOT}/${rcconfd}")" ])
-			#svcdir="/var/lib/init.d"
-		then
-			ewarn "Backing up your old /etc/conf.d/rc, and replacing with new!"
-			ewarn "This is needed, as \$svcdir moved from /mnt/.init.d to"
-			ewarn "/var/state/init.d"
-			echo
-			cp -f "${ROOT}/${rcconfd}" "${ROOT}/${rcconfd}.old"
-			cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}"
-		fi
-
-		# Replace and backup /etc/inittab (unless already in new format)
-		if [ -f "${ROOT}/${inittab}" ] && \
-		   [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ]
-		then
-			ewarn "Backing up your old /etc/inittab, and replacing with new!"
-			ewarn "This is needed, as there were critical changes to /sbin/rc"
-			echo
-			cp -f "${ROOT}/${inittab}" "${ROOT}/${inittab}.old"
-			cp -f "${S}/${inittab}" "${ROOT}/${inittab}"
-		fi
-
-		source ${ROOT}/etc/conf.d/rc
-
-		# Handle the ${svcdir} that changed in location
-		if [ ! -d "${ROOT}/${svcdir}/started" ]
-		then
-			einfo "Trying to move SVCDIR to new location..."
-			echo
-			mkdir -p "${ROOT}/${svcdir}"
-#			mount -t tmpfs tmpfs ${ROOT}/${svcdir}
-			if [ -d "${ROOT}/${oldsvcdir}/started" ]
-			then
-				cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}"
-
-			elif [ -d "${ROOT}/mnt/.init.d/started" ]
-			then
-				cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}"
-			fi
-		fi
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		echo
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		/sbin/depscan.sh &>/dev/null
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		einfo "Updating module dependencies..."
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f "${ROOT}/etc/modules.conf" ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [ "${ROOT}" = "/" -a \
-	     ! -f /etc/gshadow -a -x /usr/sbin/grpconv ]
-	then
-		/usr/sbin/grpconv
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated,"
-	ewarn "else things might break at your next reboot!  You can use 'etc-update'"
-	ewarn "to accomplish this:"
-	echo
-	ewarn "  # etc-update"
-	echo
-
-	if [ -f "${ROOT}/etc/env.d/99foo" ]
-	then
-		echo
-		ewarn "Due to large changes from 1.8.5 to 1.8.6, all your files in /etc/init.d"
-		ewarn "have been updated automatically.  If you did make any changes directly"
-		ewarn "to your old files, they can be found in /etc/init_d.old.  Please just"
-		ewarn "make sure to edit the new files, and not just copy the old over!"
-		echo
-
-		rm -f "${ROOT}/etc/env.d/99foo"
-
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		sleep 8
-	fi
-}
-
-pkg_postrm() {
-
-	# Fix problematic links
-	ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-	ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
-	ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild
deleted file mode 100644
index efda3bd5c91a..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild,v 1.7 2004/02/01 22:47:23 brad_mssw Exp $
-
-# This ebuild needs to be merged "live".  You can't simply make a package
-# of it and merge it later.
-
-IUSE="bootstrap build selinux static"
-
-SV="1.4.3.12"
-SVREV="p9"
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	http://dev.gentoo.org/~brad_mssw/rc-scripts-${SV}${SVREV}.tar.bz2"
-#	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-*"
-RESTRICT="nomirror"
-#KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~arm ~hppa ~ia64 ~ppc64"
-
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.23
-	selinux? ( sys-libs/libselinux )"
-# We need at least portage-2.0.23 to handle these DEPEND's properly.
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )
-	!build? ( !bootstrap? ( >=sys-apps/util-linux-2.11z-r6 ) )"
-# We want a dhcpcd that supports the '-z' switch, but only if dhcpcd
-# was already installed ...
-if portageq has_version / net-misc/dhcpcd
-then
-	PDEPEND="!build? ( !bootstrap? ( >=net-misc/dhcpcd-1.3.22_p4-r1 ) )"
-fi
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-	# Selinux
-	use selinux && epatch ${FILESDIR}/sysvinit-${SVIV}-selinux.patch
-
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-	fi
-
-	# Add serial console ...
-	case ${ARCH} in
-		sparc|mips|hppa)
-			cp inittab inittab.orig
-			sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-			rm -f inittab.orig
-			;;
-	esac
-
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Sanity check to see if has version works
-		if has_version '>=sys-apps/baselayout-1.8' &> /dev/null
-		then
-			einfo "Checking if we need to tweak CONFIG_PROTECT_MASK"
-			# Make sure user get things updated first time he merge 1.8.6 ...
-			if ! has_version '>=sys-apps/baselayout-1.8.6' &> /dev/null
-			then
-				touch "${WORKDIR}/update_init_d"
-			fi
-		fi
-	fi
-}
-
-src_compile() {
-
-	use static && export LDFLAGS="-static"
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	local ROOT=""
-	ROOT="`cat ${T}/ROOT`"
-	if [ -e ${ROOT}/dev/.devfsd ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-# Only do a keepdir on mounts if they are not mounted ...
-keepdir_mount() {
-	local x=
-	local y=
-	local doit=0
-
-	[ -z "$1" ] && return 1
-
-	[ ! -e /proc/mounts ] && return 1
-
-	for y in $*
-	do
-		doit=0
-
-		for x in $(gawk '{print $2}' /proc/mounts)
-		do
-			[ "${x}" = "${y}" ] && doit=1
-		done
-
-		if [ "${doit}" -ne 1 ]
-		then
-			keepdir "${y}"
-		fi
-	done
-
-	return 0
-}
-
-create_dev_nodes() {
-	export PATH="${D}/sbin:${PATH}"
-
-	case ${ARCH} in
-		amd64)
-			# amd64 must use generic-i386 because amd64/x86_64 does not have
-			# a generic option at this time, and the default 'generic' ends
-			# up erroring out, because MAKEDEV internally doesn't know what
-			# to use
-			einfo "Using generic-i386 to make amd64 device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
-			;;
-		x86)
-			einfo "Using generic-i386 to make device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
-			;;
-		ppc)
-			einfo "Using generic-powerpc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-powerpc
-			;;
-		sparc)
-			einfo "Using generic-sparc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-sparc
-			;;
-		mips)
-			einfo "Using generic-mips to make device nodes..."
-			${D}/sbin/MAKEDEV generic-mips
-			;;
-		arm)
-			einfo "Using generic-arm to make device nodes..."
-			${D}/sbin/MAKEDEV generic-arm
-			;;
-		hppa)
-			einfo "Using generic-hppa to make device nodes..."
-			${D}/sbin/MAKEDEV generic-hppa
-			;;
-		*)
-			einfo "Using generic to make device nodes..."
-			${D}/sbin/MAKEDEV generic
-			;;
-	esac
-
-	${D}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
-}
-
-src_install() {
-
-	local bar=
-	local foo=
-
-	defaltmerge
-	keepdir /sbin /usr/sbin
-
-	keepdir_mount /usr
-	keepdir /usr/bin
-	keepdir /lib /usr/lib
-	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
-	keepdir /var/log/news
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
-
-	# If it already exist, do not recreate, else we get
-	# problems when /usr/portage mounted as ro NFS, etc.
-	keepdir_mount /usr/portage
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	# End FHS compatibility symlinks stuff
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	fperms 1777 /var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	fperms go-rx /root
-	keepdir /tmp /var/lock
-	fperms 1777 /tmp
-	fperms 1777 /var/tmp
-	fowners root:uucp /var/lock
-	fperms 775 /var/lock
-	insopts -m0644
-
-	keepdir /opt /etc/opt
-
-	insinto /etc
-	dosym  ../proc/filesystems /etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f ${foo} ] && doins ${foo}
-	done
-	fperms go-rwx /etc/shadow
-	# We do not want to overwrite the user's settings during bootstrap ...
-	[ -f "${ROOT}/etc/hosts" ] && rm -f ${D}/etc/hosts
-
-	keepdir /mnt
-	keepdir_mount /mnt/floppy /mnt/cdrom
-	fperms go-rwx /mnt/floppy /mnt/cdrom
-
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	keepdir /lib/dev-state /lib/udev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		#dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-		echo >/dev/null
-	else
-		# Normal
-		keepdir_mount /dev /dev/pts /dev/shm
-		#dosym ../sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh livecd-functions.sh
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-	cd ${S}/bin
-	dobin rc-status
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f ${foo} ] && doexe ${foo}
-	done
-
-	cd ${S}/sbin
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" ]
-	then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		for foo in ${S}/src/awk/*.awk
-		do
-			[ -f ${foo} ] && doins ${foo}
-		done
-	fi
-
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-	dosym ../../sbin/livecd-functions.sh /etc/init.d/livecd-functions.sh
-
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-		# SysvInit include
-		insinto /usr/include
-		doins initreq.h
-		# SysvInit docs
-		cd ${S2}/../
-		for foo in ${S2}/../man/*.[1-9]
-		do
-			[ -f ${foo} ] && doman ${foo}
-		done
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	for foo in ${S}/man/*
-	do
-		[ -f ${foo} ] && doman ${foo}
-	done
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.autoload.d
-	insinto /etc/modules.autoload.d
-	for foo in in ${S}/etc/modules.autoload.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	if [ -n "$(use build)" -o -n "$(use bootstrap)" -o \
-	     ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		# Ok, create temp device nodes
-		mkdir -p "${T}/udev-$$"
-		cd "${T}/udev-$$"
-		echo
-		einfo "Making device nodes (this could take a minute or so...)"
-		create_dev_nodes
-		# Now create tarball that can also be used for udev
-		tar -jclpf "${T}/devices-$$.tar.bz2" *
-		insinto /lib/udev-state
-		newins "${T}/devices-$$.tar.bz2" devices.tar.bz2
-	fi
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e ${S}/init.d/${bar} ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	# Make sure symlinks of these get installed.
-	if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/depscan.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/depscan.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/runscript.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/runscript.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/functions.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/functions.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/functions.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/livecd-functions.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/livecd-functions.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/livecd-functions.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/rc-help.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/rc-help.sh
-	fi
-
-	# This one was borked, so make sure fixed one gets installed.
-	if [ -L ${ROOT}/usr/lib/X11 ]
-	then
-		rm -f ${ROOT}/usr/lib/X11
-	fi
-
-	if [ -f ${ROOT}/etc/modules.autoload -a ! -d ${ROOT}/etc/modules.autoload.d ]
-	then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	# Make sure user get things updated first time he merge 1.8.6 ...
-	if [ -f "${WORKDIR}/update_init_d" ]
-	then
-		# Update CONFIG_PROTECT_MASK to exclude /etc/init.d from
-		# CONFIG_PROTECT ...
-		ewarn "Changing CONFIG_PROTECT_MASK to ensure critical files are updated ..."
-		echo "CONFIG_PROTECT_MASK=\"/etc/init.d\"" \
-			> ${ROOT}/etc/env.d/99foo
-		env-update &> /dev/null
-		export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}:/etc/init.d"
-
-		if [ -d "${ROOT}/etc/init.d" ]
-		then
-			# Backup /etc/init.d if it exists ...
-			einfo "Backing up /etc/init.d ..."
-			cp -af "${ROOT}/etc/init.d" "${ROOT}/etc/init_d.old"
-		fi
-	fi
-
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" -a -e "${ROOT}/dev/.udev" ]
-	then
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2.old"
-	fi
-}
-
-pkg_postinst() {
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" ]
-	then
-		# Rather use our current device tarball ...
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2"
-	else
-		# Make sure our tarball do not get removed ...
-		touch -m "${ROOT}/lib/udev-state/devices.tar.bz2"
-	fi
-
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	# ($altmerge will be '1' if '${ROOT}/dev/.devfsd' exists ...)
-	if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" -a \
-	     -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
-		then
-			einfo "Populating /dev with device nodes..."
-			[ ! -e "${ROOT}/dev" ] && mkdir -p "${ROOT}/dev"
-			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-				-C "${ROOT}/dev" || die
-		fi
-	fi
-
-	echo
-
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	touch ${ROOT}/boot/.keep
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	if [ -d "${ROOT}/dev" ]
-	then
-		ln -snf ../sbin/MAKEDEV ${ROOT}/dev/MAKEDEV
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-# IPV6 versions of localhost and co
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	local x=
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-	# Make sure we get everything ready for $svcdir that moved to
-	# /var/lib/init.d ....
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		local oldsvcdir="${svcdir}"
-		local rcconfd="/etc/conf.d/rc"
-		local inittab="/etc/inittab"
-
-		# Remove old backup /etc/conf.d/rc files ...
-		rm -f ${ROOT}/etc/conf.d/._cfg????_rc
-		# Remove old backup /etc/inittab files ...
-		rm -f ${ROOT}/etc/._cfg????_inittab
-
-		# Replace and backup /etc/conf.d/rc (unless already in new format)
-		if [ -f "${ROOT}/${rcconfd}" ] && \
-		   ([ -z "$(grep '^svcmount' "${ROOT}/${rcconfd}")" ] || \
-		    [ -z "$(grep '^svcdir=\"\/var\/lib\/init.d\"' "${ROOT}/${rcconfd}")" ])
-			#svcdir="/var/lib/init.d"
-		then
-			ewarn "Backing up your old /etc/conf.d/rc, and replacing with new!"
-			ewarn "This is needed, as \$svcdir moved from /mnt/.init.d to"
-			ewarn "/var/state/init.d"
-			echo
-			cp -f "${ROOT}/${rcconfd}" "${ROOT}/${rcconfd}.old"
-			cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}"
-		fi
-
-		# Replace and backup /etc/inittab (unless already in new format)
-		if [ -f "${ROOT}/${inittab}" ] && \
-		   [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ]
-		then
-			ewarn "Backing up your old /etc/inittab, and replacing with new!"
-			ewarn "This is needed, as there were critical changes to /sbin/rc"
-			echo
-			cp -f "${ROOT}/${inittab}" "${ROOT}/${inittab}.old"
-			cp -f "${S}/${inittab}" "${ROOT}/${inittab}"
-		fi
-
-		source ${ROOT}/etc/conf.d/rc
-
-		# Handle the ${svcdir} that changed in location
-		if [ ! -d "${ROOT}/${svcdir}/started" ]
-		then
-			einfo "Trying to move SVCDIR to new location..."
-			echo
-			mkdir -p "${ROOT}/${svcdir}"
-#			mount -t tmpfs tmpfs ${ROOT}/${svcdir}
-			if [ -d "${ROOT}/${oldsvcdir}/started" ]
-			then
-				cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}"
-
-			elif [ -d "${ROOT}/mnt/.init.d/started" ]
-			then
-				cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}"
-			fi
-		fi
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		echo
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		/sbin/depscan.sh &>/dev/null
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		einfo "Updating module dependencies..."
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f "${ROOT}/etc/modules.conf" ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [ "${ROOT}" = "/" -a \
-	     ! -f /etc/gshadow -a -x /usr/sbin/grpconv ]
-	then
-		/usr/sbin/grpconv
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated,"
-	ewarn "else things might break at your next reboot!  You can use 'etc-update'"
-	ewarn "to accomplish this:"
-	echo
-	ewarn "  # etc-update"
-	echo
-
-	if [ -f "${ROOT}/etc/env.d/99foo" ]
-	then
-		echo
-		ewarn "Due to large changes from 1.8.5 to 1.8.6, all your files in /etc/init.d"
-		ewarn "have been updated automatically.  If you did make any changes directly"
-		ewarn "to your old files, they can be found in /etc/init_d.old.  Please just"
-		ewarn "make sure to edit the new files, and not just copy the old over!"
-		echo
-
-		rm -f "${ROOT}/etc/env.d/99foo"
-
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		sleep 8
-	fi
-}
-
-pkg_postrm() {
-
-	# Fix problematic links
-	ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-	ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
-	ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild
deleted file mode 100644
index 2b29a86ab9a7..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild
+++ /dev/null
@@ -1,751 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild,v 1.2 2004/02/01 22:01:11 brad_mssw Exp $
-
-# This ebuild needs to be merged "live".  You can't simply make a package
-# of it and merge it later.
-
-IUSE="bootstrap build livecd static selinux"
-
-SV="1.4.3.12"
-SVREV="p3"
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~arm ~hppa ~ia64 ~ppc64"
-KEYWORDS="-*"
-
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.23
-	selinux? ( sys-libs/libselinux )"
-# We need at least portage-2.0.23 to handle these DEPEND's properly.
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )
-	!build? ( !bootstrap? ( >=sys-apps/util-linux-2.11z-r6 ) )"
-# We want a dhcpcd that supports the '-z' switch, but only if dhcpcd
-# was already installed ...
-if portageq has_version / net-misc/dhcpcd
-then
-	PDEPEND="!build? ( !bootstrap? ( >=net-misc/dhcpcd-1.3.22_p4-r1 ) )"
-fi
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-	# Selinux
-	use selinux && epatch ${FILESDIR}/sysvinit-${SVIV}-selinux.patch
-
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-	fi
-
-	# Add serial console ...
-	case ${ARCH} in
-		sparc|mips|hppa)
-			cp inittab inittab.orig
-			sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-			rm -f inittab.orig
-			;;
-	esac
-
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Sanity check to see if has version works
-		if has_version '>=sys-apps/baselayout-1.8' &> /dev/null
-		then
-			einfo "Checking if we need to tweak CONFIG_PROTECT_MASK"
-			# Make sure user get things updated first time he merge 1.8.6 ...
-			if ! has_version '>=sys-apps/baselayout-1.8.6' &> /dev/null
-			then
-				touch "${WORKDIR}/update_init_d"
-			fi
-		fi
-	fi
-}
-
-src_compile() {
-
-	use static && export LDFLAGS="-static"
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	local ROOT=""
-	ROOT="`cat ${T}/ROOT`"
-	if [ -e ${ROOT}/dev/.devfsd ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-# Only do a keepdir on mounts if they are not mounted ...
-keepdir_mount() {
-	local x=
-	local y=
-	local doit=0
-
-	[ -z "$1" ] && return 1
-
-	[ ! -e /proc/mounts ] && return 1
-
-	for y in $*
-	do
-		doit=0
-
-		for x in $(gawk '{print $2}' /proc/mounts)
-		do
-			[ "${x}" = "${y}" ] && doit=1
-		done
-
-		if [ "${doit}" -ne 1 ]
-		then
-			keepdir "${y}"
-		fi
-	done
-
-	return 0
-}
-
-create_dev_nodes() {
-	export PATH="${D}/sbin:${PATH}"
-
-	case ${ARCH} in
-		amd64)
-			# amd64 must use generic-i386 because amd64/x86_64 does not have
-			# a generic option at this time, and the default 'generic' ends
-			# up erroring out, because MAKEDEV internally doesn't know what
-			# to use
-			einfo "Using generic-i386 to make amd64 device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
-			;;
-		x86)
-			einfo "Using generic-i386 to make device nodes..."
-			${D}/sbin/MAKEDEV generic-i386
-			;;
-		ppc)
-			einfo "Using generic-powerpc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-powerpc
-			;;
-		sparc)
-			einfo "Using generic-sparc to make device nodes..."
-			${D}/sbin/MAKEDEV generic-sparc
-			;;
-		mips)
-			einfo "Using generic-mips to make device nodes..."
-			${D}/sbin/MAKEDEV generic-mips
-			;;
-		arm)
-			einfo "Using generic-arm to make device nodes..."
-			${D}/sbin/MAKEDEV generic-arm
-			;;
-		hppa)
-			einfo "Using generic-hppa to make device nodes..."
-			${D}/sbin/MAKEDEV generic-hppa
-			;;
-		*)
-			einfo "Using generic to make device nodes..."
-			${D}/sbin/MAKEDEV generic
-			;;
-	esac
-
-	${D}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
-}
-
-src_install() {
-
-	local bar=
-	local foo=
-
-	defaltmerge
-	keepdir /sbin /usr/sbin
-
-	keepdir_mount /usr
-	keepdir /usr/bin
-	keepdir /lib /usr/lib
-	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
-	keepdir /var/log/news
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
-
-	# If it already exist, do not recreate, else we get
-	# problems when /usr/portage mounted as ro NFS, etc.
-	keepdir_mount /usr/portage
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	# End FHS compatibility symlinks stuff
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	fperms 1777 /var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	fperms go-rx /root
-	keepdir /tmp /var/lock
-	fperms 1777 /tmp
-	fperms 1777 /var/tmp
-	fowners root:uucp /var/lock
-	fperms 775 /var/lock
-	insopts -m0644
-
-	keepdir /opt /etc/opt
-
-	insinto /etc
-	dosym  ../proc/filesystems /etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f ${foo} ] && doins ${foo}
-	done
-	fperms go-rwx /etc/shadow
-	# We do not want to overwrite the user's settings during bootstrap ...
-	[ -f "${ROOT}/etc/hosts" ] && rm -f ${D}/etc/hosts
-
-	keepdir /mnt
-	keepdir_mount /mnt/floppy /mnt/cdrom
-	fperms go-rwx /mnt/floppy /mnt/cdrom
-
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	keepdir /lib/dev-state /lib/udev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		#dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-		echo >/dev/null
-	else
-		# Normal
-		keepdir_mount /dev /dev/pts /dev/shm
-		#dosym ../sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh livecd-functions.sh
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-	cd ${S}/bin
-	dobin rc-status
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f ${foo} ] && doexe ${foo}
-	done
-
-	cd ${S}/sbin
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" ]
-	then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		for foo in ${S}/src/awk/*.awk
-		do
-			[ -f ${foo} ] && doins ${foo}
-		done
-	fi
-
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-		# SysvInit include
-		insinto /usr/include
-		doins initreq.h
-		# SysvInit docs
-		cd ${S2}/../
-		for foo in ${S2}/../man/*.[1-9]
-		do
-			[ -f ${foo} ] && doman ${foo}
-		done
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	for foo in ${S}/man/*
-	do
-		[ -f ${foo} ] && doman ${foo}
-	done
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.autoload.d
-	insinto /etc/modules.autoload.d
-	for foo in in ${S}/etc/modules.autoload.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	if [ -n "$(use build)" -o -n "$(use bootstrap)" -o \
-	     ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		# Ok, create temp device nodes
-		mkdir -p "${T}/udev-$$"
-		cd "${T}/udev-$$"
-		echo
-		einfo "Making device nodes (this could take a minute or so...)"
-		create_dev_nodes
-		# Now create tarball that can also be used for udev
-		tar -jclpf "${T}/devices-$$.tar.bz2" *
-		insinto /lib/udev-state
-		newins "${T}/devices-$$.tar.bz2" devices.tar.bz2
-	fi
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e ${S}/init.d/${bar} ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	# Make sure symlinks of these get installed.
-	if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/depscan.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/depscan.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/runscript.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/runscript.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/functions.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/functions.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/functions.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/rc-help.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/rc-help.sh
-	fi
-
-	# This one was borked, so make sure fixed one gets installed.
-	if [ -L ${ROOT}/usr/lib/X11 ]
-	then
-		rm -f ${ROOT}/usr/lib/X11
-	fi
-
-	if [ -f ${ROOT}/etc/modules.autoload -a ! -d ${ROOT}/etc/modules.autoload.d ]
-	then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	# Make sure user get things updated first time he merge 1.8.6 ...
-	if [ -f "${WORKDIR}/update_init_d" ]
-	then
-		# Update CONFIG_PROTECT_MASK to exclude /etc/init.d from
-		# CONFIG_PROTECT ...
-		ewarn "Changing CONFIG_PROTECT_MASK to ensure critical files are updated ..."
-		echo "CONFIG_PROTECT_MASK=\"/etc/init.d\"" \
-			> ${ROOT}/etc/env.d/99foo
-		env-update &> /dev/null
-		export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}:/etc/init.d"
-
-		if [ -d "${ROOT}/etc/init.d" ]
-		then
-			# Backup /etc/init.d if it exists ...
-			einfo "Backing up /etc/init.d ..."
-			cp -af "${ROOT}/etc/init.d" "${ROOT}/etc/init_d.old"
-		fi
-	fi
-
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" -a -e "${ROOT}/dev/.udev" ]
-	then
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2.old"
-	fi
-}
-
-pkg_postinst() {
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" ]
-	then
-		# Rather use our current device tarball ...
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2"
-	else
-		# Make sure our tarball do not get removed ...
-		touch -m "${ROOT}/lib/udev-state/devices.tar.bz2"
-	fi
-
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	# ($altmerge will be '1' if '${ROOT}/dev/.devfsd' exists ...)
-	if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" -a \
-	     -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
-		then
-			einfo "Populating /dev with device nodes..."
-			[ ! -e "${ROOT}/dev" ] && mkdir -p "${ROOT}/dev"
-			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-				-C "${ROOT}/dev" || die
-		fi
-	fi
-
-	echo
-
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	touch ${ROOT}/boot/.keep
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	if [ -d "${ROOT}/dev" ]
-	then
-		ln -snf ../sbin/MAKEDEV ${ROOT}/dev/MAKEDEV
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-# IPV6 versions of localhost and co
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	local x=
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-	# Make sure we get everything ready for $svcdir that moved to
-	# /var/lib/init.d ....
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		local oldsvcdir="${svcdir}"
-		local rcconfd="/etc/conf.d/rc"
-		local inittab="/etc/inittab"
-
-		# Remove old backup /etc/conf.d/rc files ...
-		rm -f ${ROOT}/etc/conf.d/._cfg????_rc
-		# Remove old backup /etc/inittab files ...
-		rm -f ${ROOT}/etc/._cfg????_inittab
-
-		# Replace and backup /etc/conf.d/rc (unless already in new format)
-		if [ -f "${ROOT}/${rcconfd}" ] && \
-		   ([ -z "$(grep '^svcmount' "${ROOT}/${rcconfd}")" ] || \
-		    [ -z "$(grep '^svcdir=\"\/var\/lib\/init.d\"' "${ROOT}/${rcconfd}")" ])
-			#svcdir="/var/lib/init.d"
-		then
-			ewarn "Backing up your old /etc/conf.d/rc, and replacing with new!"
-			ewarn "This is needed, as \$svcdir moved from /mnt/.init.d to"
-			ewarn "/var/state/init.d"
-			echo
-			cp -f "${ROOT}/${rcconfd}" "${ROOT}/${rcconfd}.old"
-			cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}"
-		fi
-
-		# Replace and backup /etc/inittab (unless already in new format)
-		if [ -f "${ROOT}/${inittab}" ] && \
-		   [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ]
-		then
-			ewarn "Backing up your old /etc/inittab, and replacing with new!"
-			ewarn "This is needed, as there were critical changes to /sbin/rc"
-			echo
-			cp -f "${ROOT}/${inittab}" "${ROOT}/${inittab}.old"
-			cp -f "${S}/${inittab}" "${ROOT}/${inittab}"
-		fi
-
-		source ${ROOT}/etc/conf.d/rc
-
-		# Handle the ${svcdir} that changed in location
-		if [ ! -d "${ROOT}/${svcdir}/started" ]
-		then
-			einfo "Trying to move SVCDIR to new location..."
-			echo
-			mkdir -p "${ROOT}/${svcdir}"
-#			mount -t tmpfs tmpfs ${ROOT}/${svcdir}
-			if [ -d "${ROOT}/${oldsvcdir}/started" ]
-			then
-				cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}"
-
-			elif [ -d "${ROOT}/mnt/.init.d/started" ]
-			then
-				cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}"
-			fi
-		fi
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		echo
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		/sbin/depscan.sh &>/dev/null
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		einfo "Updating module dependencies..."
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f "${ROOT}/etc/modules.conf" ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [ "${ROOT}" = "/" -a \
-	     ! -f /etc/gshadow -a -x /usr/sbin/grpconv ]
-	then
-		/usr/sbin/grpconv
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated,"
-	ewarn "else things might break at your next reboot!  You can use 'etc-update'"
-	ewarn "to accomplish this:"
-	echo
-	ewarn "  # etc-update"
-	echo
-
-	if [ -f "${ROOT}/etc/env.d/99foo" ]
-	then
-		echo
-		ewarn "Due to large changes from 1.8.5 to 1.8.6, all your files in /etc/init.d"
-		ewarn "have been updated automatically.  If you did make any changes directly"
-		ewarn "to your old files, they can be found in /etc/init_d.old.  Please just"
-		ewarn "make sure to edit the new files, and not just copy the old over!"
-		echo
-
-		rm -f "${ROOT}/etc/env.d/99foo"
-
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-		sleep 8
-	fi
-}
-
-pkg_postrm() {
-
-	# Fix problematic links
-	ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-	ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
-	ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
deleted file mode 100644
index 166302acfa89..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
+++ /dev/null
@@ -1,706 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.20 2004/04/07 17:41:57 agriffis Exp $
-
-# This ebuild needs to be merged "live".  You can't simply make a package
-# of it and merge it later.
-
-IUSE="bootstrap build static"
-
-SV="1.4.3.8"
-SVREV="p1"
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux filesystem (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ~ppc sparc alpha mips hppa"
-
-DEPEND="virtual/os-headers
-	>=sys-apps/portage-2.0.23"
-# We need at least portage-2.0.23 to handle these DEPEND's properly.
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	use static && export LDFLAGS="-static"
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-	fi
-
-	# Add serial console ...
-	case ${ARCH} in
-		sparc|mips|hppa)
-			cp inittab inittab.orig
-			sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-			rm -f inittab.orig
-			;;
-	esac
-
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Sanity check to see if has version works
-		if has_version '>=sys-apps/baselayout-1.8' &> /dev/null
-		then
-			einfo "Checking if we need to tweak CONFIG_PROTECT_MASK"
-			# Make sure user get things updated first time he merge 1.8.6 ...
-			if ! has_version '>=sys-apps/baselayout-1.8.6' &> /dev/null
-			then
-				touch "${WORKDIR}/update_init_d"
-			fi
-		fi
-	fi
-}
-
-src_compile() {
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
-
-		if [ -z "`use bootstrap`" ]
-		then
-			# We let gawk now install filefuncs.so, and that is as a symlink to a
-			# versioned .so ...
-			if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ]
-			then
-				# Build gawk module
-#				cd ${S}/src/filefuncs
-#				einfo "Building awk module..."
-#				make CC="${CC:-gcc}" LD="${CC:-gcc}" || {
-#					eerror "Failed to build gawk module.  Make sure you have"
-#					eerror "sys-apps/gawk-3.1.1-r1 or later installed"
-#					die "problem compiling gawk module"
-#				}
-
-				eerror "Please install sys-apps/gawk-3.1.1-r2 or later!"
-				die "gawk too old"
-			fi
-		fi
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	local ROOT=""
-	ROOT="`cat ${T}/ROOT`"
-	if [ -e ${ROOT}/dev/.devfsd ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-# Only do a keepdir on mounts if they are not mounted ...
-keepdir_mount() {
-	local x=
-	local y=
-	local doit=0
-
-	[ -z "$1" ] && return 1
-
-	[ ! -e /proc/mounts ] && return 1
-
-	for y in $*
-	do
-		doit=0
-
-		for x in $(gawk '{print $2}' /proc/mounts)
-		do
-			[ "${x}" = "${y}" ] && doit=1
-		done
-
-		if [ "${doit}" -eq 0 ]
-		then
-			keepdir "${y}"
-		fi
-	done
-
-	return 0
-}
-
-src_install() {
-
-	local bar=
-	local foo=
-
-	defaltmerge
-	keepdir /sbin /usr/sbin
-
-	keepdir_mount /usr
-	keepdir /usr/bin
-	keepdir /lib /usr/lib
-	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
-	keepdir /var/log/news
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
-
-	# If it already exist, do not recreate, else we get
-	# problems when /usr/portage mounted as ro NFS, etc.
-	keepdir_mount /usr/portage
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	# End FHS compatibility symlinks stuff
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	chmod 1777 ${D}/var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	chmod go-rx ${D}/root
-	keepdir /tmp /var/lock
-	chmod 1777 ${D}/tmp
-	chmod 1777 ${D}/var/tmp
-	chown root:uucp ${D}/var/lock
-	chmod 775 ${D}/var/lock
-	insopts -m0644
-
-	keepdir /opt /etc/opt
-
-	insinto /etc
-	ln -s ../proc/filesystems ${D}/etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f ${foo} ] && doins ${foo}
-	done
-	chmod go-rwx ${D}/etc/shadow
-	keepdir_mount /mnt/floppy /mnt/cdrom
-	chmod go-rwx ${D}/mnt/floppy ${D}/mnt/cdrom
-
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	keepdir /lib/dev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-	else
-		# Normal
-		keepdir /dev
-		keepdir /dev/pts /dev/shm
-		dosym ../sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f ${foo} ] && doexe ${foo}
-	done
-
-	cd ${S}/sbin
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" ]
-	then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		for foo in ${S}/src/awk/*.awk
-		do
-			[ -f ${foo} ] && doins ${foo}
-		done
-
-#		if [ ! -L ${ROOT}/lib/rcscripts/filefuncs.so ]
-#		then
-#			exeinto /lib/rcscripts
-#			doexe ${S}/src/filefuncs/filefuncs.so
-#		fi
-	fi
-
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-
-		# SysvInit docs
-		cd ${S2}/../
-		for foo in ${S2}/../man/*.[1-9]
-		do
-			[ -f ${foo} ] && doman ${foo}
-		done
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	for foo in ${S}/man/*
-	do
-		[ -f ${foo} ] && doman ${foo}
-	done
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.autoload.d
-	insinto /etc/modules.autoload.d
-	for foo in in ${S}/etc/modules.autoload.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f ${foo} ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e ${S}/init.d/${bar} ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	# Make sure symlinks of these get installed.
-	if [ -e ${ROOT}/etc/init.d/depscan.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/depscan.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/depscan.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/runscript.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/runscript.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/runscript.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/functions.sh ] && \
-	   [ ! -L ${ROOT}/etc/init.d/functions.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/functions.sh
-	fi
-	if [ -e ${ROOT}/etc/init.d/rc-help.sh ]
-	then
-		rm -f ${ROOT}/etc/init.d/rc-help.sh
-	fi
-
-	# This one was borked, so make sure fixed one gets installed.
-	if [ -L ${ROOT}/usr/lib/X11 ]
-	then
-		rm -f ${ROOT}/usr/lib/X11
-	fi
-
-	if [ -f ${ROOT}/etc/modules.autoload -a ! -d ${ROOT}/etc/modules.autoload.d ]
-	then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	# Make sure user get things updated first time he merge 1.8.6 ...
-	if [ -f "${WORKDIR}/update_init_d" ]
-	then
-		# Update CONFIG_PROTECT_MASK to exclude /etc/init.d from
-		# CONFIG_PROTECT ...
-		ewarn "Changing CONFIG_PROTECT_MASK to ensure critical files are updated ..."
-		echo "CONFIG_PROTECT_MASK=\"/etc/init.d\"" \
-			> ${ROOT}/etc/env.d/99foo
-		env-update &> /dev/null
-		export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}:/etc/init.d"
-
-		if [ -d "${ROOT}/etc/init.d" ]
-		then
-			# Backup /etc/init.d if it exists ...
-			einfo "Backing up /etc/init.d ..."
-			cp -af "${ROOT}/etc/init.d" "${ROOT}/etc/init_d.old"
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	echo
-	# Doing device node creation in pkg_postinst() now so they aren't recorded
-	# in CONTENTS.  Latest CVS-only version of Portage doesn't record device
-	# nodes in CONTENTS at all.
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	if [ "${altmerge}" -eq "0" -a ! -e ${ROOT}/dev/.devfsd ]
-	then
-		cd ${ROOT}/dev
-		# These devices are also needed by many people and should be included
-		einfo "Making device nodes (this could take a minute or so...)"
-
-		case ${ARCH} in
-			amd64)
-				einfo "Using generic-i386 to make amd64 device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-i386
-				;;
-			x86)
-				einfo "Using generic-i386 to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-i386
-				;;
-			ppc)
-				einfo "Using generic-powerpc to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-powerpc
-				;;
-			sparc)
-				einfo "Using generic-sparc to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-sparc
-				;;
-			mips)
-				einfo "Using generic-mips to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-mips
-				;;
-			arm)
-				einfo "Using generic-arm to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-arm
-				;;
-			hppa)
-				einfo "Using generic-hppa to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic-hppa
-				;;
-			*)
-				einfo "Using generic to make device nodes..."
-				${ROOT}/sbin/MAKEDEV generic
-				;;
-		esac
-
-		${ROOT}/sbin/MAKEDEV sg
-		${ROOT}/sbin/MAKEDEV scd
-		${ROOT}/sbin/MAKEDEV rtc
-		${ROOT}/sbin/MAKEDEV audio
-		${ROOT}/sbin/MAKEDEV hde
-		${ROOT}/sbin/MAKEDEV hdf
-		${ROOT}/sbin/MAKEDEV hdg
-		${ROOT}/sbin/MAKEDEV hdh
-	fi
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	touch ${ROOT}/boot/.keep
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	local x=""
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-	# Make sure we get everything ready for $svcdir that moved to
-	# /var/lib/init.d ....
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		local oldsvcdir="${svcdir}"
-		local rcconfd="/etc/conf.d/rc"
-		local inittab="/etc/inittab"
-
-		# Remove old backup /etc/conf.d/rc files ...
-		rm -f ${ROOT}/etc/conf.d/._cfg????_rc
-		# Remove old backup /etc/inittab files ...
-		rm -f ${ROOT}/etc/._cfg????_inittab
-
-		# Replace and backup /etc/conf.d/rc (unless already in new format)
-		if [ -f "${ROOT}/${rcconfd}" ] && \
-		   ([ -z "$(grep '^svcmount' "${ROOT}/${rcconfd}")" ] || \
-		    [ -z "$(grep '^svcdir=\"\/var\/lib\/init.d\"' "${ROOT}/${rcconfd}")" ])
-			#svcdir="/var/lib/init.d"
-		then
-			ewarn "Backing up your old /etc/conf.d/rc, and replacing with new!"
-			ewarn "This is needed, as \$svcdir moved from /mnt/.init.d to"
-			ewarn "/var/state/init.d"
-			echo
-			cp -f "${ROOT}/${rcconfd}" "${ROOT}/${rcconfd}.old"
-			cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}"
-		fi
-
-		# Replace and backup /etc/inittab (unless already in new format)
-		if [ -f "${ROOT}/${inittab}" ] && \
-		   [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ]
-		then
-			ewarn "Backing up your old /etc/inittab, and replacing with new!"
-			ewarn "This is needed, as there were critical changes to /sbin/rc"
-			echo
-			cp -f "${ROOT}/${inittab}" "${ROOT}/${inittab}.old"
-			cp -f "${S}/${inittab}" "${ROOT}/${inittab}"
-		fi
-
-		source ${ROOT}/etc/conf.d/rc
-
-		# Handle the ${svcdir} that changed in location
-		if [ ! -d "${ROOT}/${svcdir}/started" ]
-		then
-			einfo "Trying to move SVCDIR to new location..."
-			echo
-			mkdir -p "${ROOT}/${svcdir}"
-#			mount -t tmpfs tmpfs ${ROOT}/${svcdir}
-			if [ -d "${ROOT}/${oldsvcdir}/started" ]
-			then
-				cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}"
-
-			elif [ -d "${ROOT}/mnt/.init.d/started" ]
-			then
-				cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}"
-			fi
-		fi
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		/sbin/depscan.sh &>/dev/null
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f ${ROOT}/etc/modules.conf ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated,"
-	ewarn "else things might break at your next reboot!  You can use 'etc-update'"
-	ewarn "to accomplish this:"
-	echo
-	ewarn "  # etc-update"
-	echo
-
-	if [ -f "${ROOT}/etc/env.d/99foo" ]
-	then
-		echo
-		ewarn "Due to large changes from 1.8.5 to 1.8.6, all your files in /etc/init.d"
-		ewarn "have been updated automatically.  If you did make any changes directly"
-		ewarn "to your old files, they can be found in /etc/init_d.old.  Please just"
-		ewarn "make sure to edit the new files, and not just copy the old over!"
-		echo
-
-		rm -f "${ROOT}/etc/env.d/99foo"
-	fi
-
-	echo
-	einfo "Please note that /sbin/update-modules moved to /sbin/modules-update"
-	einfo "for consistency reasons."
-	echo
-
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 8
-}
-
-pkg_postrm() {
-
-	# Fix problematic links
-	ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
-	ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
-	ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.7.ebuild b/sys-apps/baselayout/baselayout-1.8.7.ebuild
deleted file mode 100644
index 9a741c10ac51..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.7.ebuild
+++ /dev/null
@@ -1,649 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.7.ebuild,v 1.1 2004/04/07 17:41:57 agriffis Exp $
-
-IUSE="bootstrap build livecd static selinux"
-
-SV="1.4.4"
-SVREV=
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~ppc64 ~s390"
-
-DEPEND="virtual/os-headers
-	selinux? ( sys-libs/libselinux )"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )
-	!build? ( !bootstrap? ( >=sys-apps/util-linux-2.11z-r6 ) )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-	# Selinux
-	use selinux && epatch ${FILESDIR}/sysvinit-${SVIV}-selinux.patch
-
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-	fi
-
-	# Add serial console ...
-	case ${ARCH} in
-		sparc|mips|hppa)
-			cp inittab inittab.orig
-			sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-			rm -f inittab.orig
-			;;
-	esac
-}
-
-src_compile() {
-
-	use static && export LDFLAGS="-static"
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	if [ -f "${T}/ROOT" ]
-	then
-#		local ROOT=""
-		ROOT="`cat "${T}/ROOT"`"
-	fi
-	einfo "ROOT=${ROOT}"
-	if [ -e "${ROOT}/dev/.devfsd" ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-# Only do a keepdir on mounts if they are not mounted ...
-keepdir_mount() {
-	local x=
-	local y=
-	local doit=0
-
-	[ -z "$1" ] && return 1
-
-	[ ! -e /proc/mounts ] && return 1
-
-	for y in $*
-	do
-		doit=0
-
-		# Create a list so that we can try verify that they exists
-		# after install ...
-		echo "${Y}" >> "${T}/dirlist.txt"
-
-		for x in $(gawk '{print $2}' /proc/mounts)
-		do
-			[ "${x}" = "${y}" ] && doit=1
-		done
-
-		if [ "${doit}" -ne 1 ]
-		then
-			keepdir "${y}"
-		fi
-	done
-
-	return 0
-}
-
-create_dev_nodes() {
-
-	if [ -z "${DEST}" ]; then
-		DEST=${D}
-	fi
-
-	export PATH="${DEST}/sbin:${PATH}"
-
-	case ${ARCH} in
-		amd64)
-			# amd64 must use generic-i386 because amd64/x86_64 does not have
-			# a generic option at this time, and the default 'generic' ends
-			# up erroring out, because MAKEDEV internally doesn't know what
-			# to use
-			einfo "Using generic-i386 to make amd64 device nodes..."
-			${DEST}/sbin/MAKEDEV generic-i386
-			;;
-		x86)
-			einfo "Using generic-i386 to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-i386
-			;;
-		ppc)
-			einfo "Using generic-powerpc to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-powerpc
-			;;
-		ppc64)
-			einfo "Using generic-powerpc to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-powerpc
-			;;
-		sparc)
-			einfo "Using generic-sparc to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-sparc
-			;;
-		mips)
-			einfo "Using generic-mips to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-mips
-			;;
-		arm)
-			einfo "Using generic-arm to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-arm
-			;;
-		hppa)
-			einfo "Using generic-hppa to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-hppa
-			;;
-		*)
-			einfo "Using generic to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic
-			;;
-	esac
-
-	${DEST}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
-}
-
-src_install() {
-
-	local bar=
-	local foo=
-
-	defaltmerge
-	keepdir /sbin /usr/sbin
-
-	keepdir_mount /usr
-	keepdir /usr/bin
-	keepdir /lib /usr/lib
-	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
-	keepdir /var/log/news
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" -o "${ARCH}" = "ppc64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
-
-	# If it already exist, do not recreate, else we get
-	# problems when /usr/portage mounted as ro NFS, etc.
-	keepdir_mount /usr/portage
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	# End FHS compatibility symlinks stuff
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	fperms 1777 /var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	fperms go-rx /root
-	keepdir /tmp /var/lock
-	fperms 1777 /tmp
-	fperms 1777 /var/tmp
-	fowners root:uucp /var/lock
-	fperms 775 /var/lock
-	insopts -m0644
-
-	keepdir /opt /etc/opt
-
-	insinto /etc
-	dosym  ../proc/filesystems /etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f "${foo}" ] && doins ${foo}
-	done
-	fperms go-rwx /etc/shadow
-	# We do not want to overwrite the user's settings during bootstrap ...
-	[ -f "${ROOT}/etc/hosts" ] && rm -f ${D}/etc/hosts
-
-	keepdir /mnt
-	keepdir_mount /mnt/floppy /mnt/cdrom
-	fperms go-rwx /mnt/floppy /mnt/cdrom
-
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	keepdir /lib/dev-state /lib/udev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		#dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-
-		# Commented 07 Apr 2004 by agriffis... Make /dev in
-		# pkg_postinst instead to cope with portage borking when
-		# merging onto a mounted filesystem
-		#keepdir_mount /dev /dev/shm # /dev/pts
-		true
-	else
-		# Normal
-		keepdir_mount /dev /dev/pts /dev/shm
-		#dosym ../sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-	use livecd && dosbin livecd-functions.sh
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-	cd ${S}/bin
-	dobin rc-status
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f "${foo}" ] && doexe ${foo}
-	done
-
-	cd ${S}/sbin
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" ]
-	then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		for foo in ${S}/src/awk/*.awk
-		do
-			[ -f "${foo}" ] && doins ${foo}
-		done
-	fi
-
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-		# SysvInit include
-		insinto /usr/include
-		doins initreq.h
-		# SysvInit docs
-		cd ${S2}/../
-		for foo in ${S2}/../man/*.[1-9]
-		do
-			[ -f "${foo}" ] && doman ${foo}
-		done
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	for foo in ${S}/man/*
-	do
-		[ -f "${foo}" ] && doman ${foo}
-	done
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.autoload.d
-	insinto /etc/modules.autoload.d
-	for foo in in ${S}/etc/modules.autoload.d/*
-	do
-		[ -f "${foo}" ] && doins ${foo}
-	done
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f "${foo}" ] && doins ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f "${foo}" ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	if [ -n "$(use build)" -o -n "$(use bootstrap)" -o \
-	     ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		# Ok, create temp device nodes
-		mkdir -p "${T}/udev-$$"
-		cd "${T}/udev-$$"
-		echo
-		einfo "Making device nodes (this could take a minute or so...)"
-		create_dev_nodes
-		# Now create tarball that can also be used for udev
-		tar -jclpf "${T}/devices-$$.tar.bz2" *
-		insinto /lib/udev-state
-		newins "${T}/devices-$$.tar.bz2" devices.tar.bz2
-	fi
-
-	# Put this where we can get it again ...
-	insinto /usr/share/baselayout
-	doins "${T}/dirlist.txt"
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e "${S}/init.d/${bar}" ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	if [ -f ${ROOT}/etc/modules.autoload -a ! -d ${ROOT}/etc/modules.autoload.d ]
-	then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" -a -e "${ROOT}/dev/.udev" ]
-	then
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2.old"
-	fi
-}
-
-pkg_postinst() {
-	local x=
-
-	# Make sure all needed dirs exist ...
-	for x in $(cat "${ROOT}/usr/share/baselayout/dirlist.txt")
-	do
-		[ ! -d "${x}" ] && mkdir -m0666 -p "${x}" &>/dev/null
-	done
-
-	# Create /dev and /dev/shm (is it okay to leave perms default?)
-	mkdir -p ${ROOT}/dev ${ROOT}/dev/shm
-
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" ]
-	then
-		# Rather use our current device tarball ...
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2"
-	else
-		# Make sure our tarball do not get removed ...
-		touch -m "${ROOT}/lib/udev-state/devices.tar.bz2"
-	fi
-
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	# ($altmerge will be '1' if '${ROOT}/dev/.devfsd' exists ...)
-	if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" -a \
-	     -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
-		then
-			einfo "Populating /dev with device nodes..."
-			if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-			then
-				tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-					-C "${ROOT}/dev" || die
-			else
-				# devices.tar.bz2 will not exist with binary packages ...
-				cd ${ROOT}/dev
-				DEST="${ROOT}" create_dev_nodes
-			fi
-		fi
-	fi
-
-	echo
-
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	touch ${ROOT}/boot/.keep
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	if [ -d "${ROOT}/dev" ]
-	then
-		ln -snf ../sbin/MAKEDEV ${ROOT}/dev/MAKEDEV
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-# IPV6 versions of localhost and co
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		echo
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		/sbin/depscan.sh &>/dev/null
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		einfo "Updating module dependencies..."
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f "${ROOT}/etc/modules.conf" ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [ "${ROOT}" = "/" -a \
-	     ! -f /etc/gshadow -a -x /usr/sbin/grpck -a -x /usr/sbin/grpconv ]
-	then
-		/usr/sbin/grpck -r &>/dev/null
-		if [ "$?" -eq 0 ]
-		then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated,"
-	ewarn "else things might break at your next reboot!  You can use 'etc-update'"
-	ewarn "to accomplish this:"
-	echo
-	ewarn "  # etc-update"
-	echo
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.8.ebuild b/sys-apps/baselayout/baselayout-1.8.8.ebuild
deleted file mode 100644
index 81fc1e227879..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.8.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.8.ebuild,v 1.1 2004/04/08 22:22:08 agriffis Exp $
-
-IUSE="bootstrap build livecd static selinux"
-
-SV="1.4.6"
-SVREV=
-# SysvInit version
-SVIV="2.84"
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}/src"
-DESCRIPTION="Base layout for Gentoo Linux (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~ppc64 ~s390"
-
-DEPEND="virtual/os-headers
-	selinux? ( sys-libs/libselinux )"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? ( !bootstrap? ( >=sys-apps/gawk-3.1.1-r2 ) )
-	!build? ( !bootstrap? ( >=sys-apps/util-linux-2.11z-r6 ) )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix CFLAGS for sysvinit stuff
-	cd ${S2}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig >Makefile || die
-	if [ -n "`use build`" ]
-	then
-		# Do not build sulogin, as it needs libcrypt which is not in the
-		# build image.
-		cp Makefile Makefile.orig
-		sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \
-			Makefile.orig > Makefile || die
-	fi
-	# Selinux
-	if use selinux; then
-		if has_version '>=sys-libs/libselinux-1.6'; then
-			epatch ${FILESDIR}/sysvinit-${SVIV}-selinux1.patch
-		else
-			epatch ${FILESDIR}/sysvinit-${SVIV}-selinux.patch
-		fi
-	fi
-
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [ "${ARCH}" = "sparc" ]
-	then
-		cp rc.conf rc.conf.orig
-		sed -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf.orig >rc.conf || die
-		rm -f rc.conf.orig
-	fi
-
-	# Add serial console ...
-	case ${ARCH} in
-		sparc|mips|hppa)
-			cp inittab inittab.orig
-			sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab.orig > inittab || die
-			rm -f inittab.orig
-			;;
-	esac
-}
-
-src_compile() {
-
-	use static && export LDFLAGS="-static"
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Build sysvinit stuff
-		cd ${S2}
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" || die "problem compiling sysvinit"
-	fi
-}
-
-defaltmerge() {
-
-	# Define the "altmerge" variable.
-	altmerge=0
-	# Special ${T}/ROOT hack because ROOT gets automatically unset during src_install()
-	# (because it conflicts with some makefiles)
-	if [ -f "${T}/ROOT" ]
-	then
-#		local ROOT=""
-		ROOT="`cat "${T}/ROOT"`"
-	fi
-	einfo "ROOT=${ROOT}"
-	if [ -e "${ROOT}/dev/.devfsd" ]
-	then
-		# We're installing to a system that has devfs enabled; don't create device
-		# nodes.
-		altmerge=1
-	fi
-}
-
-# Only do a keepdir on mounts if they are not mounted ...
-keepdir_mount() {
-	local x=
-	local y=
-	local doit=0
-
-	[ -z "$1" ] && return 1
-
-	[ ! -e /proc/mounts ] && return 1
-
-	for y in $*
-	do
-		doit=0
-
-		# Create a list so that we can try verify that they exists
-		# after install ...
-		echo "${Y}" >> "${T}/dirlist.txt"
-
-		for x in $(gawk '{print $2}' /proc/mounts)
-		do
-			[ "${x}" = "${y}" ] && doit=1
-		done
-
-		if [ "${doit}" -ne 1 ]
-		then
-			keepdir "${y}"
-		fi
-	done
-
-	return 0
-}
-
-create_dev_nodes() {
-
-	if [ -z "${DEST}" ]; then
-		DEST=${D}
-	fi
-
-	export PATH="${DEST}/sbin:${PATH}"
-
-	case ${ARCH} in
-		amd64)
-			# amd64 must use generic-i386 because amd64/x86_64 does not have
-			# a generic option at this time, and the default 'generic' ends
-			# up erroring out, because MAKEDEV internally doesn't know what
-			# to use
-			einfo "Using generic-i386 to make amd64 device nodes..."
-			${DEST}/sbin/MAKEDEV generic-i386
-			;;
-		x86)
-			einfo "Using generic-i386 to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-i386
-			;;
-		ppc)
-			einfo "Using generic-powerpc to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-powerpc
-			;;
-		ppc64)
-			einfo "Using generic-powerpc to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-powerpc
-			;;
-		sparc)
-			einfo "Using generic-sparc to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-sparc
-			;;
-		mips)
-			einfo "Using generic-mips to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-mips
-			;;
-		arm)
-			einfo "Using generic-arm to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-arm
-			;;
-		hppa)
-			einfo "Using generic-hppa to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic-hppa
-			;;
-		*)
-			einfo "Using generic to make device nodes..."
-			${DEST}/sbin/MAKEDEV generic
-			;;
-	esac
-
-	${DEST}/sbin/MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
-}
-
-src_install() {
-
-	local bar=
-	local foo=
-
-	defaltmerge
-	keepdir /sbin /usr/sbin
-
-	keepdir_mount /usr
-	keepdir /usr/bin
-	keepdir /lib /usr/lib
-	keepdir /var /var/run /var/lock/subsys /var/state
-	keepdir /var/spool /var/tmp /var/lib/misc
-	keepdir /var/log/news
-	dosym ../var/tmp /usr/tmp
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [ "${ARCH}" = "amd64" -o "${ARCH}" = "ppc64" ]
-	then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	keepdir /home
-	keepdir /usr/include /usr/src
-	keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib
-	keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share
-
-	# If it already exist, do not recreate, else we get
-	# problems when /usr/portage mounted as ro NFS, etc.
-	keepdir_mount /usr/portage
-
-	#dosym ../src/linux/include/linux /usr/include/linux
-	#dosym ../src/linux/include/asm-i386 /usr/include/asm
-	# Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes.
-	# We now rely on the special sys-kernel/linux-headers package, which takes a snapshot of
-	# the currently-installed includes in /usr/src and copies them to /usr/include/linux and
-	# /usr/include/asm.  This is the recommended approach so that kernel includes can remain
-	# constant.  The kernel includes should really only be upgraded when you upgrade glibc.
-	keepdir /usr/include/linux /usr/include/asm
-	keepdir /usr/share/man /usr/share/info /usr/share/doc /usr/share/misc
-
-	for foo in games lib sbin share bin share/doc share/man src
-	do
-		keepdir /usr/local/${foo}
-	done
-	# Local FHS compat symlinks
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# FHS compatibility symlinks stuff
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	# End FHS compatibility symlinks stuff
-
-	# The .keep file messes up Portage when looking in /var/db/pkg
-	dodir /var/db/pkg
-	fperms 1777 /var/tmp
-	keepdir /root
-
-	# /proc is very likely mounted right now so a keepdir will fail on merge
-	dodir /proc
-
-	fperms go-rx /root
-	keepdir /tmp /var/lock
-	fperms 1777 /tmp
-	fperms 1777 /var/tmp
-	fowners root:uucp /var/lock
-	fperms 775 /var/lock
-	insopts -m0644
-
-	keepdir /opt /etc/opt
-
-	insinto /etc
-	dosym  ../proc/filesystems /etc/filesystems
-	for foo in hourly daily weekly monthly
-	do
-		keepdir /etc/cron.${foo}
-	done
-	for foo in ${S}/etc/*
-	do
-		# Install files, not dirs
-		[ -f "${foo}" ] && doins ${foo}
-	done
-	fperms go-rwx /etc/shadow
-	# We do not want to overwrite the user's settings during bootstrap ...
-	[ -f "${ROOT}/etc/hosts" ] && rm -f ${D}/etc/hosts
-
-	keepdir /mnt
-	keepdir_mount /mnt/floppy /mnt/cdrom
-	fperms go-rwx /mnt/floppy /mnt/cdrom
-
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	keepdir /lib/dev-state /lib/udev-state
-	if [ "${altmerge}" -eq "1" ]
-	then
-		# rootfs and devfs
-		#dosym ../../sbin/MAKEDEV /lib/dev-state/MAKEDEV
-		# This is not needed anymore...
-		#keepdir /lib/dev-state/pts /lib/dev-state/shm
-
-		# Commented 07 Apr 2004 by agriffis... Make /dev in
-		# pkg_postinst instead to cope with portage borking when
-		# merging onto a mounted filesystem
-		#keepdir_mount /dev /dev/shm # /dev/pts
-		true
-	else
-		# Normal
-		keepdir_mount /dev /dev/pts /dev/shm
-		#dosym ../sbin/MAKEDEV /dev/MAKEDEV
-	fi
-
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-	use livecd && dosbin livecd-functions.sh
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-	cd ${S}/bin
-	dobin rc-status
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	for foo in ${S}/init.d/*
-	do
-		[ -f "${foo}" ] && doexe ${foo}
-	done
-
-	cd ${S}/sbin
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if [ -z "`use build`" ]
-	then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		for foo in ${S}/src/awk/*.awk
-		do
-			[ -f "${foo}" ] && doins ${foo}
-		done
-	fi
-
-	# Compat symlinks (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	if [ -z "`use build`" ]
-	then
-		# Install sysvinit stuff
-		cd ${S2}
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-		# SysvInit include
-		insinto /usr/include
-		doins initreq.h
-		# SysvInit docs
-		cd ${S2}/../
-		for foo in ${S2}/../man/*.[1-9]
-		do
-			[ -f "${foo}" ] && doman ${foo}
-		done
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	for foo in ${S}/man/*
-	do
-		[ -f "${foo}" ] && doman ${foo}
-	done
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	# env-update stuff
-	keepdir /etc/env.d
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/00basic
-
-	keepdir /etc/devfs.d
-
-	keepdir /etc/modules.autoload.d
-	insinto /etc/modules.autoload.d
-	for foo in in ${S}/etc/modules.autoload.d/*
-	do
-		[ -f "${foo}" ] && doins ${foo}
-	done
-
-	keepdir /etc/modules.d
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386
-
-	keepdir /etc/conf.d
-	insinto /etc/conf.d
-	for foo in ${S}/etc/conf.d/*
-	do
-		[ -f "${foo}" ] && doins ${foo}
-	done
-
-	# Now ships with net-dialup/ppp ...
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*
-
-	dodir /etc/skel
-	insinto /etc/skel
-	for foo in $(find ${S}/etc/skel -type f -maxdepth 1)
-	do
-		[ -f "${foo}" ] && doins ${foo}
-	done
-
-	keepdir ${svcdir} >/dev/null 2>&1
-
-	if [ -n "$(use build)" -o -n "$(use bootstrap)" -o \
-	     ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		# Ok, create temp device nodes
-		mkdir -p "${T}/udev-$$"
-		cd "${T}/udev-$$"
-		echo
-		einfo "Making device nodes (this could take a minute or so...)"
-		create_dev_nodes
-		# Now create tarball that can also be used for udev
-		tar -jclpf "${T}/devices-$$.tar.bz2" *
-		insinto /lib/udev-state
-		newins "${T}/devices-$$.tar.bz2" devices.tar.bz2
-	fi
-
-	# Put this where we can get it again ...
-	insinto /usr/share/baselayout
-	doins "${T}/dirlist.txt"
-
-	# Skip this if we are merging to ROOT
-	[ "${ROOT}" = "/" ] && return 0
-
-	# Set up default runlevel symlinks
-	for foo in default boot nonetwork single
-	do
-		keepdir /etc/runlevels/${foo}
-		for bar in $(cat ${S}/rc-lists/${foo})
-		do
-			[ -e "${S}/init.d/${bar}" ] && \
-				dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-		done
-	done
-
-}
-
-pkg_preinst() {
-	if [ -f ${ROOT}/etc/modules.autoload -a ! -d ${ROOT}/etc/modules.autoload.d ]
-	then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" -a -e "${ROOT}/dev/.udev" ]
-	then
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2.old"
-	fi
-}
-
-pkg_postinst() {
-	local x=
-
-	# Make sure all needed dirs exist ...
-	for x in $(cat "${ROOT}/usr/share/baselayout/dirlist.txt")
-	do
-		[ ! -d "${x}" ] && mkdir -m0666 -p "${x}" &>/dev/null
-	done
-
-	# Create /dev and /dev/shm (is it okay to leave perms default?)
-	mkdir -p ${ROOT}/dev ${ROOT}/dev/shm
-
-	if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" ]
-	then
-		# Rather use our current device tarball ...
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2.old" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2"
-	else
-		# Make sure our tarball do not get removed ...
-		touch -m "${ROOT}/lib/udev-state/devices.tar.bz2"
-	fi
-
-	defaltmerge
-	# We dont want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	# ($altmerge will be '1' if '${ROOT}/dev/.devfsd' exists ...)
-	if [ "${altmerge}" -eq "0" -a ! -e "${ROOT}/dev/.udev" -a \
-	     -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-	then
-		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
-		then
-			einfo "Populating /dev with device nodes..."
-			if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]
-			then
-				tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-					-C "${ROOT}/dev" || die
-			else
-				# devices.tar.bz2 will not exist with binary packages ...
-				cd ${ROOT}/dev
-				DEST="${ROOT}" create_dev_nodes
-			fi
-		fi
-	fi
-
-	echo
-
-	# We create the /boot directory here so that /boot doesn't get deleted when a previous
-	# baselayout is unmerged with /boot unmounted.
-	install -d ${ROOT}/boot
-	touch ${ROOT}/boot/.keep
-	if [ ! -L ${ROOT}/boot/boot ]
-	then
-		ln -snf . ${ROOT}/boot/boot
-	fi
-	if [ -d "${ROOT}/dev" ]
-	then
-		ln -snf ../sbin/MAKEDEV ${ROOT}/dev/MAKEDEV
-	fi
-	# We create this here so we don't overwrite an existing /etc/hosts during bootstrap
-	if [ ! -e ${ROOT}/etc/hosts ]
-	then
-		cat << EOF >> ${ROOT}/etc/hosts
-127.0.0.1	localhost
-# IPV6 versions of localhost and co
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-	fi
-	if [ -L ${ROOT}/etc/mtab ]
-	then
-		rm -f ${ROOT}/etc/mtab
-		if [ "$ROOT" = "/" ]
-		then
-			cp /proc/mounts ${ROOT}/etc/mtab
-		else
-			touch ${ROOT}/etc/mtab
-		fi
-	fi
-	# We should only install empty files if these files don't already exist.
-	for x in log/lastlog run/utmp log/wtmp
-	do
-		[ -e ${ROOT}/var/${x} ] || touch ${ROOT}/var/${x}
-	done
-	for x in run/utmp log/wtmp
-	do
-		chgrp utmp ${ROOT}/var/${x}
-		chmod 0664 ${ROOT}/var/${x}
-	done
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if [ -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		ewarn "Removing invalid backup copies of critical config files..."
-		rm -f ${ROOT}/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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}" = "/" -a -z "`use build`" -a -z "`use bootstrap`" ]
-	then
-		echo
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null || :
-
-		/sbin/depscan.sh &>/dev/null
-
-		# We need to regenerate /etc/modules.conf, else it will fail at next
-		# boot.
-		einfo "Updating module dependencies..."
-		/sbin/modules-update force &> /dev/null
-
-	elif [ -f "${ROOT}/etc/modules.conf" ]
-	then
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [ "${ROOT}" = "/" -a \
-	     ! -f /etc/gshadow -a -x /usr/sbin/grpck -a -x /usr/sbin/grpconv ]
-	then
-		/usr/sbin/grpck -r &>/dev/null
-		if [ "$?" -eq 0 ]
-		then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
-	# Simple Release version for testing of features that *should* be
-	# present in the rc-scripts, etc.
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	ewarn "Please be sure to update all pending '._cfg*' files in /etc are updated,"
-	ewarn "else things might break at your next reboot!  You can use 'etc-update'"
-	ewarn "to accomplish this:"
-	echo
-	ewarn "  # etc-update"
-	echo
-}
-
diff --git a/sys-apps/baselayout/baselayout-1.8.9.ebuild b/sys-apps/baselayout/baselayout-1.8.9.ebuild
deleted file mode 100644
index f37ec2f6f69d..000000000000
--- a/sys-apps/baselayout/baselayout-1.8.9.ebuild
+++ /dev/null
@@ -1,555 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.9.ebuild,v 1.2 2004/04/13 02:25:16 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="bootstrap build livecd static selinux"
-
-SV="1.4.7"		# rc-scripts version
-SVREV=			# rc-scripts rev
-SVIV="2.84"		# sysvinit version
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-S2="${WORKDIR}/sysvinit-${SVIV}"
-DESCRIPTION="Base layout for Gentoo Linux (incl. initscripts and sysvinit)"
-SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.gz
-	ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/sysvinit-${SVIV}.tar.gz
-	mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~ppc64 ~s390"
-
-DEPEND="virtual/os-headers
-	selinux? ( sys-libs/libselinux )"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND="${DEPEND}
-	!build? !bootstrap? (
-		>=sys-apps/gawk-3.1.1-r2
-		>=sys-apps/util-linux-2.11z-r6
-	)"
-
-src_unpack() {
-	unpack ${A}
-
-	#
-	# Baselayout setup
-	#
-	cd ${S}/etc
-
-	# Fix Sparc specific stuff
-	if [[ ${ARCH} == sparc ]]; then
-		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' rc.conf || die
-	fi
-
-	# Add serial console for arches that typically have it
-	case ${ARCH} in
-		sparc|mips|hppa|alpha|ia64)
-			sed -i -e \
-				's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \
-				inittab || die
-			;;
-	esac
-
-	#
-	# sysvinit setup
-	#
-	if ! use build; then
-		cd ${S2}/src
-
-		# Note that if sysvinit is ever built with USE=build, need to
-		# refrain from building sulogin as it needs libcrypt which is
-		# not in the build image:
-		# sed -i -e '/^PROGS/s/ sulogin//' Makefile || die
-
-		# Selinux patch for sysvinit
-		if use selinux; then
-			if has_version '>=sys-libs/libselinux-1.6'; then
-				epatch ${FILESDIR}/sysvinit-${SVIV}-selinux1.patch
-			else
-				epatch ${FILESDIR}/sysvinit-${SVIV}-selinux.patch
-			fi
-		fi
-	fi
-
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	echo "${ROOT}" > ${T}/ROOT
-
-	cd ${S}/src
-	einfo "Building utilities..."
-	make CC="${CC:-gcc}" LD="${CC:-gcc} ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die "problem compiling utilities"
-
-	if ! use build; then
-		# Build sysvinit stuff
-		cd ${S2}/src
-		einfo "Building sysvinit..."
-		emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
-			LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" || die "problem compiling sysvinit"
-	else
-		einfo "Not building sysvinit because USE=build"
-	fi
-}
-
-# ${PATH} should include where to get MAKEDEV when calling this
-# function
-create_dev_nodes() {
-
-	case ${ARCH} in
-		# amd64 must use generic-i386 because amd64/x86_64 does not have
-		# a generic option at this time, and the default 'generic' ends
-		# up erroring out, because MAKEDEV internally doesn't know what
-		# to use
-		amd64)	suffix=-i386 ;;
-		x86)	suffix=-i386 ;;
-		ppc*)	suffix=-powerpc ;;
-		alpha)	suffix=-alpha ;;
-		ia64)	suffix=-ia64 ;;
-		sparc*)	suffix=-sparc ;;
-		mips)	suffix=-mips ;;
-		arm)	suffix=-arm ;;
-		hppa)	suffix=-hppa ;;
-	esac
-
-	einfo "Using generic${suffix} to make ${ARCH} device nodes..."
-	MAKEDEV generic${suffix}
-	MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
-}
-
-# This is a temporary workaround until bug 9849 is completely solved
-# in portage.  We need to create the directories so they're available
-# during src_install, but when src_install is finished, call unkdir
-# to remove any empty directories instead of leaving them around.
-kdir() {
-	typeset -a args
-	typeset d
-
-	# Create the directories for the remainder of src_install, and
-	# remember how to create the directories later.
-	for d in "$@"; do
-		if [[ $d == /* ]]; then
-			install -d "${args[@]}" "${D}/${d}"
-			cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
-install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
-	|| ewarn "  can't create ${d}"
-touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
-	|| ewarn "  can't create ${d}/.keep"
-EOF
-		else
-			args=("${args[@]}" "${d}")
-		fi
-	done
-}
-
-# Continued from kdir above...  This function removes any empty
-# directories as a temporary workaround for bug 9849.  The directories
-# (and .keep files) are re-created in pkg_postinst, which means they
-# aren't listed in CONTENTS, unfortunately.
-unkdir() {
-	einfo "Running unkdir to workaround bug 9849"
-	find ${D} -depth -type d -exec rmdir {} \; 2>/dev/null
-	if [[ $? == 127 ]]; then
-		ewarn "Problem running unkdir: find command not found"
-	fi
-}
-
-src_install() {
-	local foo bar
-
-	# ROOT is purged from the environment prior to calling
-	# src_install.  Good thing we saved it in a temporary file.
-	# Otherwise ROOT will be NULL, which hopefully is correct!
-	# (I don't know why it was in the environment in the first
-	# place... could have just used a shell variable?)
-	if [[ -f ${T}/ROOT ]]; then
-		ROOT=$(cat ${T}/ROOT)
-	fi
-
-	# This directory is to stash away things that will be used in
-	# pkg_postinst
-	dodir /usr/share/baselayout
-
-	einfo "Creating directories..."
-	kdir /boot
-	kdir /dev
-	kdir /dev/pts
-	kdir /dev/shm
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/devfs.d
-	kdir /etc/env.d
-	kdir /etc/modules.autoload.d
-	kdir /etc/modules.d
-	kdir /etc/opt
-	kdir /home
-	kdir /lib
-	kdir /lib/dev-state
-	kdir /lib/udev-state
-	kdir /mnt
-	kdir -m 0700 /mnt/cdrom
-	kdir -m 0700 /mnt/floppy
-	kdir /opt
-	kdir -o root -g uucp -m0755 /var/lock
-	kdir /proc
-	kdir -m 0700 /root
-	kdir /sbin
-	kdir /usr
-	kdir /usr/bin
-	kdir /usr/include
-	kdir /usr/include/asm
-	kdir /usr/include/linux
-	kdir /usr/lib
-	kdir /usr/local/bin
-	kdir /usr/local/games
-	kdir /usr/local/lib
-	kdir /usr/local/sbin
-	kdir /usr/local/share
-	kdir /usr/local/share/doc
-	kdir /usr/local/share/man
-	kdir /usr/local/src
-	kdir /usr/portage
-	kdir /usr/sbin
-	kdir /usr/share/doc
-	kdir /usr/share/info
-	kdir /usr/share/man
-	kdir /usr/share/misc
-	kdir /usr/src
-	kdir /usr/X11R6/include/GL
-	kdir /usr/X11R6/include/X11
-	kdir /usr/X11R6/lib
-	kdir /usr/X11R6/lib
-	kdir /usr/X11R6/man
-	kdir /usr/X11R6/share
-	kdir -m 1777 /tmp
-	kdir /var
-	kdir /var/lib/misc
-	kdir /var/lock/subsys
-	kdir /var/log/news
-	kdir /var/run
-	kdir /var/spool
-	kdir /var/state
-	kdir -m 1777 /var/tmp
-
-	dodir /etc/init.d		# .keep file might mess up init.d stuff
-	dodir /var/db/pkg		# .keep file messes up Portage when looking in /var/db/pkg
-
-	# Symlinks so that LSB compliant apps work
-	# /lib64 is especially required since its the default place for ld.so
-	if [[ ${ARCH} == amd64 || ${ARCH} == ppc64 ]]; then
-		dosym lib /lib64
-		dosym lib /usr/lib64
-		dosym lib /usr/X11R6/lib64
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym ../var/tmp /usr/tmp
-	dosym share/man /usr/man
-	dosym share/doc /usr/doc
-	dosym share/info /usr/info
-	dosym ../../share/info	/usr/X11R6/share/info
-	dosym ../X11R6/include/X11 /usr/include/X11
-	dosym ../X11R6/include/GL /usr/include/GL
-	dosym ../X11R6/lib/X11 /usr/lib/X11
-	dosym share/man /usr/local/man
-	dosym share/doc	/usr/local/doc
-
-	# Symlink /boot/boot to . so that /boot can be a separate
-	# filesystem and config files still work
-	dosym . /boot/boot
-
-	#
-	# Setup files in /etc
-	#
-	dosym  ../proc/filesystems /etc/filesystems
-
-	insopts -m0644
-	insinto /etc
-	find ${S}/etc -type f -maxdepth 1 -print0 | xargs --null doins
-
-	fperms 0600 /etc/shadow
-
-	exeinto /etc/init.d
-	doexe ${S}/init.d/*
-	insinto /etc/conf.d
-	doins ${S}/etc/conf.d/*
-	insinto /etc/env.d
-	doins ${S}/etc/env.d/*
-	insinto /etc/modules.autoload.d
-	doins ${S}/etc/modules.autoload.d/*
-	insinto /etc/modules.d
-	doins ${S}/etc/modules.d/*
-	insinto /etc/skel
-	find ${S}/etc/skel -type f -maxdepth 1 -print0 | xargs --null doins
-
-	rm -f ${D}/etc/{conf,init}.d/net.ppp*	# now ships with net-dialup/ppp
-
-	# Set up default runlevel symlinks
-	if [[ ${ROOT} != / ]]; then
-		for foo in default boot nonetwork single; do
-			kdir /etc/runlevels/${foo}
-			for bar in $(cat ${S}/rc-lists/${foo}); do
-				[[ -e ${S}/init.d/${bar} ]] && \
-					dosym /etc/init.d/${bar} /etc/runlevels/${foo}/${bar}
-			done
-		done
-	fi
-
-	# We do not want to overwrite the user's settings during
-	# bootstrap;  put this somewhere for safekeeping until pkg_postinst
-	mv ${D}/etc/hosts ${D}/usr/share/baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
-
-	#
-	# Setup files related to /dev
-	#
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	dosym ../sbin/MAKEDEV /dev/MAKEDEV
-
-	if use build || use bootstrap || \
-			[[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
-		# Ok, create temp device nodes
-		mkdir -p "${T}/udev-$$"
-		cd "${T}/udev-$$"
-		echo
-		einfo "Making device nodes (this could take a minute or so...)"
-		PATH="${D}/sbin:${PATH}" create_dev_nodes
-
-		# Now create tarball that can also be used for udev.
-		# Need GNU tar for -j so call it by absolute path.
-		/bin/tar -cjlpf "${T}/devices-$$.tar.bz2" *
-		insinto /lib/udev-state
-		newins "${T}/devices-$$.tar.bz2" devices.tar.bz2
-	fi
-
-	#
-	# Setup files in /bin
-	#
-	cd ${S}/bin
-	dobin rc-status
-
-	#
-	# Setup files in /sbin
-	#
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# Need this in /sbin, as it could be run before
-	# /usr is mounted.
-	dosbin modules-update
-	# Compat symlinks until I can get things synced.
-	dosym modules-update /sbin/update-modules
-	dosym ../../sbin/modules-update /usr/sbin/update-modules
-	# These moved from /etc/init.d/ to /sbin to help newb systems
-	# from breaking
-	dosbin runscript.sh functions.sh
-	use livecd && dosbin livecd-functions.sh
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	#
-	# Setup files in /lib/rcsripts/sh
-	#
-	cd ${S}/sbin
-	exeinto /lib/rcscripts/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if ! use build; then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		cd ${S}/sbin
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto /lib/rcscripts/awk
-		doins ${S}/src/awk/*.awk
-	fi
-
-	#
-	# Install baselayout documentation
-	#
-	doman ${S}/man/*.*
-	docinto /
-	dodoc ${FILESDIR}/copyright
-	dodoc ${S}/ChangeLog
-
-	#
-	# Install baselayout utilities
-	#
-	cd ${S}/src
-	einfo "Installing utilities..."
-	make DESTDIR="${D}" install || die "problem installing utilities"
-
-	#
-	# Install sysvinit
-	#
-	if ! use build; then
-		cd ${S2}/src
-		einfo "Installing sysvinit..."
-		into /
-		dosbin init halt killall5 runlevel shutdown sulogin
-		dosym init /sbin/telinit
-		dobin last mesg utmpdump wall
-		dosym killall5 /sbin/pidof
-		dosym halt /sbin/reboot
-		dosym halt /sbin/poweroff
-		dosym last /bin/lastb
-		insinto /usr/include
-		doins initreq.h
-		# sysvinit docs
-		cd ${S2}
-		doman man/*.[1-9]
-		docinto sysvinit-${SVIV}
-		dodoc COPYRIGHT README doc/*
-	fi
-
-	# Hack to fix bug 9849, continued in pkg_postinst
-	unkdir
-}
-
-pkg_preinst() {
-	if [[ -f ${ROOT}/etc/modules.autoload && \
-			! -d ${ROOT}/etc/modules.autoload.d ]]; then
-		mkdir -p ${ROOT}/etc/modules.autoload.d
-		mv -f ${ROOT}/etc/modules.autoload \
-			${ROOT}/etc/modules.autoload.d/kernel-2.4
-		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
-	fi
-
-	if [[ -f "${ROOT}/lib/udev-state/devices.tar.bz2" &&
-			-e "${ROOT}/dev/.udev" ]]; then
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2.current"
-	fi
-}
-
-pkg_postinst() {
-	local x
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files"
-	source ${ROOT}/usr/share/baselayout/mkdirs.sh
-
-	if [[ -f "${ROOT}/lib/udev-state/devices.tar.bz2.current" ]]; then
-		# Rather use our current device tarball ... this was saved off
-		# in pkg_preinst
-		mv -f "${ROOT}/lib/udev-state/devices.tar.bz2.current" \
-			"${ROOT}/lib/udev-state/devices.tar.bz2"
-	else
-		# Make sure our tarball does not get removed; update the
-		# timestamp so that it doesn't match CONTENTS
-		touch "${ROOT}/lib/udev-state/devices.tar.bz2"
-	fi
-
-	# We don't want to create devices if this is not a bootstrap and devfs
-	# is used, as this was the cause for all the devfs problems we had
-	if use build || use bootstrap; then
-		if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then
-			einfo "Populating /dev with device nodes..."
-			cd ${ROOT}/dev
-			if [ -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]; then
-				tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
-			else
-				# devices.tar.bz2 will not exist with binary packages ...
-				PATH="${ROOT}/sbin:${PATH}" create_dev_nodes
-			fi
-		fi
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly.  thus remove all ._cfg files if
-	# we are not busy with a bootstrap.
-	if ! use build && ! use bootstrap; then
-		einfo "Removing invalid backup copies of critical config files..."
-		rm -f "${ROOT}"/etc/._cfg????_{passwd,shadow}
-	fi
-
-	# 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
-		# Do not return an error if this fails
-		/sbin/init U &>/dev/null
-
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh &>/dev/null
-
-		# Regenerate /etc/modules.conf, else it will fail at next boot
-		einfo "Updating module dependencies..."
-		/sbin/modules-update force &>/dev/null
-	else
-		rm -f ${ROOT}/etc/modules.conf
-	fi
-
-	# Enable shadow groups (we need ROOT=/ here, as grpconv only
-	# operate on / ...).
-	if [[ ${ROOT} == / && \
-	     ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
-	then
-		if /usr/sbin/grpck -r &>/dev/null; then
-			/usr/sbin/grpconv
-		else
-			echo
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-			echo
-		fi
-	fi
-
-	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
-}
-
diff --git a/sys-apps/baselayout/files/MAKEDEV.8 b/sys-apps/baselayout/files/MAKEDEV.8
deleted file mode 100644
index e9a8b2e52691..000000000000
--- a/sys-apps/baselayout/files/MAKEDEV.8
+++ /dev/null
@@ -1,395 +0,0 @@
-.\" $Id: MAKEDEV.8,v 1.1 2000/08/28 06:02:54 achim Exp $
-.TH MAKEDEV 8 "14th August 1994" Linux "Linux Programmer's Manual"
-.SH NAME
-MAKEDEV \- create devices
-.SH SYNOPSIS
-.B "cd dev; ./MAKEDEV -V"
-.br
-.B "cd dev; ./MAKEDEV [ -n ] [ -v ] update"
-.br
-.BI "cd dev; ./MAKEDEV [ -n ] [ -v ] [ -d ]" " device ..."
-.SH DESCRIPTION
-.B MAKEDEV
-is a script that will create the devices in \fC/dev\fP used to interface
-with drivers in the kernel.
-.PP
-Note that programs giving the error ``ENOENT: No such file or
-directory'' normally means that the device file is missing, whereas
-``ENODEV: No such device'' normally means the kernel does not have the
-driver configured or loaded.
-.PP 
-.BR Warning!
-This man page is not up to date.  There are various devices that /dev/MAKEDEV
-knows how to create that are not documented in this man page.  Read the script
-for more information.
-.SH OPTIONS
-.TP
-.B \-V
-Print out version (actually RCS version information) and exit.
-.TP
-.B \-n
-Do not actually update the devices, just print the actions that would be
-performed.
-.TP
-.B \-d
-Delete the devices.  The main use for this flag is by
-.B MAKEDEV
-itself.
-.TP
-.B \-v
-Be verbose.  Print out the actions as they are performed.  This is the
-same output as produced by
-.BR \-n .
-.SH CUSTOMISATION
-Since there is currently no standardisation in what names are used for
-system users and groups, it is possible that you may need to modify
-.B MAKEDEV
-to reflect your site's settings.  Near the top of the file is a mapping
-from device type to user, group and permissions (e.g. all CD-ROM devices
-are set from the \fC$cdrom\fP variable).  If you wish to change the
-defaults, this is the section to edit.
-.SH DEVICES
-.TP
-.B General Options
-.TP
-.B update
-This only works on kernels which have \fC/proc/interrupts\fP (introduced
-during 1.1.x).  This file is scanned to see what devices are currently
-configured into the kernel, and this is compared with the previous
-settings stored in the file called \fCDEVICES\fP.
-Devices which are new since then or have a different major number are
-created, and those which are no longer configured are deleted.
-.TP
-.B generic
-Create a generic subset of devices.  This is the standard devices, plus
-floppy drives, various hard drives, pseudo-terminals, console devices,
-basic serial devices, busmice, and printer ports.
-.TP
-.B
-std
-Standard devices.
-These are:
-.B mem
-\- acess to physical memory;
-.B kmem
-\- access to kernel virtual memory;
-.B null
-\- null device (infinite sink);
-.B port
-\- access to I/O ports;
-.B zero
-\- null byte source (infinite source);
-.B core
-\- symlink to /proc/kcore (for kernel debugging);
-.B full
-\- always returns ENOSPACE on write;
-.B ram
-\- ramdisk;
-.B tty
-\- to access the controlling tty of a process.
-.TP 
-.B local
-This simply runs 
-.BR MAKEDEV.local .
-This is a script that can create any local devices.
-.TP
-.B Virtual Terminals
-.TP
-.I console
-This creates the devices associated with the console.  This is the virtual
-terminals
-.RI tty x ,
-where
-.I x
-can be from 0 though 63.  The device tty0 is the currently active vt, and
-is also known as \fCconsole\fP.  For each vt, there are two devices
-.RI vcs x
-and
-.RI vcsa x ,
-which are used to generate screen-dumps of the vt (the
-.BI vcs x
-is just the text,
-and
-.BI vcsa x
-includes the attributes).
-.TP
-.B Serial Devices
-.TP
-.I ttyS{0..63}
-Serial ports and corresponding dialout device.  For device
-.BI ttyS x ,
-there is also the device
-.BI cua x
-which is used to dial out with.  This can avoid the need for cooperative
-locks in simple situations.
-.TP
-.I cyclades
-Dial-in and dial-out devices for the cyclades intelligent I/O serial card.
-The dial in device is
-.BI ttyC x
-and the corresponding dial-out device is
-.BI cub x 
-By default devices for 7 lines are created, but this can be changed to
-15 by removing the comment.
-.TP
-.B Pseudo Terminals
-.TP
-.I pty[p-s]
-Each possible argument will create a bank of 16 master and slave
-pairs.  The current kernel (1.2) is limited to 64 such pairs.
-The master pseudo-terminals are 
-.BR pty[p-s][0-9a-f] ,
-and the slaves are
-.BR tty[p-s][0-9a-f] .
-.TP
-.B Parallel Ports
-.TP
-.I lp
-Standard parallel ports.  The devices are created 
-.BR lp0 , 
-.BR lp1 ,
-and 
-.BR lp2 .
-These correspond to ports at 0x3bc, 0x378 and 0x278.
-Hence, on some machines, the first printer port may actually be
-.BR lp1 .
-.TP
-.I par
-Alternative to
-.IR lp .
-Ports are named
-.BI par x
-instead of
-.BI lp x .
-.TP
-.B Bus Mice
-.TP
-.I busmice
-The various bus mice devices.  This creates the following devices:
-.B logimouse
-(Logitech bus mouse),
-.B psmouse
-(PS/2-style mouse),
-.B msmouse
-(Microsoft Inport bus mouse) and
-.B atimouse
-(ATI XL bus mouse) and
-.B jmouse
-(J-mouse).
-.TP
-.B Joystick Devices
-.TP
-.I js
-Joystick.  Creates 
-.B js0
-and 
-.BR js1 .
-.TP
-.B Disk Devices
-.TP
-.I fd[0-7]
-Floppy disk devices.  The device
-.BI fd x
-is the device which autodetects the format, and the additional devices are
-fixed format (whose size is indicated in the name).
-The other devices are named as
-.BI fd xLn .
-The single letter
-.I L
-identifies the type of floppy disk (d = 5.25" DD, h = 5.25" HD, D = 3.5"
-DD, H = 3.5" HD, E = 3.5" ED).  The number
-.I n
-represents the capacity of that format in K.  Thus the standard formats
-are
-.BI fd x d360 ,
-.BI fd x h1200 ,
-.BI fd x D720 ,
-.BI fd x H1440 ,
-and
-.RI fd x E2880 .
-.IP
-For more information see Alain Knaff's fdutils package.
-.IP
-Devices
-.BI fd0 *
-through
-.BI fd3 *
-are floppy disks on the first controller, and devices
-.BI fd4 *
-through
-.BI fd7 *
-are floppy disks on the second controller.
-.TP
-.I hd[a-d]
-AT hard disks.  The device
-.BI hd x
-provides access to the whole disk, with the partitions being
-.BI hd x [0-20].
-The four primary partitions are
-.BI hd x 1
-through
-.BI hd x 4,
-with the logical partitions being numbered from
-.BI hd x 5
-though
-.BI hd x 20.
-(A primary partition can be made into an extended partition, which can hold
-4 logical partitions).
-By default, only the devices for 4 logical partitions are made.  The
-others can be made by uncommenting them.
-.IP
-Drives hda and hdb are the two on the first controller.  If using the new
-IDE driver (rather than the old HD driver), then hdc and hdd are the two
-drives on the secondary controller.  These devices can also be used to
-acess IDE CDROMs if using the new IDE driver.
-.TP
-.I xd[a-d] 
-XT hard disks.  Partitions are the same as IDE disks.
-.TP
-.I sd[a-h]
-SCSI hard disks.  The partitions are similar to the IDE disks, but there
-is a limit of 11 logical partitions
-.RI (sd x 5
-through
-.RI sd x 15).
-This is to allow there to be 8 SCSI disks.
-.TP
-.I loop
-Loopback disk devices.  These allow you to use a regular file as a
-block device.  This means that images of filesystems can be mounted,
-and used as normal.  This creates 8 devices loop0 through loop7.
-.TP
-.B Tape Devices
-.TP
-.I st[0-7]
-SCSI tapes.  This creates the rewinding tape device
-.BI st x
-and the non-rewinding tape device
-.BI nst x .
-.TP
-.I qic
-QIC-80 tapes.  The devices created are
-.BR rmt8 ,
-.BR rmt16 ,
-.BR tape-d ,
-and
-.BR tape-reset .
-.TP
-.I ftape
-Floppy driver tapes (QIC-117).  There are 4 methods of access depending on
-the floppy tape drive.  For each of access methods 0, 1, 2 and 3, the
-devices
-.BI rft x
-(rewinding) and
-.BI nrft x
-(non-rewinding) are created.  For compatability, devices
-.B ftape
-and
-.B nftape
-are symlinks to
-.B rft0
-and
-.B nrft0
-respectively.
-.TP
-.B CDROM Devices
-.TP
-.I scd[0-7]
-SCSI CD players.
-.TP
-.I sonycd
-Sony CDU-31A CD player.
-.TP
-.I mcd
-Mitsumi CD player.
-.TP
-.I cdu535
-Sony CDU-535 CD player.
-.TP
-.I lmscd
-LMS/Philips CD player.
-.TP
-.I sbpcd{,1,2,3}
-Sound Blaster CD player.  The kernel is capable of supporting 16 CDROMs,
-each of which is accessed as
-.BR sbpcd[0-9a-f] .
-These are assigned in groups of 4 to each controller.
-.B sbpcd
-is a symlink to
-.BR sbpcd0 .
-.\" .TP
-.\" .I idecd
-.\" NEC CDR-260 (note: this will probably be obsoleted by the new IDE driver).
-.TP
-.B Scanner
-.TP
-.I logiscan
-Logitech ScanMan32 & ScanMan 256.
-.TP
-.I m105scan
-Mustek M105 Handscanner.
-.TP
-.I ac4096
-A4Tek Color Handscanner.
-.TP
-.B Audio
-.TP
-.I audio
-This creates the audio devices used by the sound driver.  These include
-.BR mixer ,
-.BR sequencer ,
-.BR dsp ,
-and
-.BR audio .
-.TP
-.I pcaudio
-Devices for the PC Speaker sound driver.  These are
-.BR pcmixer .
-.BR pxsp ,
-and
-.BR pcaudio .
-.TP
-.B Miscellaneous
-.TP
-.I sg
-Generic SCSI devices.  The devices created are 
-.B sg0 through 
-.BR sg7 .
-These
-allow arbitary commands to be sent to any SCSI device.  This allows for
-querying information about the device, or controlling SCSI devices that
-are not one of disk, tape or CDROM (e.g. scanner, writeable CDROM).
-.TP
-.I fd
-To allow an arbitary program to be fed input from file descriptor
-.IR x ,
-use
-.BI /dev/fd/ x
-as the file name.  This also creates 
-BR /dev/stdin ,
-BR /dev/stdout ,
-and
-BR /dev/stderr .
-(Note, these are just symlinks into /proc/self/fd).
-.TP
-.I ibcs2
-Devices (and symlinks) needed by the IBCS2 emulation.
-.TP
-.I apm
-Devices for power management.
-.TP
-.I dcf
-Driver for DCF-77 radio clock.
-.TP
-.I helloworld
-Kernel modules demonstration device.  See the modules source.
-.TP
-.B "Network Devices"
-Linux used to have devices in /dev for controlling network devices, but
-that is no longer the case.  To see what network devices are known by the
-kernel, look at /proc/net/dev.
-.SH "SEE ALSO"
-Linux Allocated Devices, maintained by H.\ Peter Anvin,
-<Peter.Anvin@linux.org>.
-.SH AUTHOR
-Nick Holloway
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.10 b/sys-apps/baselayout/files/digest-baselayout-1.8.10
deleted file mode 100644
index 418d17ae4845..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 c7f9b89ed817f4e81ad8bff549049fee rc-scripts-1.4.8.tar.bz2 106811
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.5.9 b/sys-apps/baselayout/files/digest-baselayout-1.8.5.9
deleted file mode 100644
index ff5b441e6dce..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.5.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 963a1c8eb93fbf75d215a832b039c65a rc-scripts-1.4.2.9.tar.bz2 78886
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.10-r1 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.10-r1
deleted file mode 100644
index f9612a20c3ce..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.10-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 167cac447f085528241e1f4b0c300edd rc-scripts-1.4.3.10p1.tar.bz2 98300
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r2 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r2
deleted file mode 100644
index 61d989e3908f..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 3a7a9fa636452f4b4df51a2287232980 rc-scripts-1.4.3.12p1.tar.bz2 102109
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r3 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r3
deleted file mode 100644
index f1602f786e39..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 b69d573e3ed44b6154aee54dd996671c rc-scripts-1.4.3.12p2.tar.bz2 102333
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r4 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r4
deleted file mode 100644
index 4363086066f6..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 d7b4569b88fc53148048cf41c147b8a5 rc-scripts-1.4.3.12p9.tar.bz2 103760
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r5 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r5
deleted file mode 100644
index 5f16249b8da9..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.12-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 3c0f8b018b5b379f1455fa979ed3b21e rc-scripts-1.4.3.12p3.tar.bz2 103627
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.6.8-r1 b/sys-apps/baselayout/files/digest-baselayout-1.8.6.8-r1
deleted file mode 100644
index ee8cfebb3f3a..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.6.8-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 a0bbfe8eed08e0f2faced365b96e3bad rc-scripts-1.4.3.8p1.tar.bz2 95476
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.7 b/sys-apps/baselayout/files/digest-baselayout-1.8.7
deleted file mode 100644
index bc338ce534e0..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 9491acd5dccdb02050c93153165790df rc-scripts-1.4.4.tar.bz2 106503
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.8 b/sys-apps/baselayout/files/digest-baselayout-1.8.8
deleted file mode 100644
index 79f03c24187b..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 e87d1093acbfbc1b79e298c3e5ab7053 rc-scripts-1.4.6.tar.bz2 106611
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.8.9 b/sys-apps/baselayout/files/digest-baselayout-1.8.9
deleted file mode 100644
index 8ad6586262ae..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.8.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6ae4a8237a7e298097239e76eb7aff60 sysvinit-2.84.tar.gz 91488
-MD5 fa5874bfd1984b73c55eb38f775a875c rc-scripts-1.4.7.tar.bz2 106751