fixed bashrc location

  punted old ebuilds

(Portage version: 2.0.51.19)

18 files changed, 74 insertions, 2462 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index c80e626c12a3..2bb9fc8e1808 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,20 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.233 2005/04/21 06:43:00 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.234 2005/04/21 09:39:02 uberlord 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
 
+*baselayout-1.11.11-r1 (21 Apr 2005)
+
+  21 Apr 2005; Roy Marples <uberlord@gentoo.org>
+  -baselayout-1.11.10-r3.ebuild, -baselayout-1.11.10-r4.ebuild,
+  -baselayout-1.11.10-r5.ebuild, -baselayout-1.11.10-r6.ebuild,
+  +baselayout-1.11.11-r1.ebuild, -baselayout-1.12.0_alpha1-r4.ebuild:
+  fixed bashrc location
+  
+  punted old ebuilds
+
   21 Apr 2005; Roy Marples <uberlord@gentoo.org> baselayout-1.11.11.ebuild,
   baselayout-1.12.0_alpha2.ebuild:
   /mnt/floppy and /mnt/cdrom are only installed when USE flag build is set
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 973c2b09a1d2..a282c2eaa201 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,14 +1,10 @@
-MD5 d2abf21e39e495e3f62ffbd295dee7e2 ChangeLog 53432
+MD5 ded848318b1f0cbe390ac2d3f33b8eee ChangeLog 53766
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
 MD5 dca2cf7245292428f62f1ef4f20dd3d9 baselayout-1.11.11.ebuild 18466
 MD5 b43b02e2955a9d3be867e08e5b180d2d baselayout-1.11.9-r1.ebuild 16921
-MD5 236b15ce274e8f4505bb3f6a0df2b16e baselayout-1.11.10-r3.ebuild 17159
-MD5 c15aa659fc04933159d0232113668401 baselayout-1.11.10-r4.ebuild 17159
-MD5 89053b78fb5c86ec2b3f9fec2bf1984a baselayout-1.11.10-r5.ebuild 17228
-MD5 9aeba85fd4c920074c563373f32f9267 baselayout-1.11.10-r6.ebuild 17384
 MD5 5492ab916eceb3bca70d07d058c348de baselayout-1.11.10-r7.ebuild 17461
+MD5 850cfd7b921230da4fed555ab4bf0c4b baselayout-1.11.11-r1.ebuild 18544
 MD5 3e593bad04336cf49c1e7978ce5c103f baselayout-1.12.0_alpha2.ebuild 18459
-MD5 97c0cfe702da6dc46ecd72e0da0b83c7 baselayout-1.12.0_alpha1-r4.ebuild 17487
 MD5 c1996677fc298d37f0b92281ab134d90 baselayout-1.9.4-r6.ebuild 16997
 MD5 f90b7865e3d0207b26c2e1f4bf9e0ca3 baselayout-1.9.4-r7.ebuild 18003
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
@@ -18,23 +14,14 @@ MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch
 MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
 MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
 MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
-MD5 13bb54c92fad3670b7036218b609b7f3 files/baselayout-1.12.0_alpha1-iwconfig.patch 864
-MD5 2fdc18068389dc7268dddad2bae82dfe files/baselayout-1.12.0_alpha1-modules-return-clobber.patch 550
-MD5 d293f00448f562c6d5b4f8bbf77a9fd1 files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch 2387
-MD5 4222104e326e50e3c570c82a31070138 files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch 528
-MD5 b0b2829c9b59059ebca066bcde6410b0 files/baselayout-1.12.0_alpha1-bridge.patch 3500
 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11 70
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
 MD5 844ae054e507637ee440011d729858c8 files/digest-baselayout-1.11.9-r1 69
-MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r3 70
-MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r4 70
-MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r5 70
-MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r6 70
 MD5 9d6be55475cd744a889551d6cc31596b files/digest-baselayout-1.11.10-r7 70
+MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r1 70
 MD5 45a6a081214e662ab8de935ae12a255e files/digest-baselayout-1.12.0_alpha2 69
-MD5 8973ba1466f017b32112df32c15ee8a7 files/digest-baselayout-1.12.0_alpha1-r4 69
 MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
 MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
 MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
