Add support for wpa_supplicant-0.4.0

Hopefully fix an obscure iwconfig bug
Package-Manager: portage-2.0.51.19

8 files changed, 1750 insertions, 2 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 2bb9fc8e1808..e19f892bff12 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.234 2005/04/21 09:39:02 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.235 2005/04/26 22:39:39 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.12.0_alpha2-r1 (26 Apr 2005)
+*baselayout-1.11.11-r2 (26 Apr 2005)
+
+  26 Apr 2005; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-1.11.11-wpa_supplicant.patch,
+  +files/baselayout-1.12.0-alpha2-netscripts-1.patch,
+  +baselayout-1.11.11-r2.ebuild, +baselayout-1.12.0_alpha2-r1.ebuild:
+  Add support for wpa_supplicant-0.4.0
+  Hopefully fix an obscure iwconfig bug
+
 *baselayout-1.11.11-r1 (21 Apr 2005)
 
   21 Apr 2005; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 146aca5fef5d..ba41fea9c53a 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,10 +1,12 @@
-MD5 78842eacea5698c459ef412f6a451998 ChangeLog 53766
+MD5 cd9d2e1368b04ee52de6f0f7fe861b2f ChangeLog 54150
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
 MD5 dca2cf7245292428f62f1ef4f20dd3d9 baselayout-1.11.11.ebuild 18466
 MD5 b43b02e2955a9d3be867e08e5b180d2d baselayout-1.11.9-r1.ebuild 16921
 MD5 5492ab916eceb3bca70d07d058c348de baselayout-1.11.10-r7.ebuild 17461
 MD5 246fd71241d26537604d061e1ce1582b baselayout-1.11.11-r1.ebuild 18547
+MD5 0594eabc63782310d5c342c03c7b8469 baselayout-1.11.11-r2.ebuild 18668
 MD5 3e593bad04336cf49c1e7978ce5c103f baselayout-1.12.0_alpha2.ebuild 18459
+MD5 4e6a023b9ee92289da1614eebfe9c590 baselayout-1.12.0_alpha2-r1.ebuild 18645
 MD5 c1996677fc298d37f0b92281ab134d90 baselayout-1.9.4-r6.ebuild 16997
 MD5 f90b7865e3d0207b26c2e1f4bf9e0ca3 baselayout-1.9.4-r7.ebuild 18003
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
@@ -13,7 +15,9 @@ MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
 MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch 413
 MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
 MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
+MD5 6d37e93641eee6754b93dde3324ae23b files/baselayout-1.11.11-wpa_supplicant.patch 1223
 MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
+MD5 d49b2a31706ee1e9508b188672afcf13 files/baselayout-1.12.0-alpha2-netscripts-1.patch 15665
 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
@@ -21,7 +25,9 @@ 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-r7 70
 MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r1 70
+MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r2 70
 MD5 45a6a081214e662ab8de935ae12a255e files/digest-baselayout-1.12.0_alpha2 69
