Final RC_COLDPLUG changes. Back to a simple yes|no and the optional service

  list moved to RC_PLUG_SERVICES.
Package-Manager: portage-2.1_pre10-r2

8 files changed, 1430 insertions, 70 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 90dd84f4dbe4..872c5f2e5e4c 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,20 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.325 2006/05/02 18:49:17 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.326 2006/05/04 09:18:46 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-1.12.0_pre19-r2 (04 May 2006)
+*baselayout-1.11.15-r3 (04 May 2006)
+
+  04 May 2006; Roy Marples <uberlord@gentoo.org>
+  files/baselayout-1.11.15-coldplug.patch,
+  files/baselayout-1.12.0_pre19-coldplug.patch,
+  +baselayout-1.11.15-r3.ebuild, +baselayout-1.12.0_pre19-r2.ebuild:
+  Final RC_COLDPLUG changes. Back to a simple yes|no and the optional service
+  list moved to RC_PLUG_SERVICES.
+
   02 May 2006; Roy Marples <uberlord@gentoo.org>
   files/baselayout-1.11.15-coldplug.patch,
   files/baselayout-1.12.0_pre19-coldplug.patch:
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index da3874f9257e..5da4a9916a7a 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -34,10 +34,10 @@ AUX baselayout-1.11.14-wpa_supplicant.patch 1163 RMD160 9524ecbb1080f47283f776a9
 MD5 893fc11f23ec8cdcdc634b77fcef89f6 files/baselayout-1.11.14-wpa_supplicant.patch 1163
 RMD160 9524ecbb1080f47283f776a9eb8056d7224c04e7 files/baselayout-1.11.14-wpa_supplicant.patch 1163
 SHA256 eda23993355ff52b646946f29f7b8450d50be85e052909e04f810cb78a8e589a files/baselayout-1.11.14-wpa_supplicant.patch 1163
-AUX baselayout-1.11.15-coldplug.patch 2075 RMD160 c1865099cb4f2f502a6a01da7f71775355df51ed SHA1 86775ca6f1b9aa365fcc95b00f486ed4a604e1f8 SHA256 4f77c5c170680e6c1c1897e6045d28ae8be61d2a29fa23fe2621872d159f95bd size 2075
-MD5 6935f7edf9b4e0d0ee9a5a0d8da19a1f files/baselayout-1.11.15-coldplug.patch 2075
-RMD160 c1865099cb4f2f502a6a01da7f71775355df51ed files/baselayout-1.11.15-coldplug.patch 2075
-SHA256 4f77c5c170680e6c1c1897e6045d28ae8be61d2a29fa23fe2621872d159f95bd files/baselayout-1.11.15-coldplug.patch 2075
+AUX baselayout-1.11.15-coldplug.patch 2449 RMD160 6a8838bbd2b724d305ff14ae66a935773931e51a SHA1 6df3abaf389b40d7b3371849e73d6b0507d63cf6 SHA256 626428986dd21c95b16d464e845ffa79dd535aaf089b91423e704e7d64562d26 size 2449
+MD5 cb8e034c5ef06038baec109c078305e8 files/baselayout-1.11.15-coldplug.patch 2449
+RMD160 6a8838bbd2b724d305ff14ae66a935773931e51a files/baselayout-1.11.15-coldplug.patch 2449
+SHA256 626428986dd21c95b16d464e845ffa79dd535aaf089b91423e704e7d64562d26 files/baselayout-1.11.15-coldplug.patch 2449
 AUX baselayout-1.11.15-halt-sort.patch 758 RMD160 282a645738a22098242b56d3f1d39321865f6b49 SHA1 6282f2bc1c7d04e383280fb5367c95e42ac06158 SHA256 496dd355956c960be8a4db1021c3ee76a9250346e0e83f2470974de3859a753e size 758
 MD5 cddb3cf64411b67dffe4cdd37bd2b82e files/baselayout-1.11.15-halt-sort.patch 758
 RMD160 282a645738a22098242b56d3f1d39321865f6b49 files/baselayout-1.11.15-halt-sort.patch 758
@@ -46,10 +46,10 @@ AUX baselayout-1.12.0_pre18-halt-sort.patch 668 RMD160 0eb0f49eefdffd6902cab064a
 MD5 e3d70da9ac044bf4cb9cd8246c84001c files/baselayout-1.12.0_pre18-halt-sort.patch 668
 RMD160 0eb0f49eefdffd6902cab064a95e349fc06422f0 files/baselayout-1.12.0_pre18-halt-sort.patch 668
 SHA256 74b3d85b6909b2685b87dc18df622461e2426cc06e03c8f3977c4474dcf5cbd5 files/baselayout-1.12.0_pre18-halt-sort.patch 668