diff --git a/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild
deleted file mode 100644
index 10082a262095..000000000000
--- a/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-SV=1.6.10		# rc-scripts version
-SVREV=			# rc-scripts rev
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/rc-scripts-${SV}${SVREV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bootstrap build static uclibc"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND=">=sys-apps/sysvinit-2.84
-	!build? ( !bootstrap? (
-		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.0-r7
-	) )"
-DEPEND="virtual/os-headers"
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Bug #84999
-	epatch ${FILESDIR}/${P}-iwconfig.patch
-
-	# Stop defaulting WEP key to [1] as it messes with ndiswrapper users
-	epatch ${FILESDIR}/${P}-iwconfig-2.patch
-
-	# Stops removing IP addresses from bridge ports
-	# Fixes iwconfig taking 10 seconds to pre_stop on a non-wireless interface
-	# Fixes ifconfig from erroring when deleting addresses on a non-existant
-	# interface
-	epatch ${FILESDIR}/${P}-bridge.patch
-
-	# Fix Sparc specific stuff
-	if [[ $(tc-arch) == "sparc" ]] ; then
-		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die
-}
-
-# ${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
-		arm)	suffix=-arm ;;
-		alpha)	suffix=-alpha ;;
-		amd64)	suffix=-i386 ;;
-		hppa)	suffix=-hppa ;;
-		ia64)	suffix=-ia64 ;;
-		m68k)	suffix=-m68k ;;
-		mips)	suffix=-mips ;;
-		ppc*)	suffix=-powerpc ;;
-		s390)	suffix=-s390 ;;
-		sparc*)	suffix=-sparc ;;
-		x86)	suffix=-i386 ;;
-	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 dir libdirs libdirs_env rcscripts_dir
-
-	# This directory is to stash away things that will be used in
-	# pkg_postinst; it's needed first for kdir to function
-	dodir /usr/share/baselayout
-
-	# Jeremy Huddleston <eradicator@gentoo.org>
-	# For multilib, we want to make sure that all our multilibdirs exist
-	# and make lib even if it's not listed as one (like on amd64/ppc64
-	# which sometimes has lib32/lib64 instead of lib/lib64).
-	# lib should NOT be a symlink to one of the other libdirs.
-	# Old systems with symlinks won't be affected by this change, as the
-	# symlinks already exist and won't get removed, but new systems will
-	# be setup properly.
-	#
-	# I'll be making a script to convert existing systems from symlink to
-	# nosymlink and putting it in /usr/portage/scripts.
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	# This should be /lib/rcscripts, but we have to support old profiles too.
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
-	else
-		rcscripts_dir="/lib/rcscripts"
-	fi
-
-	einfo "Creating directories..."
-	kdir /usr
-	kdir /usr/local
-	kdir /boot
-	kdir /dev
-	kdir /dev/pts
-	kdir /dev/shm
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	kdir /etc/modules.autoload.d
-	kdir /etc/modules.d
-	kdir /etc/opt
-	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
-	kdir ${rcscripts_dir}
-	kdir ${rcscripts_dir}/awk
-	kdir ${rcscripts_dir}/sh
-	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
-	dodir ${rcscripts_dir}/net.modules.d/helpers.d
-	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 /sys	# for 2.6 kernels
-	kdir /usr/bin
-	kdir /usr/include
-	kdir /usr/include/asm
-	kdir /usr/include/linux
-	kdir /usr/local/bin
-	kdir /usr/local/games
-	kdir /usr/local/sbin
-	kdir /usr/local/share
-	kdir /usr/local/share/doc
-	kdir /usr/local/share/man
-	kdir /usr/local/src
-	kdir /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 -m 1777 /tmp
-	kdir /var
-	dodir /var/db/pkg			# .keep file messes up Portage
-	kdir /var/lib/misc
-	kdir /var/lock/subsys
-	kdir /var/log/news
-	kdir /var/run
-	kdir /var/spool
-	kdir /var/state
-	kdir -m 1777 /var/tmp
-
-	for dir in ${libdirs}; do
-		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
-		kdir /${dir}
-		kdir /usr/${dir}
-		kdir /usr/local/${dir}
-	done
-
-	# Ugly compatibility with stupid ebuilds and old profiles symlinks
-	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-	dosym share/man /usr/local/man
-
-	#
-	# Setup files in /etc
-	#
-	insopts -m0644
-	insinto /etc
-	find ${S}/etc -maxdepth 1 -type f -print0 | xargs --null doins
-
-	# Install some files to /usr/share/baselayout instead of /etc to keep from
-	# (1) overwriting the user's settings, (2) screwing things up when
-	# attempting to merge files, (3) accidentally packaging up personal files
-	# with quickpkg
-	fperms 0600 /etc/shadow
-	mv ${D}/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} ${D}/usr/share/baselayout
-
-	cp -P ${S}/init.d/* ${D}/etc/init.d
-	chmod a+x ${D}/etc/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 -maxdepth 1 -type f -print0 | xargs --null doins
-
-	# Special-case uglyness... For people updating from lib32 -> lib amd64
-	# profiles, keep lib32 in the search path while it's around
-	if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
-		libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-	fi
-
-	# List all the multilib libdirs in /etc/env/04multilib (only if they're 
-	# actually different from the normal
-	if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then
-		echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
-	fi
-
-	# As of baselayout-1.10-1-r1, sysvinit is its own package again, and
-	# provides the inittab itself
-	rm -f "${D}"/etc/inittab
-
-	# Stash the rc-lists for use during pkg_postinst
-	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
-
-	# uclibc doesn't need nsswitch.conf... added by solar
-	use uclibc && rm -f ${D}/etc/nsswitch.conf
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
-
-	#
-	# Setup files related to /dev
-	#
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	dosym ../sbin/MAKEDEV /dev/MAKEDEV
-
-	#
-	# Setup files in /bin
-	#
-	cd ${S}/bin
-	dobin rc-status
-
-	#
-	# Setup files in /sbin
-	#
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# 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
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	#
-	# Setup files in /lib/rcscripts
-	# These are support files for other things in baselayout that needn't be
-	# under CONFIG_PROTECTed /etc
-	#
-	cd ${S}/sbin
-	exeinto ${rcscripts_dir}/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if ! use build; then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		cd ${S}/sbin
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto ${rcscripts_dir}/awk
-		doins ${S}/src/awk/*.awk
-	fi
-
-	# Original design had these in /etc/net.modules.d but that is too
-	# problematic with CONFIG_PROTECT
-	dodir ${rcscripts_dir}
-	cp -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
-	chown -R root:root ${D}${rcscripts_dir}
-
-	#
-	# Install baselayout documentation
-	#
-	if ! use build ; then
-		doman ${S}/man/*.*
-		docinto /
-		dodoc ${FILESDIR}/copyright
-		dodoc ${S}/ChangeLog
-	fi
-
-	#
-	# Install baselayout utilities
-	#
-	cd ${S}/src
-	make DESTDIR="${D}" install || die
-
-	# 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
-}
-
-pkg_postinst() {
-	local x y
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files."
-	einfo "Some of these might fail if they're read-only mounted"
-	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source ${ROOT}/usr/share/baselayout/mkdirs.sh
-
-	# This could be done in src_install, which would have the benefit of
-	# (1) devices.tar.bz2 would show up in CONTENTS
-	# (2) binary installations would be faster... just untar the devices tarball
-	#     instead of needing to run MAKEDEV
-	# However the most common cases are that people are either updating
-	# baselayout or installing from scratch.  In the installation case, it's no
-	# different to have here instead of src_install.  In the update case, we
-	# save a couple minutes time by refraining from building the unnecessary
-	# tarball.
-	if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
-		# Create a directory in which to work
-		x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \
-			&& cd "${x}" || die 'mktemp failed'
-
-		# Create temp device nodes
-		echo
-		einfo "Making device node tarball (this could take a couple minutes)"
-		PATH=${ROOT}/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 "${ROOT}/lib/udev-state/devices.tar.bz2" *
-		rm -r *
-		cd ..
-		rmdir "${x}"
-	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 || die
-			/bin/tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
-		fi
-	fi
-
-	# Create /boot/boot symlink in pkg_postinst because sometimes
-	# /boot is a FAT filesystem.  When that is the case, then the
-	# symlink will fail.  Consequently, if we create it in
-	# src_install, then merge will fail.  AFAIK there is no point to
-	# this symlink except for misconfigured grubs.  See bug 50108
-	# (05 May 2004 agriffis)
-	ln -sn . ${ROOT}/boot/boot 2>/dev/null
-
-	# Set up default runlevel symlinks
-	# This used to be done in src_install but required knowledge of ${ROOT},
-	# which meant that it was effectively broken for binary installs.
-	if [[ -z $(/bin/ls ${ROOT}/etc/runlevels 2>/dev/null) ]]; then
-		for x in boot default nonetwork single; do
-			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p ${ROOT}/etc/runlevels/${x}
-			for y in $(<${ROOT}/usr/share/baselayout/rc-lists/${x}); do
-				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
-					ewarn "init.d/${y} not found -- ignoring"
-				else
-					ln -sfn ${ROOT}/etc/init.d/${y} \
-						${ROOT}/etc/runlevels/${x}/${y}
-				fi
-			done
-		done
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly...  see src_install() for why they
-	# are in /usr/share/baselayout/
-	for x in passwd shadow group fstab ; do
-		if [[ -e ${ROOT}/etc/${x} ]] ; then
-			touch "${ROOT}/etc/${x}"
-		else
-			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
-		fi
-	done
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh &>/dev/null
-
-		# 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
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f ${ROOT}/etc/._cfg????_gentoo-release
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
-	einfo "else things might break at your next reboot!  You can use 'etc-update'"
-	einfo "to accomplish this:"
-	einfo
-	einfo "  # etc-update"
-	echo
-
-	for f in /etc/init.d/net.eth*; do
-		[[ -L ${f} ]] && continue
-		echo
-		einfo "WARNING: You have older net.eth* files in ${ROOT}/etc/init.d/"
-		einfo "They need to be converted to symlinks to net.lo.  If you haven't"
-		einfo "made personal changes to those files, you can update with the"
-		einfo "following command:"
-		einfo
-		einfo "  # /bin/ls /etc/init.d/net.eth* | xargs -n1 ln -sfvn net.lo"
-		echo
-		break
-	done
-}
diff --git a/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild
deleted file mode 100644
index f7b208b7977e..000000000000
--- a/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-SV=1.6.10		# rc-scripts version
-SVREV=			# rc-scripts rev
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/rc-scripts-${SV}${SVREV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bootstrap build static uclibc"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND=">=sys-apps/sysvinit-2.84
-	!build? ( !bootstrap? (
-		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.0-r7
-	) )"
-DEPEND="virtual/os-headers"
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Bug #84999
-	epatch ${FILESDIR}/${P}-iwconfig.patch
-
-	# Stop defaulting WEP key to [1] as it messes with ndiswrapper users
-	epatch ${FILESDIR}/${P}-iwconfig-2.patch
-
-	# Stops removing IP addresses from bridge ports
-	# Fixes iwconfig taking 10 seconds to pre_stop on a non-wireless interface
-	# Fixes ifconfig from erroring when deleting addresses on a non-existant
-	# interface
-	epatch ${FILESDIR}/${P}-bridge.patch
-
-	# Fix Sparc specific stuff
-	if [[ $(tc-arch) == "sparc" ]] ; then
-		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die
-}
-
-# ${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
-		arm)	suffix=-arm ;;
-		alpha)	suffix=-alpha ;;
-		amd64)	suffix=-i386 ;;
-		hppa)	suffix=-hppa ;;
-		ia64)	suffix=-ia64 ;;
-		m68k)	suffix=-m68k ;;
-		mips)	suffix=-mips ;;
-		ppc*)	suffix=-powerpc ;;
-		s390)	suffix=-s390 ;;
-		sparc*)	suffix=-sparc ;;
-		x86)	suffix=-i386 ;;
-	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 dir libdirs libdirs_env rcscripts_dir
-
-	# This directory is to stash away things that will be used in
-	# pkg_postinst; it's needed first for kdir to function
-	dodir /usr/share/baselayout
-
-	# Jeremy Huddleston <eradicator@gentoo.org>
-	# For multilib, we want to make sure that all our multilibdirs exist
-	# and make lib even if it's not listed as one (like on amd64/ppc64
-	# which sometimes has lib32/lib64 instead of lib/lib64).
-	# lib should NOT be a symlink to one of the other libdirs.
-	# Old systems with symlinks won't be affected by this change, as the
-	# symlinks already exist and won't get removed, but new systems will
-	# be setup properly.
-	#
-	# I'll be making a script to convert existing systems from symlink to
-	# nosymlink and putting it in /usr/portage/scripts.
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	# This should be /lib/rcscripts, but we have to support old profiles too.
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
-	else
-		rcscripts_dir="/lib/rcscripts"
-	fi
-
-	einfo "Creating directories..."
-	kdir /usr
-	kdir /usr/local
-	kdir /boot
-	kdir /dev
-	kdir /dev/pts
-	kdir /dev/shm
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	kdir /etc/modules.autoload.d
-	kdir /etc/modules.d
-	kdir /etc/opt
-	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
-	kdir ${rcscripts_dir}
-	kdir ${rcscripts_dir}/awk
-	kdir ${rcscripts_dir}/sh
-	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
-	dodir ${rcscripts_dir}/net.modules.d/helpers.d
-	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 /sys	# for 2.6 kernels
-	kdir /usr/bin
-	kdir /usr/include
-	kdir /usr/include/asm
-	kdir /usr/include/linux
-	kdir /usr/local/bin
-	kdir /usr/local/games
-	kdir /usr/local/sbin
-	kdir /usr/local/share
-	kdir /usr/local/share/doc
-	kdir /usr/local/share/man
-	kdir /usr/local/src
-	kdir /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 -m 1777 /tmp
-	kdir /var
-	dodir /var/db/pkg			# .keep file messes up Portage
-	kdir /var/lib/misc
-	kdir /var/lock/subsys
-	kdir /var/log/news
-	kdir /var/run
-	kdir /var/spool
-	kdir /var/state
-	kdir -m 1777 /var/tmp
-
-	for dir in ${libdirs}; do
-		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
-		kdir /${dir}
-		kdir /usr/${dir}
-		kdir /usr/local/${dir}
-	done
-
-	# Ugly compatibility with stupid ebuilds and old profiles symlinks
-	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-	dosym share/man /usr/local/man
-
-	#
-	# Setup files in /etc
-	#
-	insopts -m0644
-	insinto /etc
-	find ${S}/etc -maxdepth 1 -type f -print0 | xargs --null doins
-
-	# Install some files to /usr/share/baselayout instead of /etc to keep from
-	# (1) overwriting the user's settings, (2) screwing things up when
-	# attempting to merge files, (3) accidentally packaging up personal files
-	# with quickpkg
-	fperms 0600 /etc/shadow
-	mv ${D}/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} ${D}/usr/share/baselayout
-
-	cp -P ${S}/init.d/* ${D}/etc/init.d
-	chmod a+x ${D}/etc/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 -maxdepth 1 -type f -print0 | xargs --null doins
-
-	# Special-case uglyness... For people updating from lib32 -> lib amd64
-	# profiles, keep lib32 in the search path while it's around
-	if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
-		libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-	fi
-
-	# List all the multilib libdirs in /etc/env/04multilib (only if they're 
-	# actually different from the normal
-	if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then
-		echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
-	fi
-
-	# As of baselayout-1.10-1-r1, sysvinit is its own package again, and
-	# provides the inittab itself
-	rm -f "${D}"/etc/inittab
-
-	# Stash the rc-lists for use during pkg_postinst
-	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
-
-	# uclibc doesn't need nsswitch.conf... added by solar
-	use uclibc && rm -f ${D}/etc/nsswitch.conf
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
-
-	#
-	# Setup files related to /dev
-	#
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	dosym ../sbin/MAKEDEV /dev/MAKEDEV
-
-	#
-	# Setup files in /bin
-	#
-	cd ${S}/bin
-	dobin rc-status
-
-	#
-	# Setup files in /sbin
-	#
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# 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
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	#
-	# Setup files in /lib/rcscripts
-	# These are support files for other things in baselayout that needn't be
-	# under CONFIG_PROTECTed /etc
-	#
-	cd ${S}/sbin
-	exeinto ${rcscripts_dir}/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if ! use build; then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		cd ${S}/sbin
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto ${rcscripts_dir}/awk
-		doins ${S}/src/awk/*.awk
-	fi
-
-	# Original design had these in /etc/net.modules.d but that is too
-	# problematic with CONFIG_PROTECT
-	dodir ${rcscripts_dir}
-	cp -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
-	chown -R root:root ${D}${rcscripts_dir}
-
-	#
-	# Install baselayout documentation
-	#
-	if ! use build ; then
-		doman ${S}/man/*.*
-		docinto /
-		dodoc ${FILESDIR}/copyright
-		dodoc ${S}/ChangeLog
-	fi
-
-	#
-	# Install baselayout utilities
-	#
-	cd ${S}/src
-	make DESTDIR="${D}" install || die
-
-	# 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
-}
-
-pkg_postinst() {
-	local x y
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files."
-	einfo "Some of these might fail if they're read-only mounted"
-	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source ${ROOT}/usr/share/baselayout/mkdirs.sh
-
-	# This could be done in src_install, which would have the benefit of
-	# (1) devices.tar.bz2 would show up in CONTENTS
-	# (2) binary installations would be faster... just untar the devices tarball
-	#     instead of needing to run MAKEDEV
-	# However the most common cases are that people are either updating
-	# baselayout or installing from scratch.  In the installation case, it's no
-	# different to have here instead of src_install.  In the update case, we
-	# save a couple minutes time by refraining from building the unnecessary
-	# tarball.
-	if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
-		# Create a directory in which to work
-		x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \
-			&& cd "${x}" || die 'mktemp failed'
-
-		# Create temp device nodes
-		echo
-		einfo "Making device node tarball (this could take a couple minutes)"
-		PATH=${ROOT}/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 "${ROOT}/lib/udev-state/devices.tar.bz2" *
-		rm -r *
-		cd ..
-		rmdir "${x}"
-	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 || die
-			/bin/tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
-		fi
-	fi
-
-	# Create /boot/boot symlink in pkg_postinst because sometimes
-	# /boot is a FAT filesystem.  When that is the case, then the
-	# symlink will fail.  Consequently, if we create it in
-	# src_install, then merge will fail.  AFAIK there is no point to
-	# this symlink except for misconfigured grubs.  See bug 50108
-	# (05 May 2004 agriffis)
-	ln -sn . ${ROOT}/boot/boot 2>/dev/null
-
-	# Set up default runlevel symlinks
-	# This used to be done in src_install but required knowledge of ${ROOT},
-	# which meant that it was effectively broken for binary installs.
-	if [[ -z $(/bin/ls ${ROOT}/etc/runlevels 2>/dev/null) ]]; then
-		for x in boot default nonetwork single; do
-			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p ${ROOT}/etc/runlevels/${x}
-			for y in $(<${ROOT}/usr/share/baselayout/rc-lists/${x}); do
-				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
-					ewarn "init.d/${y} not found -- ignoring"
-				else
-					ln -sfn ${ROOT}/etc/init.d/${y} \
-						${ROOT}/etc/runlevels/${x}/${y}
-				fi
-			done
-		done
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly...  see src_install() for why they
-	# are in /usr/share/baselayout/
-	for x in passwd shadow group fstab ; do
-		if [[ -e ${ROOT}/etc/${x} ]] ; then
-			touch "${ROOT}/etc/${x}"
-		else
-			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
-		fi
-	done
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh &>/dev/null
-
-		# 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
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f ${ROOT}/etc/._cfg????_gentoo-release
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
-	einfo "else things might break at your next reboot!  You can use 'etc-update'"
-	einfo "to accomplish this:"
-	einfo
-	einfo "  # etc-update"
-	echo
-
-	for f in /etc/init.d/net.eth*; do
-		[[ -L ${f} ]] && continue
-		echo
-		einfo "WARNING: You have older net.eth* files in ${ROOT}/etc/init.d/"
-		einfo "They need to be converted to symlinks to net.lo.  If you haven't"
-		einfo "made personal changes to those files, you can update with the"
-		einfo "following command:"
-		einfo
-		einfo "  # /bin/ls /etc/init.d/net.eth* | xargs -n1 ln -sfvn net.lo"
-		echo
-		break
-	done
-}
diff --git a/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild
deleted file mode 100644
index edc2fa9659ff..000000000000
--- a/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-SV=1.6.10		# rc-scripts version
-SVREV=			# rc-scripts rev
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/rc-scripts-${SV}${SVREV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bootstrap build static uclibc"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND=">=sys-apps/sysvinit-2.84
-	!build? ( !bootstrap? (
-		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.0-r9
-	) )"
-DEPEND="virtual/os-headers"
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Bug #84999
-	epatch ${FILESDIR}/${P}-iwconfig.patch
-
-	# Stop defaulting WEP key to [1] as it messes with ndiswrapper users
-	epatch ${FILESDIR}/${P}-iwconfig-2.patch
-
-	# Stops removing IP addresses from bridge ports
-	# Fixes iwconfig taking 10 seconds to pre_stop on a non-wireless interface
-	# Fixes ifconfig from erroring when deleting addresses on a non-existant
-	# interface
-	epatch ${FILESDIR}/${P}-bridge.patch
-
-	# Move bashrc to /etc/bashrc
-	epatch ${FILESDIR}/${P}-bashrc.patch
-
-	# Fix Sparc specific stuff
-	if [[ $(tc-arch) == "sparc" ]] ; then
-		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die
-}
-
-# ${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
-		arm)	suffix=-arm ;;
-		alpha)	suffix=-alpha ;;
-		amd64)	suffix=-i386 ;;
-		hppa)	suffix=-hppa ;;
-		ia64)	suffix=-ia64 ;;
-		m68k)	suffix=-m68k ;;
-		mips)	suffix=-mips ;;
-		ppc*)	suffix=-powerpc ;;
-		s390)	suffix=-s390 ;;
-		sparc*)	suffix=-sparc ;;
-		x86)	suffix=-i386 ;;
-	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 dir libdirs libdirs_env rcscripts_dir
-
-	# This directory is to stash away things that will be used in
-	# pkg_postinst; it's needed first for kdir to function
-	dodir /usr/share/baselayout
-
-	# Jeremy Huddleston <eradicator@gentoo.org>
-	# For multilib, we want to make sure that all our multilibdirs exist
-	# and make lib even if it's not listed as one (like on amd64/ppc64
-	# which sometimes has lib32/lib64 instead of lib/lib64).
-	# lib should NOT be a symlink to one of the other libdirs.
-	# Old systems with symlinks won't be affected by this change, as the
-	# symlinks already exist and won't get removed, but new systems will
-	# be setup properly.
-	#
-	# I'll be making a script to convert existing systems from symlink to
-	# nosymlink and putting it in /usr/portage/scripts.
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	# This should be /lib/rcscripts, but we have to support old profiles too.
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
-	else
-		rcscripts_dir="/lib/rcscripts"
-	fi
-
-	einfo "Creating directories..."
-	kdir /usr
-	kdir /usr/local
-	kdir /boot
-	kdir /dev
-	kdir /dev/pts
-	kdir /dev/shm
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	kdir /etc/modules.autoload.d
-	kdir /etc/modules.d
-	kdir /etc/opt
-	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
-	kdir ${rcscripts_dir}
-	kdir ${rcscripts_dir}/awk
-	kdir ${rcscripts_dir}/sh
-	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
-	dodir ${rcscripts_dir}/net.modules.d/helpers.d
-	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 /sys	# for 2.6 kernels
-	kdir /usr/bin
-	kdir /usr/include
-	kdir /usr/include/asm
-	kdir /usr/include/linux
-	kdir /usr/local/bin
-	kdir /usr/local/games
-	kdir /usr/local/sbin
-	kdir /usr/local/share
-	kdir /usr/local/share/doc
-	kdir /usr/local/share/man
-	kdir /usr/local/src
-	kdir /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 -m 1777 /tmp
-	kdir /var
-	dodir /var/db/pkg			# .keep file messes up Portage
-	kdir /var/lib/misc
-	kdir /var/lock/subsys
-	kdir /var/log/news
-	kdir /var/run
-	kdir /var/spool
-	kdir /var/state
-	kdir -m 1777 /var/tmp
-
-	for dir in ${libdirs}; do
-		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
-		kdir /${dir}
-		kdir /usr/${dir}
-		kdir /usr/local/${dir}
-	done
-
-	# Ugly compatibility with stupid ebuilds and old profiles symlinks
-	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-	dosym share/man /usr/local/man
-
-	#
-	# Setup files in /etc
-	#
-	insopts -m0644
-	insinto /etc
-	find ${S}/etc -maxdepth 1 -type f -print0 | xargs --null doins
-
-	# Install some files to /usr/share/baselayout instead of /etc to keep from
-	# (1) overwriting the user's settings, (2) screwing things up when
-	# attempting to merge files, (3) accidentally packaging up personal files
-	# with quickpkg
-	fperms 0600 /etc/shadow
-	mv ${D}/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} ${D}/usr/share/baselayout
-
-	cp -P ${S}/init.d/* ${D}/etc/init.d
-	chmod a+x ${D}/etc/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 -maxdepth 1 -type f -print0 | xargs --null doins
-
-	# Special-case uglyness... For people updating from lib32 -> lib amd64
-	# profiles, keep lib32 in the search path while it's around
-	if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
-		libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-	fi
-
-	# List all the multilib libdirs in /etc/env/04multilib (only if they're 
-	# actually different from the normal
-	if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then
-		echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
-	fi
-
-	# As of baselayout-1.10-1-r1, sysvinit is its own package again, and
-	# provides the inittab itself
-	rm -f "${D}"/etc/inittab
-
-	# Stash the rc-lists for use during pkg_postinst
-	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
-
-	# uclibc doesn't need nsswitch.conf... added by solar
-	use uclibc && rm -f ${D}/etc/nsswitch.conf
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
-
-	#
-	# Setup files related to /dev
-	#
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	dosym ../sbin/MAKEDEV /dev/MAKEDEV
-
-	#
-	# Setup files in /bin
-	#
-	cd ${S}/bin
-	dobin rc-status
-
-	#
-	# Setup files in /sbin
-	#
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# 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
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	#
-	# Setup files in /lib/rcscripts
-	# These are support files for other things in baselayout that needn't be
-	# under CONFIG_PROTECTed /etc
-	#
-	cd ${S}/sbin
-	exeinto ${rcscripts_dir}/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if ! use build; then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		cd ${S}/sbin
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto ${rcscripts_dir}/awk
-		doins ${S}/src/awk/*.awk
-	fi
-
-	# Original design had these in /etc/net.modules.d but that is too
-	# problematic with CONFIG_PROTECT
-	dodir ${rcscripts_dir}
-	cp -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
-	chown -R root:root ${D}${rcscripts_dir}
-
-	#
-	# Install baselayout documentation
-	#
-	if ! use build ; then
-		doman ${S}/man/*.*
-		docinto /
-		dodoc ${FILESDIR}/copyright
-		dodoc ${S}/ChangeLog
-	fi
-
-	#
-	# Install baselayout utilities
-	#
-	cd ${S}/src
-	make DESTDIR="${D}" install || die
-
-	# 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
-}
-
-pkg_postinst() {
-	local x y
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files."
-	einfo "Some of these might fail if they're read-only mounted"
-	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source ${ROOT}/usr/share/baselayout/mkdirs.sh
-
-	# This could be done in src_install, which would have the benefit of
-	# (1) devices.tar.bz2 would show up in CONTENTS
-	# (2) binary installations would be faster... just untar the devices tarball
-	#     instead of needing to run MAKEDEV
-	# However the most common cases are that people are either updating
-	# baselayout or installing from scratch.  In the installation case, it's no
-	# different to have here instead of src_install.  In the update case, we
-	# save a couple minutes time by refraining from building the unnecessary
-	# tarball.
-	if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
-		# Create a directory in which to work
-		x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \
-			&& cd "${x}" || die 'mktemp failed'
-
-		# Create temp device nodes
-		echo
-		einfo "Making device node tarball (this could take a couple minutes)"
-		PATH=${ROOT}/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 "${ROOT}/lib/udev-state/devices.tar.bz2" *
-		rm -r *
-		cd ..
-		rmdir "${x}"
-	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 || die
-			/bin/tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
-		fi
-	fi
-
-	# Create /boot/boot symlink in pkg_postinst because sometimes
-	# /boot is a FAT filesystem.  When that is the case, then the
-	# symlink will fail.  Consequently, if we create it in
-	# src_install, then merge will fail.  AFAIK there is no point to
-	# this symlink except for misconfigured grubs.  See bug 50108
-	# (05 May 2004 agriffis)
-	ln -sn . ${ROOT}/boot/boot 2>/dev/null
-
-	# Set up default runlevel symlinks
-	# This used to be done in src_install but required knowledge of ${ROOT},
-	# which meant that it was effectively broken for binary installs.
-	if [[ -z $(/bin/ls ${ROOT}/etc/runlevels 2>/dev/null) ]]; then
-		for x in boot default nonetwork single; do
-			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p ${ROOT}/etc/runlevels/${x}
-			for y in $(<${ROOT}/usr/share/baselayout/rc-lists/${x}); do
-				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
-					ewarn "init.d/${y} not found -- ignoring"
-				else
-					ln -sfn ${ROOT}/etc/init.d/${y} \
-						${ROOT}/etc/runlevels/${x}/${y}
-				fi
-			done
-		done
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly...  see src_install() for why they
-	# are in /usr/share/baselayout/
-	for x in passwd shadow group fstab ; do
-		if [[ -e ${ROOT}/etc/${x} ]] ; then
-			touch "${ROOT}/etc/${x}"
-		else
-			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
-		fi
-	done
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh &>/dev/null
-
-		# 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
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f ${ROOT}/etc/._cfg????_gentoo-release
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
-	einfo "else things might break at your next reboot!  You can use 'etc-update'"
-	einfo "to accomplish this:"
-	einfo
-	einfo "  # etc-update"
-	echo
-
-	for f in /etc/init.d/net.eth*; do
-		[[ -L ${f} ]] && continue
-		echo
-		einfo "WARNING: You have older net.eth* files in ${ROOT}/etc/init.d/"
-		einfo "They need to be converted to symlinks to net.lo.  If you haven't"
-		einfo "made personal changes to those files, you can update with the"
-		einfo "following command:"
-		einfo
-		einfo "  # /bin/ls /etc/init.d/net.eth* | xargs -n1 ln -sfvn net.lo"
-		echo
-		break
-	done
-}
diff --git a/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild b/sys-apps/baselayout/baselayout-1.11.11-r1.ebuild
index 7861d5adafb4..b280e3d9c0b9 100644
--- a/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.11-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild,v 1.3 2005/04/15 16:13:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.11-r1.ebuild,v 1.1 2005/04/21 09:39:03 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
-SV=1.6.10		# rc-scripts version
+SV=1.6.11		# rc-scripts version
 SVREV=			# rc-scripts rev
 
 S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
@@ -34,24 +34,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# Bug #84999
-	epatch ${FILESDIR}/${P}-iwconfig.patch
-
-	# Stop defaulting WEP key to [1] as it messes with ndiswrapper users
-	epatch ${FILESDIR}/${P}-iwconfig-2.patch
-
-	# Stops removing IP addresses from bridge ports
-	# Fixes iwconfig taking 10 seconds to pre_stop on a non-wireless interface
-	# Fixes ifconfig from erroring when deleting addresses on a non-existant
-	# interface
-	epatch ${FILESDIR}/${P}-bridge.patch
-
 	# Move bashrc to /etc/bashrc
-	epatch ${FILESDIR}/${P}-bashrc.patch
-
-	# Remove pre_stop functions from iwconfig and wpa_supplicant
-	# Fix wireless.example
-	epatch ${FILESDIR}/${P}-wireless.patch
+	epatch ${FILESDIR}/${PN}-1.11.10-bashrc.patch
 
 	# Fix Sparc specific stuff
 	if [[ $(tc-arch) == "sparc" ]] ; then
@@ -151,7 +135,7 @@ src_install() {
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
 	# This should be /lib/rcscripts, but we have to support old profiles too.
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
+	if [[ ${SYMLINK_LIB} == "yes" ]]; then
 		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
 	else
 		rcscripts_dir="/lib/rcscripts"
@@ -180,11 +164,14 @@ src_install() {
 	kdir ${rcscripts_dir}
 	kdir ${rcscripts_dir}/awk
 	kdir ${rcscripts_dir}/sh
-	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
-	dodir ${rcscripts_dir}/net.modules.d/helpers.d
+	kdir ${rcscripts_dir}/net.modules.d
+	kdir ${rcscripts_dir}/net.modules.d/helpers.d
 	kdir /mnt
-	kdir -m 0700 /mnt/cdrom
-	kdir -m 0700 /mnt/floppy
+	# Only install floppy and cdrom when first installing - fixes 88835
+	if use build ; then
+		kdir -m 0700 /mnt/cdrom
+		kdir -m 0700 /mnt/floppy
+	fi
 	kdir /opt
 	kdir -o root -g uucp -m0755 /var/lock
 	kdir /proc
@@ -378,6 +365,21 @@ src_install() {
 	unkdir
 }
 
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+	local f="$1"
+
+	if [[ -f ${ROOT}/etc/conf.d/${f} ]]; then
+		sed -e 's/\<domain_/dns_domain_/g' \
+			-e 's/\<mac_domain_/mac_dns_domain_/g' \
+			-e 's/\<nameservers_/dns_servers_/g' \
+			-e 's/\<mac_nameservers_/mac_dns_servers_/g' \
+			-e 's/\<searchdomains_/dns_search_domains_/g' \
+			-e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
+			${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+	fi
+}
+
 pkg_preinst() {
 	if [[ -f ${ROOT}/etc/modules.autoload && \
 			! -d ${ROOT}/etc/modules.autoload.d ]]; then
@@ -386,6 +388,12 @@ pkg_preinst() {
 			${ROOT}/etc/modules.autoload.d/kernel-2.4
 		ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
 	fi
+
+	# Change some vars introduced in baselayout-1.11.0 before we go stable
+	# The new names make more sense and allow nis_domain
+	# for use in baselayout-1.12.0
+	remap_dns_vars net
+	remap_dns_vars wireless
 }
 
 pkg_postinst() {
@@ -551,4 +559,31 @@ pkg_postinst() {
 		echo
 		break
 	done
+
+	if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \
+		| egrep -q '\<(domain|nameservers|searchdomains)_' ; then
+			echo
+			ewarn "You have depreciated variables in ${ROOT}/etc/conf.d/net"
+			ewarn "or ${ROOT}/etc/conf.d/wireless"
+			ewarn
+			ewarn "domain_* -> dns_domain_*"
+			ewarn "nameservers_* -> dns_servers_*"
+			ewarn "searchdomains_* -> dns_search_domains_*"
+			ewarn
+			ewarn "They have been converted for you - ensure that you"
+			ewarn "update them via 'etc-update'"
+			echo
+	fi
+
+	if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \
+		| egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
+			echo
+			ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net"
+			ewarn
+			ewarn "You are advised to review the new configuration variables as"
+			ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no"
+			ewarn "guarantee that they will work in future versions."
+			echo
+	fi
+
 }
diff --git a/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild b/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild
deleted file mode 100644
index be3ab9c53962..000000000000
--- a/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-SV=1.7.0		# rc-scripts version
-SVREV=			# rc-scripts rev
-
-S="${WORKDIR}/rc-scripts-${SV}${SVREV}"
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/rc-scripts-${SV}${SVREV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bootstrap build static uclibc"
-
-# This version of baselayout needs gawk in /bin, but as we do not have
-# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
-# or "build" are in USE.
-RDEPEND=">=sys-apps/sysvinit-2.84
-	!build? ( !bootstrap? (
-		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.0-r7
-	) )"
-DEPEND="virtual/os-headers"
-PROVIDE="virtual/baselayout"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix Sparc specific stuff
-	if [[ $(tc-arch) == "sparc" ]] ; then
-		sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die
-	fi
-
-	# Fix my booboo
-	epatch ${FILESDIR}/${P}-fixup-depends_awk.patch
-	# Export myservice when starting critical services, as its needed by
-	# some of the addons (dmcrypt for example).
-	epatch ${FILESDIR}/${P}-export-myservice-for-critical.patch
-	# Syntax changes to init.d/modules made last test clobber return.
-	epatch ${FILESDIR}/${P}-modules-return-clobber.patch
-	# Stop defaulting WEP key to [1] as it messes with ndiswrapper users
-	epatch ${FILESDIR}/${P}-iwconfig.patch
-	# Stops removing IP addresses from bridge ports
-	# Fixes iwconfig taking 10 seconds to pre_stop on a non-wireless interface
-	# Fixes ifconfig from erroring when deleting addresses on a non-existant
-	# interface
-	epatch ${FILESDIR}/${P}-bridge.patch
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	make -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
-		CFLAGS="${CFLAGS}" || die
-}
-
-# ${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
-		arm)	suffix=-arm ;;
-		alpha)	suffix=-alpha ;;
-		amd64)	suffix=-i386 ;;
-		hppa)	suffix=-hppa ;;
-		ia64)	suffix=-ia64 ;;
-		m68k)	suffix=-m68k ;;
-		mips)	suffix=-mips ;;
-		ppc*)	suffix=-powerpc ;;
-		s390)	suffix=-s390 ;;
-		sparc*)	suffix=-sparc ;;
-		x86)	suffix=-i386 ;;
-	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 dir libdirs libdirs_env rcscripts_dir
-
-	# This directory is to stash away things that will be used in
-	# pkg_postinst; it's needed first for kdir to function
-	dodir /usr/share/baselayout
-
-	# Jeremy Huddleston <eradicator@gentoo.org>
-	# For multilib, we want to make sure that all our multilibdirs exist
-	# and make lib even if it's not listed as one (like on amd64/ppc64
-	# which sometimes has lib32/lib64 instead of lib/lib64).
-	# lib should NOT be a symlink to one of the other libdirs.
-	# Old systems with symlinks won't be affected by this change, as the
-	# symlinks already exist and won't get removed, but new systems will
-	# be setup properly.
-	#
-	# I'll be making a script to convert existing systems from symlink to
-	# nosymlink and putting it in /usr/portage/scripts.
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	# This should be /lib/rcscripts, but we have to support old profiles too.
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
-	else
-		rcscripts_dir="/lib/rcscripts"
-	fi
-
-	einfo "Creating directories..."
-	kdir /usr
-	kdir /usr/local
-	kdir /boot
-	kdir /dev
-	kdir /dev/pts
-	kdir /dev/shm
-	kdir /etc/conf.d
-	kdir /etc/cron.daily
-	kdir /etc/cron.hourly
-	kdir /etc/cron.monthly
-	kdir /etc/cron.weekly
-	kdir /etc/env.d
-	dodir /etc/init.d			# .keep file might mess up init.d stuff
-	kdir /etc/modules.autoload.d
-	kdir /etc/modules.d
-	kdir /etc/opt
-	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
-	kdir ${rcscripts_dir}
-	kdir ${rcscripts_dir}/awk
-	kdir ${rcscripts_dir}/sh
-	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
-	dodir ${rcscripts_dir}/net.modules.d/helpers.d
-	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 /sys	# for 2.6 kernels
-	kdir /usr/bin
-	kdir /usr/include
-	kdir /usr/include/asm
-	kdir /usr/include/linux
-	kdir /usr/local/bin
-	kdir /usr/local/games
-	kdir /usr/local/sbin
-	kdir /usr/local/share
-	kdir /usr/local/share/doc
-	kdir /usr/local/share/man
-	kdir /usr/local/src
-	kdir /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 -m 1777 /tmp
-	kdir /var
-	dodir /var/db/pkg			# .keep file messes up Portage
-	kdir /var/lib/misc
-	kdir /var/lock/subsys
-	kdir /var/log/news
-	kdir /var/run
-	kdir /var/spool
-	kdir /var/state
-	kdir -m 1777 /var/tmp
-
-	for dir in ${libdirs}; do
-		libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
-		[[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
-		kdir /${dir}
-		kdir /usr/${dir}
-		kdir /usr/local/${dir}
-	done
-
-	# Ugly compatibility with stupid ebuilds and old profiles symlinks
-	if [[ ${SYMLINK_LIB} == "yes" ]] ; then
-		rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
-	fi
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-	dosym share/man /usr/local/man
-
-	#
-	# Setup files in /etc
-	#
-	insopts -m0644
-	insinto /etc
-	find ${S}/etc -maxdepth 1 -type f -print0 | xargs --null doins
-
-	# Install some files to /usr/share/baselayout instead of /etc to keep from
-	# (1) overwriting the user's settings, (2) screwing things up when
-	# attempting to merge files, (3) accidentally packaging up personal files
-	# with quickpkg
-	fperms 0600 /etc/shadow
-	mv ${D}/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} ${D}/usr/share/baselayout
-
-	cp -P ${S}/init.d/* ${D}/etc/init.d
-	chmod a+x ${D}/etc/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 -maxdepth 1 -type f -print0 | xargs --null doins
-
-	# Special-case uglyness... For people updating from lib32 -> lib amd64
-	# profiles, keep lib32 in the search path while it's around
-	if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
-		libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
-	fi
-
-	# List all the multilib libdirs in /etc/env/04multilib (only if they're 
-	# actually different from the normal
-	if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then
-		echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
-	fi
-
-	# As of baselayout-1.10-1-r1, sysvinit is its own package again, and
-	# provides the inittab itself
-	rm -f "${D}"/etc/inittab
-
-	# Stash the rc-lists for use during pkg_postinst
-	cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
-
-	# uclibc doesn't need nsswitch.conf... added by solar
-	use uclibc && rm -f ${D}/etc/nsswitch.conf
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System version ${SV}" > ${D}/etc/gentoo-release
-
-	#
-	# Setup files related to /dev
-	#
-	into /
-	dosbin ${S}/sbin/MAKEDEV
-	dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
-	dosym ../sbin/MAKEDEV /dev/MAKEDEV
-
-	#
-	# Setup files in /bin
-	#
-	cd ${S}/bin
-	dobin rc-status
-
-	#
-	# Setup files in /sbin
-	#
-	cd ${S}/sbin
-	into /
-	dosbin rc rc-update
-	# 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
-
-	# Compat symlinks between /etc/init.d and /sbin
-	# (some stuff have hardcoded paths)
-	dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
-	dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
-	dosym ../../sbin/functions.sh /etc/init.d/functions.sh
-
-	#
-	# Setup files in /lib/rcscripts
-	# These are support files for other things in baselayout that needn't be
-	# under CONFIG_PROTECTed /etc
-	#
-	cd ${S}/sbin
-	exeinto ${rcscripts_dir}/sh
-	doexe rc-services.sh rc-daemon.sh rc-help.sh
-
-	# We can only install new, fast awk versions of scripts
-	# if 'build' or 'bootstrap' is not in USE.  This will
-	# change if we have sys-apps/gawk-3.1.1-r1 or later in
-	# the build image ...
-	if ! use build; then
-		# This is for new depscan.sh and env-update.sh
-		# written in awk
-		cd ${S}/sbin
-		into /
-		dosbin depscan.sh
-		dosbin env-update.sh
-		insinto ${rcscripts_dir}/awk
-		doins ${S}/src/awk/*.awk
-	fi
-
-	# Original design had these in /etc/net.modules.d but that is too
-	# problematic with CONFIG_PROTECT
-	dodir ${rcscripts_dir}
-	cp -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
-	chown -R root:root ${D}${rcscripts_dir}
-
-	#
-	# Install baselayout documentation
-	#
-	if ! use build ; then
-		doman ${S}/man/*.*
-		docinto /
-		dodoc ${FILESDIR}/copyright
-		dodoc ${S}/ChangeLog
-	fi
-
-	#
-	# Install baselayout utilities
-	#
-	cd ${S}/src
-	make DESTDIR="${D}" install || die
-
-	# 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
-}
-
-pkg_postinst() {
-	local x y
-
-	# Reincarnate dirs from kdir/unkdir (hack for bug 9849)
-	einfo "Creating directories and .keep files."
-	einfo "Some of these might fail if they're read-only mounted"
-	einfo "filesystems, for example /dev or /proc.  That's okay!"
-	source ${ROOT}/usr/share/baselayout/mkdirs.sh
-
-	# This could be done in src_install, which would have the benefit of
-	# (1) devices.tar.bz2 would show up in CONTENTS
-	# (2) binary installations would be faster... just untar the devices tarball
-	#     instead of needing to run MAKEDEV
-	# However the most common cases are that people are either updating
-	# baselayout or installing from scratch.  In the installation case, it's no
-	# different to have here instead of src_install.  In the update case, we
-	# save a couple minutes time by refraining from building the unnecessary
-	# tarball.
-	if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
-		# Create a directory in which to work
-		x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \
-			&& cd "${x}" || die 'mktemp failed'
-
-		# Create temp device nodes
-		echo
-		einfo "Making device node tarball (this could take a couple minutes)"
-		PATH=${ROOT}/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 --one-file-system -cjpf "${ROOT}/lib/udev-state/devices.tar.bz2" *
-		rm -r *
-		cd ..
-		rmdir "${x}"
-	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 || die
-			/bin/tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
-		fi
-	fi
-
-	# Create /boot/boot symlink in pkg_postinst because sometimes
-	# /boot is a FAT filesystem.  When that is the case, then the
-	# symlink will fail.  Consequently, if we create it in
-	# src_install, then merge will fail.  AFAIK there is no point to
-	# this symlink except for misconfigured grubs.  See bug 50108
-	# (05 May 2004 agriffis)
-	ln -sn . ${ROOT}/boot/boot 2>/dev/null
-
-	# Set up default runlevel symlinks
-	# This used to be done in src_install but required knowledge of ${ROOT},
-	# which meant that it was effectively broken for binary installs.
-	if [[ -z $(/bin/ls ${ROOT}/etc/runlevels 2>/dev/null) ]]; then
-		for x in boot default nonetwork single; do
-			einfo "Creating default runlevel symlinks for ${x}"
-			mkdir -p ${ROOT}/etc/runlevels/${x}
-			for y in $(<${ROOT}/usr/share/baselayout/rc-lists/${x}); do
-				if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
-					ewarn "init.d/${y} not found -- ignoring"
-				else
-					ln -sfn ${ROOT}/etc/init.d/${y} \
-						${ROOT}/etc/runlevels/${x}/${y}
-				fi
-			done
-		done
-	fi
-
-	# Create /etc/hosts in pkg_postinst so we don't overwrite an
-	# existing file during bootstrap
-	if [[ ! -e ${ROOT}/etc/hosts ]]; then
-		cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
-	fi
-
-	# Touching /etc/passwd and /etc/shadow after install can be fatal, as many
-	# new users do not update them properly...  see src_install() for why they
-	# are in /usr/share/baselayout/
-	for x in passwd shadow group fstab ; do
-		if [[ -e ${ROOT}/etc/${x} ]] ; then
-			touch "${ROOT}/etc/${x}"
-		else
-			cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
-		fi
-	done
-
-	# Under what circumstances would mtab be a symlink?  It would be
-	# nice if there were an explanatory comment here
-	if [[ -L ${ROOT}/etc/mtab ]]; then
-		rm -f "${ROOT}/etc/mtab"
-		if [[ ${ROOT} == / ]]; then
-			cp /proc/mounts "${ROOT}/etc/mtab"
-		else
-			touch "${ROOT}/etc/mtab"
-		fi
-	fi
-
-	# We should only install empty files if these files don't already exist.
-	[[ -e ${ROOT}/var/log/lastlog ]] || \
-		touch "${ROOT}/var/log/lastlog"
-	[[ -e ${ROOT}/var/run/utmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
-	[[ -e ${ROOT}/var/log/wtmp ]] || \
-		install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
-
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
-		# Regenerate init.d dependency tree
-		/sbin/depscan.sh &>/dev/null
-
-		# 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
-
-	# This is also written in src_install (so it's in CONTENTS), but
-	# write it here so that the new version is immediately in the file
-	# (without waiting for the user to do etc-update)
-	rm -f ${ROOT}/etc/._cfg????_gentoo-release
-	echo "Gentoo Base System version ${SV}" > ${ROOT}/etc/gentoo-release
-
-	echo
-	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
-	einfo "else things might break at your next reboot!  You can use 'etc-update'"
-	einfo "to accomplish this:"
-	einfo
-	einfo "  # etc-update"
-	echo
-
-	for f in /etc/init.d/net.eth*; do
-		[[ -L ${f} ]] && continue
-		echo
-		einfo "WARNING: You have older net.eth* files in ${ROOT}/etc/init.d/"
-		einfo "They need to be converted to symlinks to net.lo.  If you haven't"
-		einfo "made personal changes to those files, you can update with the"
-		einfo "following command:"
-		einfo
-		einfo "  # /bin/ls /etc/init.d/net.eth* | xargs -n1 ln -sfvn net.lo"
-		echo
-		break
-	done
-}
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-bridge.patch b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-bridge.patch
deleted file mode 100644
index 2c5ada38ec4e..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-bridge.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: lib/rcscripts/net.modules.d/bridge
-===================================================================
-RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/bridge,v
-retrieving revision 1.17
-diff -u -B -r1.17 bridge
---- lib/rcscripts/net.modules.d/bridge	8 Mar 2005 16:04:18 -0000	1.17
-+++ lib/rcscripts/net.modules.d/bridge	23 Mar 2005 13:16:21 -0000
-@@ -103,20 +103,20 @@
- 	for i in ${ports}; do
- 		interface_exists ${i} && continue 
- 		eerror "interface ${i} does not exist"
--		bridge_stop ${iface} &>/dev/null
- 		return 1
- 	done
- 
- 	for i in ${ports}; do
- 		ebegin "${i}"
--		e=$( brctl addif ${iface} ${i} 2>&1 \
--			&& interface_del_addresses ${i} \
--			&& interface_set_flag ${i} promisc true \
--			&& interface_up ${i} )
-+		interface_set_flag ${i} promisc true
-+		interface_up ${i}
-+		e=$( brctl addif ${iface} ${i} 2>&1 )
- 		if [[ -n ${e} ]]; then
- 			eend 1 "${e}"
-+			interface_set_flag ${i} promisc false
- 			return 1
- 		fi
-+		eend 0
- 	done
- 	eoutdent
- 
-@@ -140,7 +140,6 @@
- 	eindent
- 	for i in ${ports}; do
- 		ebegin "Removing port ${i}"
--		interface_down ${i}
- 		interface_set_flag ${i} promisc false
- 		brctl delif ${iface} ${i} &>${devnull}
- 		eend $?
-Index: lib/rcscripts/net.modules.d/ifconfig
-===================================================================
-RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/ifconfig,v
-retrieving revision 1.32
-diff -u -B -r1.32 ifconfig
---- lib/rcscripts/net.modules.d/ifconfig	10 Feb 2005 17:04:03 -0000	1.32
-+++ lib/rcscripts/net.modules.d/ifconfig	23 Mar 2005 13:16:21 -0000
-@@ -146,6 +146,9 @@
- 	# We don't remove addresses from aliases
- 	[[ ${iface} == *:* ]] && return 0
- 
-+	# If the interface doesn't exist, don't try and delete
-+	ifconfig_exists ${iface} || return 0
-+
- 	# iproute2 can add many addresses to an iface unlike ifconfig ...
- 	# iproute2 added addresses cause problems for ifconfig
- 	# as we delete an address, a new one appears, so we have to
-Index: lib/rcscripts/net.modules.d/iwconfig
-===================================================================
-RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/iwconfig,v
-retrieving revision 1.30
-diff -u -B -r1.30 iwconfig
---- lib/rcscripts/net.modules.d/iwconfig	14 Mar 2005 16:57:44 -0000	1.30
-+++ lib/rcscripts/net.modules.d/iwconfig	23 Mar 2005 13:16:22 -0000
-@@ -893,7 +893,10 @@
- # Configures ESSID variable
- # Always returns 0
- iwconfig_pre_stop() {
--	ESSID=$( iwconfig_get_essid $1 )
--	ESSIDVAR=${ESSID//[![:word:]]/_}
-+	unset ESSID ESSIDVAR
-+	if iwconfig_check_extensions $1 ; then
-+		ESSID=$( iwconfig_get_essid $1 )
-+		ESSIDVAR=${ESSID//[![:word:]]/_}
-+	fi
- 	return 0
- }
-Index: lib/rcscripts/net.modules.d/wpa_supplicant
-===================================================================
-RCS file: /var/cvsroot/gentoo-src/rc-scripts/net-scripts/net.modules.d/wpa_supplicant,v
-retrieving revision 1.19
-diff -u -B -r1.19 wpa_supplicant
---- lib/rcscripts/net.modules.d/wpa_supplicant	4 Mar 2005 07:59:53 -0000	1.19
-+++ lib/rcscripts/net.modules.d/wpa_supplicant	23 Mar 2005 13:16:22 -0000
-@@ -234,6 +234,19 @@
- 	return 0
- }
- 
-+# bool wpa_supplicant_pre_stop(char *iface)
-+#
-+# Configures ESSID variable
-+# Always returns 0
-+wpa_supplicant_pre_stop() {
-+	unset ESSID ESSIDVAR
-+	if wpa_supplicant_check_extensions $1 ; then
-+		ESSID=$( iwconfig_get_essid $1 )
-+		ESSIDVAR=${ESSID//[![:word:]]/_}
-+	fi
-+	return 0
-+}
-+
- # bool wpa_supplicant_post_stop(char *iface)
- #
- # Stops wpa_supplicant on an interface
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch
deleted file mode 100644
index e7e39eca476b..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-export-myservice-for-critical.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sbin/rc
-===================================================================
-RCS file: /var/cvsroot/gentoo-src/rc-scripts/sbin/rc,v
-retrieving revision 1.114
-diff -u -r1.114 rc
---- sbin/rc	11 Mar 2005 06:02:07 -0000	1.114
-+++ sbin/rc	15 Mar 2005 20:59:22 -0000
-@@ -406,6 +406,8 @@
- 		(
- 		local retval=
- 		local service=$1
-+		# Needed for some addons like dm-crypt that starts in critical services
-+		local myservice=$1
- 
- 		source "/etc/init.d/${service}" || eerror "Failed to source /etc/init.d/${service}"
- 		retval=$?
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch
deleted file mode 100644
index 7cba573899b1..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-fixup-depends_awk.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: src/awk/cachedepends.awk
-===================================================================
-RCS file: /var/cvsroot/gentoo-src/rc-scripts/src/awk/cachedepends.awk,v
-retrieving revision 1.20
-retrieving revision 1.21
-diff -u -r1.20 -r1.21
---- src/awk/cachedepends.awk	23 Feb 2005 17:47:43 -0000	1.20
-+++ src/awk/cachedepends.awk	10 Mar 2005 17:00:04 -0000	1.21
-@@ -1,6 +1,6 @@
- # Copyright 1999-2004 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
--# $Header: /var/cvsroot/gentoo-src/rc-scripts/src/awk/cachedepends.awk,v 1.20 2005/02/23 17:47:43 azarah Exp $
-+# $Header: /var/cvsroot/gentoo-src/rc-scripts/src/awk/cachedepends.awk,v 1.21 2005/03/10 17:00:04 azarah Exp $
- 
- function print_start() {
- 	print "source /sbin/functions.sh" >> TMPCACHE
-@@ -106,7 +106,7 @@
- 
- 	if (RCCOUNT == 0) {
- 		eerror("No scripts to process!")
--		system("rm -f "TMPCACHE)
-+		dosystem("rm -f "TMPCACHE)
- 		exit 1
- 	}
- 
-@@ -206,8 +206,8 @@
- 	}
- 
- 	
--	assert(system("rm -f "SVCDIR"/depcache"), "system(rm -f "SVCDIR"/depcache)")
--	assert(system("mv "TMPCACHE" "SVCDIR"/depcache"), "system(mv "TMPCACHE" "SVCDIR"/depcache)")
-+	assert(dosystem("rm -f "SVCDIR"/depcache"), "system(rm -f "SVCDIR"/depcache)")
-+	assert(dosystem("mv "TMPCACHE" "SVCDIR"/depcache"), "system(mv "TMPCACHE" "SVCDIR"/depcache)")
- }
- 
- 
-Index: src/awk/gendepends.awk
-===================================================================
-RCS file: /var/cvsroot/gentoo-src/rc-scripts/src/awk/gendepends.awk,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -r1.25 -r1.26
---- src/awk/gendepends.awk	23 Feb 2005 17:47:43 -0000	1.25
-+++ src/awk/gendepends.awk	10 Mar 2005 17:00:04 -0000	1.26
-@@ -1,6 +1,6 @@
- # Copyright 1999-2004 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
--# $Header: /var/cvsroot/gentoo-src/rc-scripts/src/awk/gendepends.awk,v 1.25 2005/02/23 17:47:43 azarah Exp $
-+# $Header: /var/cvsroot/gentoo-src/rc-scripts/src/awk/gendepends.awk,v 1.26 2005/03/10 17:00:04 azarah Exp $
- 
- # bool check_service(name)
- #
-@@ -498,7 +498,7 @@
- 	close(CACHEDTREE)
- 
- 	assert(dosystem("rm -f "ORIGCACHEDTREE), "system(rm -f "ORIGCACHEDTREE")")
--	assert(system("mv "CACHEDTREE" "ORIGCACHEDTREE), "system(mv "CACHEDTREE" "ORIGCACHEDTREE")")
-+	assert(dosystem("mv "CACHEDTREE" "ORIGCACHEDTREE), "system(mv "CACHEDTREE" "ORIGCACHEDTREE")")
- }
- 
- 
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-iwconfig.patch b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-iwconfig.patch
deleted file mode 100644
index 878a51aeaf6a..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-iwconfig.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u -B -r1.7.2.15 iwconfig
---- lib/rcscripts/net.modules.d/iwconfig	13 Mar 2005 19:03:21 -0000
-+++ lib/rcscripts/net.modules.d/iwconfig	14 Mar 2005 16:49:14 -0000
-@@ -211,11 +211,8 @@
- 		fi
- 	fi
- 
--	# Attempt to default the key to [1]
--	iwconfig ${iface} key [1] 2>/dev/null
--
- 	key=$( iwconfig_get_wep_key )
--	e=$( eval "iwconfig ${iface} key [1] key ${key} 2>&1" )
-+	e=$( eval "iwconfig ${iface} key ${key} 2>&1" )
- 	if [[ -n ${e} && ${key} != off ]]; then
-		e=$( get_essid_var ${essid} )
-		ewarn "${iface} does not support setting keys"
-@@ -346,9 +341,6 @@
- 			vewarn "\"${dessid}\" is not WEP enabled - ignoring setting"
- 		fi
- 
--		# Attempt to default the key to [1]
--		iwconfig ${iface} key [1] 2>/dev/null
--
- 		e=$( eval "iwconfig ${iface} key ${key} 2>&1" )
- 		if [[ -n ${e} && ${key} != off ]]; then
- 			ewarn "${iface} does not support setting keys"
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-modules-return-clobber.patch b/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-modules-return-clobber.patch
deleted file mode 100644
index 6216ff90c6cd..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.12.0_alpha1-modules-return-clobber.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: init.d/modules
-===================================================================
-RCS file: /var/cvsroot/gentoo-src/rc-scripts/init.d/modules,v
-retrieving revision 1.34
-retrieving revision 1.35
-diff -u -r1.34 -r1.35
---- init.d/modules	24 Feb 2005 01:17:24 -0000	1.34
-+++ init.d/modules	11 Mar 2005 13:54:39 -0000	1.35
-@@ -117,6 +117,9 @@
- 	# /lib/modules/boot for boot time modules we will load these modules
- 	#
- 	[[ -n $(modprobe -l -t boot) ]] && modprobe -a -t boot \*  &>/dev/null
-+	
-+	# Above test clobbers the return
-+	return 0
- }
- 
- 
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r3 b/sys-apps/baselayout/files/digest-baselayout-1.11.10-r3
deleted file mode 100644
index 5be60709a381..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a585da151e2d8b7acda5e01e737347b rc-scripts-1.6.10.tar.bz2 159096
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r4 b/sys-apps/baselayout/files/digest-baselayout-1.11.10-r4
deleted file mode 100644
index 5be60709a381..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a585da151e2d8b7acda5e01e737347b rc-scripts-1.6.10.tar.bz2 159096
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r5 b/sys-apps/baselayout/files/digest-baselayout-1.11.10-r5
deleted file mode 100644
index 5be60709a381..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a585da151e2d8b7acda5e01e737347b rc-scripts-1.6.10.tar.bz2 159096
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r6 b/sys-apps/baselayout/files/digest-baselayout-1.11.10-r6
deleted file mode 100644
index 5be60709a381..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.11.10-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a585da151e2d8b7acda5e01e737347b rc-scripts-1.6.10.tar.bz2 159096
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.11-r1 b/sys-apps/baselayout/files/digest-baselayout-1.11.11-r1
new file mode 100644
index 000000000000..d4d79f6651a0
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.11.11-r1
@@ -0,0 +1 @@
+MD5 674a1585df45a6a7a5aed7a50e520422 rc-scripts-1.6.11.tar.bz2 159309
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r4 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r4
deleted file mode 100644
index 8224a85cdd49..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 afa07a4242fab5d085813c8e97a43345 rc-scripts-1.7.0.tar.bz2 162694