+MD5 45a6a081214e662ab8de935ae12a255e files/digest-baselayout-1.12.0_alpha2-r1 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.11-r2.ebuild b/sys-apps/baselayout/baselayout-1.11.11-r2.ebuild
new file mode 100644
index 000000000000..0e5b99fc9b52
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-1.11.11-r2.ebuild
@@ -0,0 +1,592 @@
+# 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.11-r2.ebuild,v 1.1 2005/04/26 22:39:39 uberlord Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+SV=1.6.11		# 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
+		>=sys-apps/coreutils-5.2.1
+	) )"
+DEPEND="virtual/os-headers"
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Move bashrc to /etc/bashrc
+	epatch ${FILESDIR}/${PN}-1.11.10-bashrc.patch
+
+	# Support wpa_supplicant-0.4.0 and hopefully fix an obscure iwconfig bug
+	epatch ${FILESDIR}/${P}-wpa_supplicant.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
+	kdir ${rcscripts_dir}/net.modules.d
+	kdir ${rcscripts_dir}/net.modules.d/helpers.d
+	kdir /mnt
+	# 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
+	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
+}
+
+# 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
+		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
+
+	# 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() {
+	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
+
+	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_alpha2-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_alpha2-r1.ebuild
new file mode 100644
index 000000000000..9e4484148cfb
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-1.12.0_alpha2-r1.ebuild
@@ -0,0 +1,588 @@
+# 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_alpha2-r1.ebuild,v 1.1 2005/04/26 22:39:39 uberlord Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+SV=1.7.1		# 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}
+
+	# Bring net-scripts upto CVS 2005-04-26
+	# This fixes a few things, but mainly adds support for wpa_supplicant-0.4.0
+	epatch ${FILESDIR}/baselayout-1.12.0-alpha2-netscripts-1.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
+	kdir ${rcscripts_dir}/net.modules.d
+	kdir ${rcscripts_dir}/net.modules.d/helpers.d
+	kdir /mnt
+	# 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
+	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
+}
+
+# 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
+		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
+
+	# 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() {
+	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
+
+	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/files/baselayout-1.11.11-wpa_supplicant.patch b/sys-apps/baselayout/files/baselayout-1.11.11-wpa_supplicant.patch
new file mode 100644
index 000000000000..c8beeafab116
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.11.11-wpa_supplicant.patch
@@ -0,0 +1,26 @@
+diff -u net.modules.d/iwconfig /local/rc-scripts-stable/net-scripts/net.modules.d/iwconfig
+--- net.modules.d/iwconfig	2005-04-08 19:16:13.000000000 +0100
++++ lib/rcscripts/net.modules.d/iwconfig	2005-04-26 22:41:40.000000000 +0100
+@@ -442,6 +442,10 @@
+ 	x=${x:-auto}
+ 	[[ ${mode} != ${x} ]] && iwconfig ${iface} mode ${x} &>/dev/null
+ 
++	# HUP the interface as some drivers/cards need it
++	interface_down ${iface}
++	interface_up ${iface}			
++
+ 	if [[ -z ${scan} ]]; then
+ 		ewarn "${iface} does not support scanning"
+ 		eval x=\"\$\{adhoc_essid_${ifvar}\}\"
+diff -u net.modules.d/wpa_supplicant /local/rc-scripts-stable/net-scripts/net.modules.d/wpa_supplicant
+--- net.modules.d/wpa_supplicant	2005-04-14 18:52:31.000000000 +0100
++++ lib/rcscripts/net.modules.d/wpa_supplicant	2005-04-26 22:41:40.000000000 +0100
+@@ -102,7 +102,7 @@
+ 	local -a status=( "$( wpa_cli -i${1} status | awk -F= '/^key_mgmt|^wpa_state|^EAP state/ { print "\""$2"\"" }' )" )
+ 
+ 	case ${status[0]} in
+-		"NONE"	)		[[ ${status[1]} == "ASSOCIATED" ]] ;;
++		"NONE"	)		[[ ${status[1]} == "ASSOCIATED" || ${status[1]} == "COMPLETED" ]] ;;
+ 		"IEEE 802.1X (no WPA)")	[[ ${status[2]} == "SUCCESS" ]] ;;
+ 		*)			[[ ${status[1]} == "COMPLETED" ]] ;;
+ 	esac
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0-alpha2-netscripts-1.patch b/sys-apps/baselayout/files/baselayout-1.12.0-alpha2-netscripts-1.patch
new file mode 100644
index 000000000000..c64dbb81d1aa
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.12.0-alpha2-netscripts-1.patch
@@ -0,0 +1,524 @@
+diff -u net.modules.d/dhclient /lib/rcscripts/net.modules.d/dhclient
+--- net.modules.d/dhclient	2005-04-18 17:51:25.000000000 +0100
++++ lib/rcscripts/net.modules.d/dhclient	2005-04-26 07:57:32.483284550 +0100
+@@ -124,7 +124,7 @@
+ 	[[ ${x:${#x} - 5:5} == "bound" ]]
+ 	if [[ $? != 0 ]]; then
+ 		# We need to kill the process if we fail
+-		kill -s TERM $( < ${pidfile} ) 2>/dev/null
++		[[ -e ${pidfile} ]] && kill -s TERM $( < ${pidfile} ) 2>/dev/null
+ 		eend 1
+ 		return 1
+ 	fi
+diff -u net.modules.d/ifconfig /lib/rcscripts/net.modules.d/ifconfig
+--- net.modules.d/ifconfig	2005-04-18 18:10:41.000000000 +0100
++++ lib/rcscripts/net.modules.d/ifconfig	2005-04-22 16:56:22.563108496 +0100
+@@ -241,7 +241,8 @@
+ # fail, the routine should still return success to indicate that
+ # net.eth0 was successful
+ ifconfig_post_start() {
+-	local iface=$1 ifvar=$( bash_variable $1 ) routes x
++	local iface=$1 ifvar=$( bash_variable $1 ) routes x metric
++	eval metric=\"\$\{metric_${ifvar}\}\"
+ 
+ 	# Make sure interface is marked UP
+ 	ifconfig_up ${iface}
+@@ -270,19 +271,18 @@
+ 
+ 		# Support iproute2 style routes
+ 		x="${x//via/gw} "
+-		x=${x//scope * / }
++		x="${x//scope * / }"
+ 		
+ 		# Assume we're a net device unless told otherwise
+ 		[[ " ${x} " != *' -net '* && " ${x} " != *' -host '* ]] && x="-net ${x}"
+ 
+ 		# Support adding IPv6 addresses easily
+-		if [[ ${x} == *:* && ${x} != *'-A inet6'* ]]; then
+-			route add -A inet6 ${x} dev ${iface}
+-		else
+-			# We do this so we don't have to specify host or net
+-			# in our config
+-			route add ${x} dev ${iface} 
+-		fi
++		[[ ${x} == *:* && ${x} != *'-A inet6'* ]] && x="-A inet6 ${x}"
++
++		# Add a metric if we don't have one
++		[[ ${x} != *' metric '* ]] && x="${x} metric ${metric}"
++		
++		route add ${x} dev ${iface} 
+ 		eend $?
+ 	done
+ 	eoutdent
+@@ -294,7 +294,7 @@
+ #
+ # Adds the given address to the interface
+ ifconfig_add_address() {
+-	local iface=$1 i=0
++	local iface=$1 i=0 r e
+ 
+ 	ifconfig_exists ${iface} true || return 1
+ 
+@@ -324,11 +324,45 @@
+ 	# Some kernels like to apply lo with an address when they are brought up
+ 	if [[ ${iface} == "lo" || ${config[@]} == "127.0.0.1/8 broadcast 127.255.255.255" ]]; then
+ 		ifconfig ${iface} ${config[@]} 2>/dev/null
+-		return 0
++		r=0
+ 	else
+-		ifconfig ${iface} ${config[@]}
+-		return $?
++		e=$( ifconfig ${iface} ${config[@]} 2>&1 )
++		r=$?
++		[[ ${r} != 0 ]] && echo "${e}" > /dev/stderr
+ 	fi
++
++	[[ ${r} != 0 ]] && return ${r}
++
++	local metric ifvar=$( bash_variable ${iface} )
++	# Remove the newly added route and replace with our metric
++	eval metric=\"\$\{metric_${ifvar}\}\"
++	[[ ${metric} == 0 || ${auto_interface} != "yes" ]] && return ${r}
++
++	local ip=${config[0]} netmask
++	local cidr=${ip##*/}
++	ip=${ip%%/*}
++
++	if [[ -n ${cidr} && ${cidr} != ${ip} ]]; then
++		netmask=$( cidr2netmask ${cidr} )
++	else
++		for (( i=1; i<${#config[@]}-1; i++ )); do
++			if [[ ${config[i]} == "netmask" ]]; then
++				netmask=${config[i+1]}
++				cidr=$( netmask2cidr ${netmask} )
++				break
++			fi
++		done
++	fi
++
++	[[ -z ${netmask} ]] && return ${r}
++	echo ${netmask}
++	
++	local network=$( ip_network ${ip} ${netmask} )
++
++        route del -net ${network}/${cidr} dev ${iface}
++        route add -net ${network}/${cidr} metric ${metric} dev ${iface}
++
++        return ${r}
+ }
+ 
+ # void ifconfig_default_route(char* interface, char* gateway_ip, int metric)
+diff -u net.modules.d/iproute2 /lib/rcscripts/net.modules.d/iproute2
+--- net.modules.d/iproute2	2005-04-18 18:10:41.000000000 +0100
++++ lib/rcscripts/net.modules.d/iproute2	2005-04-25 08:05:15.723750125 +0100
+@@ -220,8 +220,11 @@
+ 		case ${config[x]} in
+ 			netmask)
+ 				config[0]="${config[0]}/$( netmask2cidr ${config[x+1]} )"
+-				unset config[x]
+-				unset config[x+1]
++				unset config[x] config[x+1]
++				;;
++			mtu)
++				ip link set mtu ${config[x+1]} dev ${iface}
++				unset config[x] config[x+1]
+ 				;;
+ 		esac
+ 	done
+@@ -236,13 +239,30 @@
+ 	iproute2_up ${iface}
+ 
+ 	# Some kernels like to apply lo with an address when they are brought up
++	local r
+ 	if [[ ${iface} == "lo" && ${config[@]} == "127.0.0.1/8 brd 127.255.255.255 scope host" ]]; then
+ 		ip addr add dev ${iface} ${config[@]} 2>/dev/null
+-		return 0
++		r=0
+ 	else
+ 		ip addr add dev ${iface} ${config[@]}
+-		return $?
++		r=$?
+ 	fi
++
++	local metric ifvar=$( bash_variable ${iface} )
++	# Remove the newly added route and replace with our metric
++	eval metric=\"\$\{metric_${ifvar}\}\"
++	[[ ${metric} == 0 || ${auto_interface} != "yes" ]] && return ${r}
++	
++	local network=$( ip_network ${config[0]} )
++	[[ -z ${network} ]] && return ${r}
++
++	local cidr=${config[0]}
++	cidr=${cidr##*/}
++	
++	ip route del ${network}/${cidr} dev ${iface}
++	ip route add ${network}/${cidr} metric ${metric} dev ${iface}
++	
++	return ${r}
+ }
+ 
+ # bool iproute2_post_start(char *interface)
+@@ -278,11 +298,9 @@
+ 		[[ ${x} == *'-host'* ]] && x="${x//-host} scope host"
+ 
+ 		# Add a metric if we don't have one
+-		if [[ ${x// metric } == ${x} ]]; then
+-			ip route append ${x} metric ${metric} dev ${iface}
+-		else
+-			ip route append ${x} dev ${iface}
+-		fi
++		[[ ${x} != *' metric '* ]] && x="${x} metric ${metric}"
++	
++		ip route append ${x} dev ${iface}
+ 		eend $?
+ 	done
+ 	eoutdent
+@@ -296,7 +314,7 @@
+ # the given interface
+ iproute2_default_route() {
+ 	local metric=${3:-0}
+-	
++
+ 	ip route change default via $2 metric ${metric} dev $1 2>/dev/null \
+ 	|| ip route append default via $2 metric ${metric} dev $1 2>/dev/null
+ }
+diff -u net.modules.d/iwconfig /lib/rcscripts/net.modules.d/iwconfig
+--- net.modules.d/iwconfig	2005-04-18 18:10:41.000000000 +0100
++++ lib/rcscripts/net.modules.d/iwconfig	2005-04-26 08:18:37.729553836 +0100
+@@ -492,6 +492,12 @@
+ 		fi
+ 	fi
+ 
++	# HUP the interface
++	# This may be have to be moved to the associate function
++	# if things like dhcp clients keep timing out but work manually
++	interface_down ${IFACE}
++	interface_up ${IFACE}
++
+ 	# Change back mode if needed
+ 	x=$( eval echo \$\{mode_${ifvar}\} | tr '[:upper:]' '[:lower:]' )
+ 	x=${x:-auto}
+@@ -832,7 +838,7 @@
+ # First we check if wireless extensions exist on the interface
+ # If they are then we configue wireless
+ iwconfig_pre_start() {
+-	local iface=$1 r=0 local wasup=true
++	local iface=$1 r=0
+ 
+ 	# We don't configure wireless if we're being called from
+ 	# the background
+@@ -841,23 +847,15 @@
+ 	save_options "ESSID" ""
+ 	interface_exists ${iface} || return 0
+ 
++	interface_up ${iface}
++
+ 	if ! iwconfig_check_extensions ${iface} ; then
+-		if ! interface_is_up ${iface} ; then
+-			interface_up ${iface}
+-			wasup=false
+-		fi
+-		if ! iwconfig_check_extensions ${iface} ; then
+-			veinfo "Wireless extensions not found for ${iface}"
+-			! ${wasup} && interface_down ${iface}
+-			return 0
+-		fi
++		veinfo "Wireless extensions not found for ${iface}"
++		return 0
+ 	fi
+ 
+ 	einfo "Configuring wireless network for ${iface}"
+ 
+-	# We need to bring the interface up to apply stuff
+-	interface_up ${iface}
+-
+ 	# Are we a proper IEEE device?
+ 	# Most devices reutrn IEEE 802.11b/g - but intel cards return IEEE in lower case
+ 	# and RA cards return RAPCI or similar which really sucks :(
+diff -u net.modules.d/wpa_supplicant /lib/rcscripts/net.modules.d/wpa_supplicant
+--- net.modules.d/wpa_supplicant	2005-04-19 09:16:28.000000000 +0100
++++ lib/rcscripts/net.modules.d/wpa_supplicant	2005-04-26 22:33:09.262334226 +0100
+@@ -98,6 +98,7 @@
+ # Returns 0 if we're associated correctly or 1 if not
+ # Note that just because we are associated does not mean we are using the
+ # correct encryption keys
++# We only need this for wpa_supplicant-0.3.x
+ wpa_supplicant_associated() {
+ 	local -a status=( "$( wpa_cli -i$1 status | sed -n -e 's/^\(key_mgmt\|wpa_state\|EAP state\)=\([^=]\+\).*/\U\2/p' )" )
+ 
+@@ -115,21 +116,35 @@
+ # Kills any existing wpa_supplicant process on the interface
+ wpa_supplicant_kill() {
+ 	local iface=$1 report=${2:-false}
+-	local pid=$( pgrep -f "^/usr/sbin/wpa_supplicant .* -i${iface}[ ]*$" )
+-
+-	if [[ -n ${pid} ]]; then
++	local pidfile="/var/run/wpa_supplicant-${iface}.pid"
++	
++	if ! clean_pidfile ${pidfile} ; then
+ 		${report} && ebegin "Stopping wpa_supplicant on ${iface}"
+-		kill -s TERM ${pid}
+-		${report} && eend 0
++		start-stop-daemon --stop --exec /usr/sbin/wpa_supplicant \
++			--pidfile ${pidfile}
++		${report} && eend $?
++	else
++		# Support wpa_supplicant-0.3.x
++		local pid=$( pgrep -f "^/usr/sbin/wpa_supplicant .* -i${iface}[ ]*$" )
++		if [[ -n ${pid} ]]; then
++			${report} && ebegin "Stopping wpa_supplicant on ${iface}"
++			kill -s TERM ${pid}
++			${report} && eend 0
++		fi
+ 	fi
+-
++	
+ 	# If wpa_supplicant exits uncleanly, we need to remove the stale dir
+ 	[[ -S /var/run/wpa_supplicant/${iface} ]] \
+ 		&& rm -f /var/run/wpa_supplicant/${iface}
+ 
+-	[[ -x /usr/sbin/wpa_monitor ]] && \
+-		start-stop-daemon --stop --exec /usr/sbin/wpa_monitor \
+-			--pidfile /var/run/wpa_monitor-${iface}.pid
++	# wpa_cli should close itself down cleanly, but just incase ...
++	pidfile="/var/run/wpa_cli-${iface}.pid"
++	if ! clean_pidfile ${pidfile} ; then
++		${report} && ebegin "Stopping wpa_cli on ${iface}"
++		start-stop-daemon --stop --exec /usr/bin/wpa_cli \
++			--pidfile ${pidfile} 
++		${report} && eend $?
++	fi
+ }
+ 
+ # bool wpa_supplicant_associate(char *interface)
+@@ -165,8 +180,9 @@
+ # Start wpa_supplicant on an interface and wait for association
+ # Returns 0 (true) when successful, non-zero otherwise
+ wpa_supplicant_pre_start() {
+-	local iface=$1 opts timeout
++	local iface=$1 opts timeout action
+ 	local cfgfile="/etc/wpa_supplicant.conf"
++	local actfile="/usr/sbin/wpa_cli.action"
+ 
+ 	# We don't configure wireless if we're being called from
+ 	# the background
+@@ -217,21 +233,27 @@
+ 	# Some drivers require the interface to be up
+ 	interface_up ${iface}
+ 
+-	if ! wpa_supplicant ${opts} -B -c/etc/wpa_supplicant.conf -i${iface} ; then
+-		eend 1
+-		return 1
+-	fi
+-
+-	if ! wpa_cli -i${iface} status &>/dev/null ; then
+-		eend 1 "wpa_supplicant has exited unexpectedly"
+-		return 1
+-	fi
+-
+-	# If wpa_monitor is available then we background regardless
+-	if [[ -x /usr/sbin/wpa_monitor ]]; then
+-		ebegin "Starting wpa_monitor on ${iface}"
+-		/usr/sbin/wpa_monitor -a/usr/sbin/wpa_monitor.action -i${iface}
+-		eend $?
++	version=$( wpa_cli -v | sed -n -e 's/wpa_cli v//p' )
++	version=( ${version//./ } )
++	(( version = version[0] * 1000 + version[1] * 100 + version[2] ))
++	# wpa_supplicant 0.4.0 and greater supports wpa_cli actions
++	if [[ ${version} -gt 399 && -x ${actfile} ]]; then
++		opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid"
++		action=true
++	fi
++
++	start-stop-daemon --start --exec /usr/sbin/wpa_supplicant \
++		-- ${opts} -B -c/etc/wpa_supplicant.conf -i${iface}
++	eend $? || return 1
++
++# Starting wpa_supplication-0.4.0, we can get wpa_cli to
++	# start/stop our scripts from wpa_supplicant messages
++	if [[ ${action} ]]; then
++		ebegin "Starting wpa_cli on ${iface}"
++		start-stop-daemon --start --exec /usr/bin/wpa_cli \
++			-- -a${actfile} -i${iface} \
++			-P/var/run/wpa_cli-${iface}.pid -B
++		eend $? || return 1
+ 		go_background
+ 	fi
+ 
+diff -u net.modules.d/helpers.d/dhcp /lib/rcscripts/net.modules.d/helpers.d/dhcp
+--- net.modules.d/helpers.d/dhcp	2005-04-18 18:10:41.000000000 +0100
++++ lib/rcscripts/net.modules.d/helpers.d/dhcp	2005-04-22 16:58:55.906796712 +0100
+@@ -90,6 +90,7 @@
+ 	else
+ 		metric=0
+ 	fi
++	eval metric_${ifvar}="${metric}"
+ fi
+ 
+ # Configure our IP address
+diff -u net.modules.d/helpers.d/functions /lib/rcscripts/net.modules.d/helpers.d/functions
+--- net.modules.d/helpers.d/functions	2005-04-18 18:10:41.000000000 +0100
++++ lib/rcscripts/net.modules.d/helpers.d/functions	2005-04-26 18:44:39.097840000 +0100
+@@ -10,9 +10,9 @@
+ # Can handle eth0:1 and eth0.1
+ # Which returns eth0 in this case
+ interface_device() {
+-	local dev=${1%%.*}
+-	[[ ${dev} == ${1} ]] && dev=${1%%:*}
+-	echo ${dev}
++	local dev="${1%%.*}"
++	[[ ${dev} == $1 ]] && dev="${1%%:*}"
++	echo "${dev}"
+ }
+ 
+ # char* interface_type(char* iface)
+@@ -20,7 +20,7 @@
+ # Returns the base type of the interface
+ # eth, ippp, etc
+ interface_type() {
+-	echo ${1%%[0-9]*}
++	echo "${1%%[0-9]*}"
+ }
+ 
+ # void save_state(char *interface)
+@@ -79,7 +79,7 @@
+ 	# Have we already got a metric?
+ 	local m=$( awk '$1=="'${iface}'" && $2=="00000000" { print $7 }' /proc/net/route )
+ 	if [[ -n ${m} ]]; then
+-		echo ${m}
++		echo "${m}"
+ 		return 0
+ 	fi
+ 	
+@@ -106,7 +106,7 @@
+ 	done
+ 
+ 	local m=$( awk "${exclude} { print "'$7'" }" /proc/net/route | sort -rn | head -n 1 | cut -d' ' -f2 )
+-	m=${m:--1}
++	m="${m:--1}"
+ 	(( m ++ ))
+ 
+ 	# If we're a wireless device then add 1000 so that wired interfaces take preference
+@@ -135,15 +135,15 @@
+ 		done
+ 		binary="${binary}${bin}"
+ 	done
+-	binary=${binary%%0*}
+-	echo ${#binary}
++	binary="${binary%%0*}"
++	echo "${#binary}"
+ }
+ 
+ # char* netmask2cidr(int cidr)
+ #
+ # Returns the netmask of a given CIDR
+ cidr2netmask() {
+-	local cidr=${1} netmask="" done=0 i sum=0 cur=128
++	local cidr="$1" netmask="" done=0 i sum=0 cur=128
+ 	local octets frac
+ 
+ 	(( octets=cidr/8 ))
+@@ -168,22 +168,52 @@
+ 		done
+ 	fi
+ 
+-	echo ${netmask:1}
++	echo "${netmask:1}"
+ }
+ 
++# char* ip_network(char *ip, char *netmask)
++#
++# Returns the network of the ip address
++# ip can be 192.168.0.51/24
++# or
++# ip can be 192.168.0.51 and netmask is 255.255.255.0
++ip_network() {
++	local ip="$1" mask="$2" i network x
++
++	# If we didn't get parameter 2 then assume we have a CIDR
++	if [[ -z ${mask} ]]; then
++		mask="${ip##*/}"
++		[[ -z ${mask} || ${mask} == ${ip} ]] && return 1
++		mask=$( cidr2netmask ${mask} )
++		ip="${ip%%/*}"
++	fi
++
++	ip=( ${ip//./ } )
++	mask=( ${mask//./ } )
++
++	for (( i=0; i<4; i++ )); do
++		(( x=ip[i] & mask[i] ))
++		network="${network}${x}"
++		[[ ${i} -lt 3 ]] && network="${network}."
++	done
++
++	echo "${network}"
++}
++
++
+ # bool clean_pidfile(char *file)
+ #
+ # Removes the given pidfile if the process is not running
+ # Returns 1 if the process is still running otherwise 0
+ clean_pidfile() {
+-	local pidfile=${1}
++	local pidfile="$1"
+ 
+ 	[[ ! -f ${pidfile} ]] && return 0
+ 	local pid=$( < ${pidfile} )
+ 
+ 	if [[ -n ${pid} ]]; then
+-		local cmd=${pidfile##*/}
+-		cmd=${cmd%%-*}
++		local cmd="${pidfile##*/}"
++		cmd="${cmd%%-*}"
+ 		ps -p ${pid} 2>/dev/null | grep -q ${cmd} && return 1
+ 	fi
+ 
+@@ -196,7 +226,7 @@
+ # We wait for 10 seconds until the command ${cmd}
+ # stops running on the process ${pid}
+ process_finished() {
+-	local i pid=$1 cmd=$2 secs=${3:-9}
++	local i pid="$1" cmd="$2" secs="${3:-9}"
+ 
+ 	for (( i=0; i<secs; i++ )); do
+ 		ps -p ${pid} 2>/dev/null | grep -q ${cmd} || return 0
+@@ -213,7 +243,7 @@
+ function_wrap() {
+ 	local i
+ 
+-	[[ $( type -t ${2}_provides ) == function ]] && return
++	[[ $( type -t ${2}_provides ) == "function" ]] && return
+ 
+ 	for i in $( typeset -f | grep -o ^${1}_'[^ ]*' ); do
+ 		eval "${2}${i#${1}}() { ${i} \"\$@\"; }"
+--- net.lo	2005-04-18 18:10:41.000000000 +0100
++++ init.d/net.lo	2005-04-25 08:09:32.599442139 +0100
+@@ -199,7 +199,7 @@
+ 				if [[ ${umods[i]:1} == ${MODULES[j]} || ${umods[i]:1} == ${PROVIDES[j]} ]]; then
+ 					# We may need to setup a class wrapper for it even though
+ 					# we don't use it directly
+-					${MODULES[j]}_check_installed && module_class_wrap ${MODULES[j]} ${PROVIDES[j]}
++					${MODULES[j]}_check_installed && function_wrap ${MODULES[j]} ${PROVIDES[j]}
+ 					unset MODULES[j]
+ 					unset PROVIDES[j]
+ 					break
+@@ -724,7 +724,7 @@
+ 	if [[ $( type -t postup ) == "function" ]]; then
+ 		einfo "Running postup function"
+ 		eindent
+-		$( postup ${iface} )
++		x=$( postup ${iface} ; echo $? )
+ 		eoutdent
+ 	fi
+ 
+@@ -760,7 +760,7 @@
+ 	if [[ $( type -t postdown ) == "function" ]]; then
+ 		einfo "Running postdown function"
+ 		eindent
+-		$( postdown ${iface} )
++		x=$( postdown ${iface} ; echo $? )
+ 		eoutdent
+ 	fi
+ 
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.11-r2 b/sys-apps/baselayout/files/digest-baselayout-1.11.11-r2
new file mode 100644
index 000000000000..d4d79f6651a0
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.11.11-r2
@@ -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_alpha2-r1 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha2-r1
new file mode 100644
index 000000000000..6b50e1945f71
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_alpha2-r1
@@ -0,0 +1 @@
+MD5 2f3f8d925cdbac31b7ee0b1020e9defc rc-scripts-1.7.1.tar.bz2 161003