-AUX baselayout-1.12.0_pre19-coldplug.patch 2583 RMD160 9a669dbc7849fcc0b45e6e722ef7bdd02a04b1be SHA1 ce7458d6894cd78d096632ed6bfce83a00a95765 SHA256 f464cfdc5466ecbabbadc217eb273768b6d9626c9784bbfe740195b89448e61d size 2583
-MD5 c6cfa61120cc3674690391fc66e576df files/baselayout-1.12.0_pre19-coldplug.patch 2583
-RMD160 9a669dbc7849fcc0b45e6e722ef7bdd02a04b1be files/baselayout-1.12.0_pre19-coldplug.patch 2583
-SHA256 f464cfdc5466ecbabbadc217eb273768b6d9626c9784bbfe740195b89448e61d files/baselayout-1.12.0_pre19-coldplug.patch 2583
+AUX baselayout-1.12.0_pre19-coldplug.patch 5240 RMD160 6431f79cbc383afc79594a1d2d8d905381cb637b SHA1 d14ea0e55cca303ce4c42a9e00f508c2d8b2cafd SHA256 6291f9ae48d7085774084e1d365d9e1d74bcad85a2c700e5912c323bab8f230d size 5240
+MD5 99bca42239625b28e4e73b1dac3f26e2 files/baselayout-1.12.0_pre19-coldplug.patch 5240
+RMD160 6431f79cbc383afc79594a1d2d8d905381cb637b files/baselayout-1.12.0_pre19-coldplug.patch 5240
+SHA256 6291f9ae48d7085774084e1d365d9e1d74bcad85a2c700e5912c323bab8f230d files/baselayout-1.12.0_pre19-coldplug.patch 5240
 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd size 2099
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
@@ -75,6 +75,10 @@ EBUILD baselayout-1.11.15-r2.ebuild 19173 RMD160 1373231e8350fdac05009925ff7ae2c
 MD5 1bf414afca1f26c61a0048c1de8c6bf1 baselayout-1.11.15-r2.ebuild 19173
 RMD160 1373231e8350fdac05009925ff7ae2c3ffbea6df baselayout-1.11.15-r2.ebuild 19173
 SHA256 f10f799fc686366bd2828ffe3f284d877e84efd1f4d77a736c4def1bb47938ab baselayout-1.11.15-r2.ebuild 19173
+EBUILD baselayout-1.11.15-r3.ebuild 19173 RMD160 be79482250f6f22db62f1137a3660aedd78385c4 SHA1 b3b513f8c40c6a488cb27f63d9273d18b2269db8 SHA256 6cd330656bdbae217fe2ec1d4f13aea754ff45aa13eeff826974f92d86dd69cd size 19173
+MD5 44fd75ee6cf039138fabcbcd20c86a6a baselayout-1.11.15-r3.ebuild 19173
+RMD160 be79482250f6f22db62f1137a3660aedd78385c4 baselayout-1.11.15-r3.ebuild 19173
+SHA256 6cd330656bdbae217fe2ec1d4f13aea754ff45aa13eeff826974f92d86dd69cd baselayout-1.11.15-r3.ebuild 19173
 EBUILD baselayout-1.11.15.ebuild 19082 RMD160 bbc1c51a20d5e5bc4adf88977470d05ab1a0e2e4 SHA1 2feea7632dd936e4772a272200f6b4dd1ef3fe6e SHA256 df7199bcb4e2c84c970759f86e212f647776e0e50492fe7ef5cedc7d21c494b1 size 19082
 MD5 3332efcc10de2831da0b56517190dc4d baselayout-1.11.15.ebuild 19082
 RMD160 bbc1c51a20d5e5bc4adf88977470d05ab1a0e2e4 baselayout-1.11.15.ebuild 19082
@@ -91,14 +95,18 @@ EBUILD baselayout-1.12.0_pre19-r1.ebuild 19870 RMD160 13d16fa153f6e8aa1943428d3b
 MD5 1f50db9795bc622ad6f7dd1233ef3424 baselayout-1.12.0_pre19-r1.ebuild 19870
 RMD160 13d16fa153f6e8aa1943428d3b025d757dede5c2 baselayout-1.12.0_pre19-r1.ebuild 19870
 SHA256 af92c8274dcc0f4168e0e569e4e3104edfc2b70091fc45ed46424e61cbae910e baselayout-1.12.0_pre19-r1.ebuild 19870
+EBUILD baselayout-1.12.0_pre19-r2.ebuild 19870 RMD160 3ba0e7b44de2997e87c3a204ab88b83975b7b0a2 SHA1 c474b90ead8de702420ab7420e52654489217f79 SHA256 053b972f32154fd71aab400627ce123504cc6e8ba0e319bc3db570226c5ab329 size 19870
+MD5 6bef9780c62f4890dea22faafe60363b baselayout-1.12.0_pre19-r2.ebuild 19870
+RMD160 3ba0e7b44de2997e87c3a204ab88b83975b7b0a2 baselayout-1.12.0_pre19-r2.ebuild 19870
+SHA256 053b972f32154fd71aab400627ce123504cc6e8ba0e319bc3db570226c5ab329 baselayout-1.12.0_pre19-r2.ebuild 19870
 EBUILD baselayout-1.12.0_pre19.ebuild 19776 RMD160 f24db28c1f44840ef77ae62e352df3d95cd80123 SHA1 7939ea615ee89f2b14e0b7e34e160dab0441d58a SHA256 7c11d064067a4e9e464e8d3500fb1bbfdebd78c84af71fea03cb6f21ffeb0620 size 19776
 MD5 bba3f186404b7cc4c3884eda8a2af700 baselayout-1.12.0_pre19.ebuild 19776
 RMD160 f24db28c1f44840ef77ae62e352df3d95cd80123 baselayout-1.12.0_pre19.ebuild 19776
 SHA256 7c11d064067a4e9e464e8d3500fb1bbfdebd78c84af71fea03cb6f21ffeb0620 baselayout-1.12.0_pre19.ebuild 19776
-MISC ChangeLog 74284 RMD160 aa31e1b726786036e44eb10d53b4fbf44c307ba3 SHA1 24f36f9892396a34835124c71475cf79a1dbc017 SHA256 8bffb314b941a651aa5b5c3d26c33f9b3b4ad0cb8763c631a09193aefcc51263 size 74284
-MD5 5a70fd88851768e65df5b50439587d59 ChangeLog 74284
-RMD160 aa31e1b726786036e44eb10d53b4fbf44c307ba3 ChangeLog 74284
-SHA256 8bffb314b941a651aa5b5c3d26c33f9b3b4ad0cb8763c631a09193aefcc51263 ChangeLog 74284
+MISC ChangeLog 74686 RMD160 ea1dea83d03f22a557b513be9262c2b4b1dd5660 SHA1 b6c468b980d4b5c43697c09d1355876e4101f66f SHA256 3483dd182da40af345a257c6132895130b3b877ba392020bc09cb51c081a4188 size 74686
+MD5 300e586afdd4b29493ff152fa435ce3f ChangeLog 74686
+RMD160 ea1dea83d03f22a557b513be9262c2b4b1dd5660 ChangeLog 74686
+SHA256 3483dd182da40af345a257c6132895130b3b877ba392020bc09cb51c081a4188 ChangeLog 74686
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -118,6 +126,9 @@ SHA256 634668e30943316fee0925f0cda440d80319cb9072270573bcbbdbac5986b40b files/di
 MD5 45d5d54f514daeb8d7eedb2a553101b0 files/digest-baselayout-1.11.15-r2 256
 RMD160 5e19a5d090c498d3b79d59e869a95a7a05cfe562 files/digest-baselayout-1.11.15-r2 256
 SHA256 634668e30943316fee0925f0cda440d80319cb9072270573bcbbdbac5986b40b files/digest-baselayout-1.11.15-r2 256
+MD5 45d5d54f514daeb8d7eedb2a553101b0 files/digest-baselayout-1.11.15-r3 256
+RMD160 5e19a5d090c498d3b79d59e869a95a7a05cfe562 files/digest-baselayout-1.11.15-r3 256
+SHA256 634668e30943316fee0925f0cda440d80319cb9072270573bcbbdbac5986b40b files/digest-baselayout-1.11.15-r3 256
 MD5 a85959df836c7ca5d445ecdca728cd16 files/digest-baselayout-1.12.0_pre18 274
 RMD160 7acaef8f05f6eeb62d31616d8d3ef36f74a52047 files/digest-baselayout-1.12.0_pre18 274
 SHA256 29adf17851e640067b44ad4a3a8fe5f25abbbd498dbe21fd1d9bc952bca4be99 files/digest-baselayout-1.12.0_pre18 274
@@ -130,3 +141,6 @@ SHA256 1e6bc287e9a17f1574048b24ddc25b0795a34939d021972af90502669e5c1b0a files/di
 MD5 69b300fa8ae841275d2a615bb7f54934 files/digest-baselayout-1.12.0_pre19-r1 274
 RMD160 e0d42498a99ef6f452c662b169b4b7e999084acf files/digest-baselayout-1.12.0_pre19-r1 274
 SHA256 1e6bc287e9a17f1574048b24ddc25b0795a34939d021972af90502669e5c1b0a files/digest-baselayout-1.12.0_pre19-r1 274
+MD5 69b300fa8ae841275d2a615bb7f54934 files/digest-baselayout-1.12.0_pre19-r2 274
+RMD160 e0d42498a99ef6f452c662b169b4b7e999084acf files/digest-baselayout-1.12.0_pre19-r2 274
+SHA256 1e6bc287e9a17f1574048b24ddc25b0795a34939d021972af90502669e5c1b0a files/digest-baselayout-1.12.0_pre19-r2 274
diff --git a/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
new file mode 100644
index 000000000000..872c26b7802e
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild
@@ -0,0 +1,610 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.15-r3.ebuild,v 1.1 2006/05/04 09:18:46 uberlord Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+SV=1.6.${PV##*.}
+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/~azarah/${PN}/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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bootstrap build static unicode"
+
+# 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.86-r3
+	!build? ( !bootstrap? (
+		>=sys-libs/readline-5.0-r1
+		>=app-shells/bash-3.0-r10
+		>=sys-apps/coreutils-5.2.1
+		|| ( >=sys-fs/udev-070 >=sys-fs/devfsd-1.3.25-r9 )
+	) )"
+DEPEND="virtual/os-headers
+	>=sys-apps/portage-2.0.51"
+PROVIDE="virtual/baselayout"
+
+S=${WORKDIR}/rc-scripts-${SV}${SVREV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}"-halt-sort.patch
+	epatch "${FILESDIR}/${P}"-coldplug.patch
+
+	# Setup unicode defaults for silly unicode users
+	if use unicode ; then
+		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+	fi
+
+	# Tweak arch-specific details
+	cd "${S}"
+
+	case $(tc-arch) in
+	sparc)
+		sed -i -e '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
+		;;
+	esac
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	make -C "${S}"/src CC="$(tc-getCC)" LD="$(tc-getCC)" || die
+}
+
+# ${PATH} should include where to get MAKEDEV when calling this
+# function
+create_dev_nodes() {
+	case $(tc-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 ;;
+		sh*)     suffix=-sh ;;
+		sparc*)  suffix=-sparc ;;
+		x86)     suffix=-i386 ;;
+	esac
+
+	einfo "Using generic${suffix} to make $(tc-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
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+	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"
+fi
+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
+}
+
+# Same as kdir above, but for symlinks #103618
+ksym() {
+	echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn '  unable to symlink $2 to $1' ; }" \
+		>> "${D}"/usr/share/baselayout/mklinks.sh
+}
+
+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...
+
+	# fixes 110143
+	if [[ ${SYMLINK_LIB} == "yes" ]]; then
+		default_lib_dir="$(get_abi_LIBDIR ${DEFAULT_ABI})"
+	else
+		default_lib_dir="lib"
+	fi
+
+	# This should be /lib/rcscripts, but we have to support old profiles too.
+	rcscripts_dir="/${default_lib_dir}/rcscripts"
+
+	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 ${rcscripts_dir}
+	kdir ${rcscripts_dir}/awk
+	kdir ${rcscripts_dir}/sh
+	kdir ${rcscripts_dir}/net.modules.d
+	kdir ${rcscripts_dir}/net.modules.d/helpers.d
+	# Only install /mnt stuff at bootstrap time #88835 / #90022
+	if use build ; then
+		kdir /mnt
+		kdir -m 0700 /mnt/cdrom
+		kdir -m 0700 /mnt/floppy
+	fi
+	kdir /opt
+	kdir -o root -g uucp -m0775 /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 ${PORTDIR}
+	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
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+	fi
+
+	kdir /${default_lib_dir}/dev-state
+	kdir /${default_lib_dir}/udev-state
+
+	# FHS compatibility symlinks stuff
+	ksym /var/tmp /usr/tmp
+	ksym share/man /usr/local/man
+
+	#
+	# Setup files in /etc
+	#
+	insopts -m0644
+	insinto /etc
+	doins -r "${S}"/etc/*
+	fperms 0640 /etc/sysctl.conf
+
+	# 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
+
+	# doinitd doesnt respect symlinks
+	dodir /etc/init.d
+	cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd"
+	#doinitd "${S}"/init.d/* || die "doinitd"
+	doconfd "${S}"/etc/conf.d/* || die "doconfd"
+	doenvd "${S}"/etc/env.d/* || die "doenvd"
+	insinto /etc/modules.autoload.d
+	doins "${S}"/etc/modules.autoload.d/*
+	insinto /etc/modules.d
+	doins "${S}"/etc/modules.d/*
+
+	# 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
+
+	# 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
+	source "${ROOT}"/usr/share/baselayout/mklinks.sh
+	echo
+
+	# 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
+			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 /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 --update &>/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_pre19-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild
new file mode 100644
index 000000000000..358c374bffd5
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild
@@ -0,0 +1,628 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild,v 1.1 2006/05/04 09:18:46 uberlord Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
+	http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bootstrap build static unicode"
+
+# 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.86-r3
+	!build? ( !bootstrap? (
+		>=sys-libs/readline-5.0-r1
+		>=app-shells/bash-3.1_p7
+		>=sys-apps/coreutils-5.2.1
+	) )"
+DEPEND="virtual/os-headers
+	>=sys-apps/portage-2.0.51"
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Change to pure list matching for RC_COLDPLUG
+	epatch "${FILESDIR}/${P}-coldplug.patch"
+
+	# Setup unicode defaults for silly unicode users
+	if use unicode ; then
+		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+	fi
+
+	# Tweak arch-specific details
+	cd "${S}"
+
+	case $(tc-arch) in
+	sparc)
+		sed -i -e '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
+		# Disable interactive boot on sparc due to stty calls, #104067
+		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
+		;;
+	esac
+
+	# Use correct path to filefuncs.so on multilib systems
+	sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
+		${S}/src/awk/{cachedepends,genenviron}.awk || die
+}
+
+src_compile() {
+	local libdir="lib"
+
+	use static && append-ldflags -static
+
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+	make -C "${S}"/src \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC) ${LDFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LIBDIR="${libdir}" || die
+}
+
+# ${PATH} should include where to get MAKEDEV when calling this
+# function
+create_dev_nodes() {
+	case $(tc-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 ;;
+		sh*)     suffix=-sh ;;
+		sparc*)  suffix=-sparc ;;
+		x86)     suffix=-i386 ;;
+	esac
+
+	einfo "Using generic${suffix} to make $(tc-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
+if [ ! -d "\${ROOT}/${d}" ] ; then \\
+	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"
+fi
+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
+}
+
+# Same as kdir above, but for symlinks #103618
+ksym() {
+	echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn '  unable to symlink $2 to $1' ; }" \
+		>> "${D}"/usr/share/baselayout/mklinks.sh
+}
+
+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 ${rcscripts_dir}
+	kdir ${rcscripts_dir}/awk
+	kdir ${rcscripts_dir}/sh
+	kdir ${rcscripts_dir}/net
+	# Only install /mnt stuff at bootstrap time #88835 / #90022
+	if use build ; then
+		kdir /mnt
+		kdir -m 0700 /mnt/cdrom
+		kdir -m 0700 /mnt/floppy
+	fi
+	kdir /opt
+	kdir -o root -g uucp -m0775 /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 ${PORTDIR}
+	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
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+	fi
+
+	kdir /lib/dev-state
+	kdir /lib/udev-state
+
+	# FHS compatibility symlinks stuff
+	ksym /var/tmp /usr/tmp
+	ksym share/man /usr/local/man
+
+	#
+	# Setup files in /etc
+	#
+	insopts -m0644
+	insinto /etc
+	doins -r "${S}"/etc/*
+	fperms 0640 /etc/sysctl.conf
+
+	# 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
+
+	# doinitd doesnt respect symlinks
+	dodir /etc/init.d
+	cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd"
+	#doinitd "${S}"/init.d/* || die "doinitd"
+	doconfd "${S}"/etc/conf.d/* || die "doconfd"
+	doenvd "${S}"/etc/env.d/* || die "doenvd"
+	insinto /etc/modules.autoload.d
+	doins "${S}"/etc/modules.autoload.d/*
+	insinto /etc/modules.d
+	doins "${S}"/etc/modules.d/*
+
+	# 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
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System version ${PV}" > ${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 -pPR "${S}"/lib/rcscripts/net ${D}${rcscripts_dir}
+	chown -R root:0 ${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
+	source "${ROOT}"/usr/share/baselayout/mklinks.sh
+	echo
+
+	# 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
+			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 /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 --update &>/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 ${PV}" > ${ROOT}/etc/gentoo-release
+
+	echo
+	einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+	einfo "else things might break at your next reboot!  You can use 'etc-update'"
+	einfo "to accomplish this:"
+	einfo
+	einfo "  # etc-update"
+	echo
+
+	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
+
+	# Remove old stuff that may cause problems.
+	if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then
+		rm -f "${ROOT}"/etc/env.d/01hostname
+	fi
+	if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then
+		rm -f "${ROOT}"/etc/init.d/domainname
+		rm -f "${ROOT}"/etc/runlevels/*/domainname
+		ewarn "The domainname init script has been removed in this version."
+		ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how"
+		ewarn "to apply dns/nis information to the loopback interface."
+	fi
+}
diff --git a/sys-apps/baselayout/files/baselayout-1.11.15-coldplug.patch b/sys-apps/baselayout/files/baselayout-1.11.15-coldplug.patch
index 7795ff9ffae0..aab81f1344b3 100644
--- a/sys-apps/baselayout/files/baselayout-1.11.15-coldplug.patch
+++ b/sys-apps/baselayout/files/baselayout-1.11.15-coldplug.patch
@@ -2,48 +2,58 @@ Index: etc/conf.d/rc
 ===================================================================
 --- etc/conf.d/rc	(revision 2021)
 +++ etc/conf.d/rc	(working copy)
-@@ -12,14 +12,13 @@
+@@ -10,17 +10,21 @@
  
- # Dynamic /dev managers can trigger coldplug events which cause services to
- # start before we are ready for them. If this happens, we can defer these
+ RC_PARALLEL_STARTUP="no"
+ 
+-# Dynamic /dev managers can trigger coldplug events which cause services to
+-# start before we are ready for them. If this happens, we can defer these
 -# services to start in the boot runlevel. If you don't want this then set
 -# RC_COLDPLUG to no.
 -# For more fine grained control you can list full service names to allow
 -# them to coldplug and prefix them with ! so they don't coldplug.
 -# Example - RC_COLDPLUG="net.wlan !net.*"
-+# services to start in the boot runlevel. RC_COLDPLUG is a list of services we
-+# allow to be coldplugged in this way. Globbing is allowed as is prefixing
-+# with ! which means don't coldplug.
-+# Example - RC_COLDPLUG="net.wlan !net.* *"
- # This allows net.wlan and any service not matching net.* to coldplug.
+-# This allows net.wlan and any service not matching net.* to coldplug.
++# Do we allow services to be hotplugged? If not, set to RC_HOTPLUG="no"
++# NOTE: This does not affect anything hotplug/udev related, just the
++# starting/stopping of the init.d service triggered by hotplug.
  
--RC_COLDPLUG="yes"
-+RC_COLDPLUG="*"
+ RC_COLDPLUG="yes"
  
++# Some people want a finer grain over hotplug/coldplug. RC_PLUG_SERVICES is a
++# list of services that are matched in order, either allowing or not. By
++# default we allow services through as RC_COLDPLUG has to be yes
++# anyway.
++# Example - RC_PLUG_SERVICES="net.wlan !net.*"
++# This allows net.wlan and any service not matching net.* to be plugged.
++
++RC_PLUG_SERVICES=""
++
  # RC_NET_STRICT_CHECKING allows some flexibility with the 'net' service.
  # The following values are allowed:
+ #  none  - The 'net' service is always considered up.
 Index: sbin/runscript.sh
 ===================================================================
 --- sbin/runscript.sh	(revision 2021)
 +++ sbin/runscript.sh	(working copy)
-@@ -34,13 +34,15 @@
+@@ -34,14 +34,12 @@
  # until after rc sysinit has completed so we punt them to the boot runlevel
  if [[ -e /dev/.rcsysinit ]] ; then
  	eerror "ERROR:  cannot run ${SVCNAME} until sysinit completes"
 -	[[ ${RC_COLDPLUG} == "no" ]] && exit 1
 -	if [[ ${RC_COLDPLUG} != "yes" ]] ; then
-+	[[ "${RC_COLDPLUG}  " == "!* "* ]] && exit 1
-+	if [[ "${RC_COLDPLUG}  " != "* "* ]] ; then
-+		cd /etc/init.d
-+		shopt -s nullglob extglob
- 		for x in ${RC_COLDPLUG} ; do
+-		for x in ${RC_COLDPLUG} ; do
 -			# We don't quote ${x} so we can do globbing
 -			[[ ${SVCNAME} == ${x} ]] && break
 -			[[ "!${SVCNAME}" == ${x} ]] && exit 1
-+			[[ ${SVCNAME} == "${x}" ]] && break
-+			[[ "!${SVCNAME}" == "${x}" ]] && exit 1
- 		done
-+		[[ ${SVCNAME} == "${x}" ]] || exit 1
- 	fi
+-		done
+-	fi
++	[[ ${RC_COLDPLUG:-yes} != "yes" ]] && exit 1
++	set -f
++	for x in ${RC_PLUG_SERVICES} ; do
++		[[ ${SVCNAME} == ${x} ]] && break
++		[[ "!${SVCNAME}" == ${x} ]] && exit 1
++	done
  	eerror "${SVCNAME} will be started in the ${BOOTLEVEL} runlevel"
  	if [[ ! -L /dev/.rcboot/"${SVCNAME}" ]] ; then
+ 		[[ ! -d /dev/.rcboot ]] && mkdir /dev/.rcboot
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_pre19-coldplug.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre19-coldplug.patch
index a32af7ef2594..4f8d0ec4682d 100644
--- a/sys-apps/baselayout/files/baselayout-1.12.0_pre19-coldplug.patch
+++ b/sys-apps/baselayout/files/baselayout-1.12.0_pre19-coldplug.patch
@@ -1,39 +1,16 @@
-Index: sbin/runscript.sh
-===================================================================
---- sbin/runscript.sh	(revision 2021)
-+++ sbin/runscript.sh	(working copy)
-@@ -27,13 +27,15 @@
- # until after rc sysinit has completed so we punt them to the boot runlevel
- if [[ -e /dev/.rcsysinit ]] ; then
- 	eerror "ERROR:  cannot run ${SVCNAME} until sysinit completes"
--	[[ ${RC_COLDPLUG} == "no" ]] && exit 1
--	if [[ ${RC_COLDPLUG} != "yes" ]] ; then
-+	[[ "${RC_COLDPLUG}  " == "!* "* ]] && exit 1
-+	if [[ "${RC_COLDPLUG}  " != "* "* ]] ; then
-+		cd /etc/init.d
-+		shopt -s nullglob extglob
- 		for x in ${RC_COLDPLUG} ; do
--			# We don't quote ${x} so we can do globbing
--			[[ ${SVCNAME} == ${x} ]] && break
--			[[ "!${SVCNAME}" == ${x} ]] && exit 1
-+			[[ ${SVCNAME} == "${x}" ]] && break
-+			[[ "!${SVCNAME}" == "${x}" ]] && exit 1
- 		done
-+		[[ ${SVCNAME} == "${x}" ]] || exit 1
- 	fi
- 	eerror "${SVCNAME} will be started in the ${BOOTLEVEL} runlevel"
- 	if [[ ! -L /dev/.rcboot/"${SVCNAME}" ]] ; then
 Index: ChangeLog
 ===================================================================
 --- ChangeLog	(revision 2021)
 +++ ChangeLog	(working copy)
-@@ -1,6 +1,10 @@
+@@ -1,6 +1,12 @@
  # ChangeLog for Gentoo System Intialization ("rc") scripts
  # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
  
-+  02 May 2006; Roy Marples <uberlord@gentoo.org>:
++  04 May 2006; Roy Marples <uberlord@gentoo.org>:
 +
-+    RC_COLDPLUG is now a pure pattern list which defaults to "*"
++    RC_COLDPLUG is now just a yes|no setting and the service list allowed
++    is now in RC_PLUG_SERVICES.
++    Added RC_HOTPLUG setting similar to RC_COLDPLUG.
 +
  * baselayout-1.12.0_pre19 (02 May 2006)
  
@@ -42,8 +19,16 @@ Index: etc/conf.d/rc
 ===================================================================
 --- etc/conf.d/rc	(revision 2021)
 +++ etc/conf.d/rc	(working copy)
-@@ -18,14 +18,13 @@
+@@ -16,17 +16,30 @@
  
+ RC_INTERACTIVE="yes"
+ 
++# Do we allow services to be hotplugged? If not, set to RC_HOTPLUG="no"
++# NOTE: This does not affect anything hotplug/udev related, just the
++# starting/stopping of the init.d service triggered by hotplug.
++
++RC_HOTPLUG="yes"
++
  # Dynamic /dev managers can trigger coldplug events which cause services to
  # start before we are ready for them. If this happens, we can defer these
 -# services to start in the boot runlevel. If you don't want this then set
@@ -51,14 +36,111 @@ Index: etc/conf.d/rc
 -# For more fine grained control you can list full service names to allow
 -# them to coldplug and prefix them with ! so they don't coldplug.
 -# Example - RC_COLDPLUG="net.wlan !net.*"
-+# services to start in the boot runlevel. RC_COLDPLUG is a list of services we
-+# allow to be coldplugged in this way. Globbing is allowed as is prefixing
-+# with ! which means don't coldplug.
-+# Example - RC_COLDPLUG="net.wlan !net.* *"
- # This allows net.wlan and any service not matching net.* to coldplug.
+-# This allows net.wlan and any service not matching net.* to coldplug.
++# services to start in the boot runlevel. Set RC_COLDPLUG="no" if you don't
++# want this.
++# NOTE: This does not affect anything coldplug/udev related, just the
++# starting/stopping of the init.d service triggered by coldplug.
  
--RC_COLDPLUG="yes"
-+RC_COLDPLUG="*"
+ RC_COLDPLUG="yes"
  
++# Some people want a finer grain over hotplug/coldplug. RC_PLUG_SERVICES is a
++# list of services that are matched in order, either allowing or not. By
++# default we allow services through as RC_COLDPLUG/RC_HOTPLUG has to be yes
++# anyway.
++# Example - RC_PLUG_SERVICES="net.wlan !net.*"
++# This allows net.wlan and any service not matching net.* to be plugged.
++
++RC_PLUG_SERVICES=""
++
  # RC_NET_STRICT_CHECKING allows some flexibility with the 'net' service.
  # The following values are allowed:
+ #  none  - The 'net' service is always considered up.
+Index: sbin/runscript.sh
+===================================================================
+--- sbin/runscript.sh	(revision 2021)
++++ sbin/runscript.sh	(working copy)
+@@ -27,14 +27,12 @@
+ # until after rc sysinit has completed so we punt them to the boot runlevel
+ if [[ -e /dev/.rcsysinit ]] ; then
+ 	eerror "ERROR:  cannot run ${SVCNAME} until sysinit completes"
+-	[[ ${RC_COLDPLUG} == "no" ]] && exit 1
+-	if [[ ${RC_COLDPLUG} != "yes" ]] ; then
+-		for x in ${RC_COLDPLUG} ; do
+-			# We don't quote ${x} so we can do globbing
+-			[[ ${SVCNAME} == ${x} ]] && break
+-			[[ "!${SVCNAME}" == ${x} ]] && exit 1
+-		done
+-	fi
++	[[ ${RC_COLDPLUG:-yes} != "yes" ]] && exit 1
++	set -f
++	for x in ${RC_PLUG_SERVICES} ; do
++		[[ ${SVCNAME} == ${x} ]] && break
++		[[ "!${SVCNAME}" == ${x} ]] && exit 1
++	done
+ 	eerror "${SVCNAME} will be started in the ${BOOTLEVEL} runlevel"
+ 	if [[ ! -L /dev/.rcboot/"${SVCNAME}" ]] ; then
+ 		[[ ! -d /dev/.rcboot ]] && mkdir /dev/.rcboot
+@@ -43,6 +41,24 @@
+ 	exit 1
+ fi
+ 
++# Only hotplug if we're allowed to
++if [[ ${IN_HOTPLUG} == "1" ]] ; then
++	if [[ ${RC_HOTPLUG:-yes} != "yes" ]] ; then
++		eerror "${SVCNAME} is not allowed to be hotplugged"
++		exit 1
++	fi
++	
++	set -f
++	for x in ${RC_PLUG_SERVICES} ; do
++		[[ ${SVCNAME} == ${x} ]] && break
++		if [[ "!${SVCNAME}" == ${x} ]] ; then
++			eerror "${SVCNAME} is not allowed to be hotplugged"
++			exit 1
++		fi
++	done
++	set +f
++fi
++
+ svc_trap() {
+ 	trap 'eerror "ERROR:  ${SVCNAME} caught an interrupt"; exit 1' \
+ 		INT QUIT TSTP
+Index: sbin/rc-services.sh
+===================================================================
+--- sbin/rc-services.sh	(revision 2021)
++++ sbin/rc-services.sh	(working copy)
+@@ -408,6 +408,7 @@
+ 		# if we can not start the services in parallel
+ 		# then just start it and return the exit status
+ 		( "/etc/init.d/${service}" start )
++		service_started "${service}" || service_inactive "${service}"
+ 		retval=$?
+ 		end_service "${service}" "${retval}"
+ 		splash "svc_started" "${service}" "${retval}"
+@@ -415,7 +416,8 @@
+ 	else
+ 		# if parallel startup is allowed, start it in background
+ 		(
+-			"/etc/init.d/${service}" start 
++			"/etc/init.d/${service}" start
++			service_started "${service}" || service_inactive "${service}"
+ 			retval=$?
+ 			end_service "${service}" "${retval}"
+ 			splash "svc_started" "${service}" "${retval}"
+@@ -458,6 +460,7 @@
+ 		# if we can not start the services in parallel
+ 		# then just start it and return the exit status
+ 		( "/etc/init.d/${service}" stop )
++		service_stopped "${service}"
+ 		retval=$?
+ 		end_service "${service}" "${retval}"
+ 		splash "svc_stopped" "${service}" "${retval}"
+@@ -466,6 +469,7 @@
+ 		# if parallel startup is allowed, start it in background
+ 		(
+ 			( "/etc/init.d/${service}" stop )
++			service_stopped "${service}"
+ 			retval=$?
+ 			end_service "${service}" "${retval}"
+ 			splash "svc_stopped" "${service}" "${retval}"
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.15-r3 b/sys-apps/baselayout/files/digest-baselayout-1.11.15-r3
new file mode 100644
index 000000000000..4bc409eb3b20
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.11.15-r3
@@ -0,0 +1,3 @@
+MD5 e3dd64c9b45454a99ce51ee2ec4b1fd5 rc-scripts-1.6.15.tar.bz2 161524
+RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 rc-scripts-1.6.15.tar.bz2 161524
+SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a rc-scripts-1.6.15.tar.bz2 161524
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre19-r2 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre19-r2
new file mode 100644
index 000000000000..9aa3ede98fa2
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre19-r2
@@ -0,0 +1,3 @@
+MD5 c6fd66038b900c1e59fc9121a1f6b268 baselayout-1.12.0_pre19.tar.bz2 213087
+RMD160 828a1611d8dc2bd2777bc950698b0dcf55c77367 baselayout-1.12.0_pre19.tar.bz2 213087
+SHA256 248b47af4c586896990b8d116c5ff35b7f03283892af8014aadca2e19a82589e baselayout-1.12.0_pre19.tar.bz2 213087