New version.

  Punted pre1 and pre2 as they proved too buggy even for ~ARCH.
(Portage version: 2.0.51.22-r2)

6 files changed, 37 insertions, 1151 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 9ad75d213cc6..7f1229923d6d 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,18 @@
 # 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.260 2005/07/22 13:24:03 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.261 2005/07/29 11:22:48 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_pre3 (29 Jul 2005)
+
+  29 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  -files/baselayout-1.12.0_pre1-r1.patch, -baselayout-1.12.0_pre1-r1.ebuild,
+  -baselayout-1.12.0_pre2.ebuild, +baselayout-1.12.0_pre3.ebuild:
+  New version.
+  Punted pre1 and pre2 as they proved too buggy even for ~ARCH.
+
 *baselayout-1.12.0_pre2 (22 Jul 2005)
 
   22 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 0920334f50f2..f5bb07c156ad 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,49 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 4e7b0fb1a5daa54e4f8de4637b447fcd baselayout-1.11.12-r4.ebuild 19260
 MD5 ff608e6800fc96bfde6ae7fa09c37b56 baselayout-1.11.13.ebuild 18604
-MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 7d6f28f70034d87817939d447d40d39e baselayout-1.11.11-r3.ebuild 18759
 MD5 63063133efc82df82db512614030ba19 baselayout-1.9.4-r6.ebuild 16993
-MD5 451f8ce496238c2fd0fa9fa2852ad16c baselayout-1.9.4-r7.ebuild 17999
-MD5 4e7b0fb1a5daa54e4f8de4637b447fcd baselayout-1.11.12-r4.ebuild 19260
-MD5 4923f327546bfbbf5d7f86f29daca9b9 baselayout-1.12.0_pre1-r1.ebuild 18758
 MD5 d9ad55f811f6821be34e5cb26f5e676d ChangeLog 59196
-MD5 47f6cb568bc93a447b6c3892568abbf3 baselayout-1.12.0_pre2.ebuild 18652
-MD5 7d6f28f70034d87817939d447d40d39e baselayout-1.11.11-r3.ebuild 18759
-MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13 70
-MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
-MD5 f971d810119eb7f33deba5e540cab2e1 files/baselayout-1.11.12-is-net-fs.patch 903
+MD5 451f8ce496238c2fd0fa9fa2852ad16c baselayout-1.9.4-r7.ebuild 17999
+MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 39f2ec5e4ec39a2129af404f703c4e8b baselayout-1.12.0_pre3.ebuild 18709
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
+MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
 MD5 c530e98487e43a7bbbb779450f8dd94e files/baselayout-1.11.12-quote-EDITOR.patch 374
-MD5 ee24c3f2b233c4b4bb286e3fa8c833ed files/baselayout-1.11.12-exec-dev.patch 545
-MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
+MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
 MD5 6d37e93641eee6754b93dde3324ae23b files/baselayout-1.11.11-wpa_supplicant.patch 1223
+MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
+MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
-MD5 20fe0472e77985f46e07207e69acc328 files/digest-baselayout-1.12.0_pre2 75
-MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch 413
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
-MD5 2d89f41d8e2a27bb9c413ce38c5c95fb files/baselayout-1.11.12-profile.patch 1847
-MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
-MD5 9dea6001a08f1b04bb1b4be1dd78fb98 files/baselayout-1.12.0_pre1-r1.patch 18327
-MD5 6eb2326be0c7239278d3812bd8c941eb files/digest-baselayout-1.12.0_pre1-r1 75
 MD5 a08355653536117877945359de784f6b files/baselayout-1.11.10-iwconfig.patch 724
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
+MD5 333c983dc00cb352f4725cacc0378fea files/baselayout-1.11.10-bridge.patch 3547
 MD5 cac88e2e2f73778a4a4e79447d857c64 files/baselayout-1.11.12-swapon-quiet.patch 899
-MD5 8ab5b01cfcad4c79d822ff31296000be files/baselayout-1.11.12-ifconfig-cidr.patch 1740
+MD5 f69a22a2120638279fe6d5aa9aa8a835 files/digest-baselayout-1.12.0_pre3 75
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
+MD5 ba767b33145b4614cf9b760516c51895 files/digest-baselayout-1.11.12-r4 70
+MD5 e76b5eb42575a2c72397f4691f8e7826 files/baselayout-1.11.12-volume-order-etc-update.patch 628
+MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
+MD5 df9f21385df40467a0bff0b3d1e5285f files/baselayout-1.11.10-selinux-udev.patch 413
+MD5 f971d810119eb7f33deba5e540cab2e1 files/baselayout-1.11.12-is-net-fs.patch 903
+MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
 MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
+MD5 ee24c3f2b233c4b4bb286e3fa8c833ed files/baselayout-1.11.12-exec-dev.patch 545
+MD5 8ab5b01cfcad4c79d822ff31296000be files/baselayout-1.11.12-ifconfig-cidr.patch 1740
 MD5 50ccc6f432f5e941daec74f31f2d2a53 files/digest-baselayout-1.11.11-r3 70
-MD5 87842ac605d85289eba63ac1c2e16142 files/baselayout-1.11.10-wireless.patch 3215
-MD5 50816019be7cc03120fa58d075eb07f7 files/sysvinit-2.84-selinux1.patch 3612
+MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
 MD5 67882892030fed7383fe01d89f9539bd files/baselayout-1.11.12-runscript-boot.patch 670
-MD5 e76b5eb42575a2c72397f4691f8e7826 files/baselayout-1.11.12-volume-order-etc-update.patch 628
-MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
-MD5 ba767b33145b4614cf9b760516c51895 files/digest-baselayout-1.11.12-r4 70
-MD5 f96ffe6b44684809b8ec0e4450093f59 files/baselayout-1.11.10-iwconfig-2.patch 925
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC4WzsgIKl8Uu19MoRAgwGAJ4vPlm3i5B8OnWmsHAOLyS6mkuLPACcDkAL
-1o2durjnSbZsYZNJ/d5u2x8=
-=qLK/
------END PGP SIGNATURE-----
+MD5 2d89f41d8e2a27bb9c413ce38c5c95fb files/baselayout-1.11.12-profile.patch 1847
+MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13 70
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild
deleted file mode 100644
index da667ab14b8c..000000000000
--- a/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild
+++ /dev/null
@@ -1,595 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre1-r1.ebuild,v 1.5 2005/07/22 22:00:36 vapier 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/~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.84
-	!build? ( !bootstrap? (
-		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.0-r10
-		>=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}"
-
-	# Bring us up to SVN r1318 which fixes a fair few buglets
-	epatch "${FILESDIR}/${PN}-${PV}-r1.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
-
-	# 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() {
-	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 $(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 ;;
-		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
-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
-	# 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
-		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
-	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 -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 ${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
-}
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre3.ebuild
index edde3baf3f56..581fb5cbc5e9 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre3.ebuild
@@ -1,12 +1,13 @@
 # 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_pre2.ebuild,v 1.2 2005/07/22 22:00:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre3.ebuild,v 1.1 2005/07/29 11:22:48 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"
 
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_pre1-r1.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre1-r1.patch
deleted file mode 100644
index 1b568a866fca..000000000000
--- a/sys-apps/baselayout/files/baselayout-1.12.0_pre1-r1.patch
+++ /dev/null
@@ -1,516 +0,0 @@
-Index: lib/rcscripts/net.modules.d/system
-===================================================================
---- lib/rcscripts/net.modules.d/system	(revision 1296)
-+++ lib/rcscripts/net.modules.d/system	(working copy)
-@@ -2 +2 @@
--# Copyright (c) 2004-2005 Gentoo Foundation
-+# Copyright (c) 2005 Gentoo Foundation
-@@ -38 +38 @@
--    echo "dns_servers_$1 dns_domain_$1 dns_search_domains_$1 ntp_servers_$1 nis_domain_$1 nis_servers_$1"
-+    echo "dns_servers_$1 dns_domain_$1 dns_search_path_$1 ntp_servers_$1 nis_domain_$1 nis_servers_$1"
-@@ -60 +60 @@
--    eval x=\"\$\{dns_search_domains_${ifvar}\}\"
-+    eval x=\"\$\{dns_search_path_${ifvar}\}\"
-Index: lib/rcscripts/net.modules.d/pump
-===================================================================
---- lib/rcscripts/net.modules.d/pump	(revision 1296)
-+++ lib/rcscripts/net.modules.d/pump	(working copy)
-@@ -79 +79 @@
--    pump --release --keep-up --interface "${iface}"
-+    pump --release --interface "${iface}"
-@@ -91 +91 @@
--    local iface="$1" opts d ifvar=$( bash_variable "$1" )
-+    local iface="$1" opts d ifvar=$( bash_variable "$1" ) search
-@@ -103,0 +104,3 @@
-+    eval search=\"\$\{dns_search_path_${ifvar}\}\"
-+    [[ -n ${search} ]] && opts="${opts} --search-path='"${search}"'"
-+
-@@ -112 +115 @@
--    opts="${opts} --interface ${iface}"
-+    opts="${opts} --keep-up --interface ${iface}"
-@@ -122 +125 @@
--   
-+  
-Index: lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper
-===================================================================
---- lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper	(revision 1296)
-+++ lib/rcscripts/net.modules.d/helpers.d/dhcpcd-wrapper	(working copy)
-@@ -10,2 +9,0 @@
--service="net.${interface}"
--
-@@ -17,0 +16,30 @@
-+. /lib/rcscripts/net.modules.d/helpers.d/module-loader
-+
-+if [[ ${action} == "up" ]]; then
-+    # Map MAC address variables to interface variables
-+    macnet_pre_start "${interface}" 1>/dev/null
-+
-+    # Map wireless ESSID variables to interface variables
-+    if [[ -n ${wireless_module} ]]; then
-+	if wireless_check_extensions "${interface}" ; then
-+	    essidnet_pre_start "${interface}" 1>/dev/null
-+	fi
-+    fi
-+
-+    # Add any search paths if we have any defined
-+    ifvar=$( bash_variable "${interface}" )
-+    eval d=\" \$\{dhcp_${ifvar}\} \"
-+    [[ ${d} == "  " ]] && d=" ${dhcp} "
-+
-+    if [[ ${d} != *" nodns "* ]]; then
-+	eval search=\"\$\{dns_search_path_${ifvar}\}\"
-+	if [[ -n ${search} ]]; then
-+	    resolv="${statedir}/${interface}/resolv.conf"
-+	    tmp="${revolv}.$$"
-+	    egrep -v "^[ \t]*(search|domain)[ \t]*" "${resolv}" > "${tmp}"
-+	    echo "search ${search}" >> "${tmp}" 
-+	    mv "${tmp}" "${resolv}"
-+	fi
-+    fi
-+fi
-+
-Index: lib/rcscripts/net.modules.d/helpers.d/dhcp-state
-===================================================================
---- lib/rcscripts/net.modules.d/helpers.d/dhcp-state	(revision 1296)
-+++ lib/rcscripts/net.modules.d/helpers.d/dhcp-state	(working copy)
-@@ -2 +2 @@
--# Copyright (c) 2004-2005 Gentoo Foundation
-+# Copyright (c) 2005 Gentoo Foundation
-@@ -7 +7,5 @@
--. /lib/rcscripts/net.modules.d/helpers.d/module-loader
-+MODULES_DIR="/lib/rcscripts/net.modules.d"
-+. /lib/rcscripts/sh/rc-services.sh
-+. "${MODULES_DIR}/helpers.d/functions"
-+conf=$(add_suffix "/etc/conf.d/net")
-+[[ -e ${conf} ]] && source "${conf}"
-@@ -16,5 +20,2 @@
--    if [[ ${RC_AUTO_INTERFACE} == "yes" ]]; then
--	best_interface=$( select_best_interface )
--	apply_state "${best_interface}"
--    fi
--    exit 0
-+else
-+    ! service_stopping "${service}" && mark_service_started "${service}"
-@@ -23,8 +24,3 @@
--# Map MAC address variables to interface variables
--macnet_pre_start "${interface}" 1>/dev/null
--
--# Map wireless ESSID variables to interface variables
--if [[ -n ${wireless_module} ]]; then
--    if wireless_check_extensions "${interface}" ; then
--	essidnet_pre_start "${interface}" 1>/dev/null
--    fi
-+if [[ ${RC_AUTO_INTERFACE} == "yes" ]]; then
-+    best_interface=$( select_best_interface )
-+    apply_state "${best_interface}"
-@@ -32,22 +27,0 @@
--
--# Add any search domains if we have any defined
--ifvar=$( bash_variable "${interface}" )
--eval d=\" \$\{dhcp_${ifvar}\} \"
--[[ ${d} == "  " ]] && d=" ${dhcp} "
--
--if [[ ${d} != *" nodns "* ]]; then
--    eval search=\"\$\{dns_search_domains_${ifvar}\}\"
--    if [[ -n ${search} ]]; then
--        resolv="${statedir}/${interface}/resolv.conf"
--	tmp="${revolv}.$$"
--	egrep -v "^[ \t]*search" "${resolv}" > "${tmp}"
--	domain=$( sed -n -e 's/^[ \t]*domain[ \t]*\(.*\)[ \t]*.*/\1/p' ${tmp} )
--	echo "search ${domain} ${search}" >> "${tmp}" 
--	mv "${tmp}" "${resolv}"
--    fi
--fi
--
--! service_stopping "${service}" && mark_service_started "${service}"
--
--[[ ${RC_AUTO_INTERFACE} == "yes" ]] && interface=$( select_best_interface )
--apply_state "${interface}"
-Index: lib/rcscripts/net.modules.d/dhcpcd
-===================================================================
---- lib/rcscripts/net.modules.d/dhcpcd	(revision 1296)
-+++ lib/rcscripts/net.modules.d/dhcpcd	(working copy)
-@@ -147,0 +148,2 @@
-+    [[ ! -d "${statedir}/${iface}" ]] && mkdir -p "${statedir}/${iface}"
-+    
-Index: lib/rcscripts/net.modules.d/wpa_supplicant
-===================================================================
---- lib/rcscripts/net.modules.d/wpa_supplicant	(revision 1296)
-+++ lib/rcscripts/net.modules.d/wpa_supplicant	(working copy)
-@@ -39 +39 @@
--	${report} && eerror "For WPA support (wpa_supplicant) support, emerge net-wireless/wpa-supplicant"
-+	${report} && eerror "For WPA support (wpa_supplicant) support, emerge net-wireless/wpa_supplicant"
-@@ -181,0 +182,4 @@
-+
-+    # exit without error with wpa_supplicant-0.4.x as we may get kickstarted
-+    # when an AP comes in range
-+    ${action} && exit 0
-@@ -183 +187 @@
--    # We now need to kill the process
-+    # Kill wpa_supplicant for 0.3.x
-@@ -185,4 +188,0 @@
--
--    # We need to mark the service as stopped as we may be have been marked
--    # as inactive previously
--    ${action} && mark_service_stopped "net.${iface}"
-@@ -204 +204 @@
--	ESSID=$( wpa_supplicant_get_essid "$1" )
-+	ESSID=$( wpa_supplicant_get_essid "${iface}" )
-@@ -273 +273 @@
--	[[ ${RC_PARALLEL_STARTUP} == "yes" ]] && background=yes
-+	 [[ ${RC_PARALLEL_STARTUP} == "yes" ]] && background=no
-@@ -334,10 +333,0 @@
--# bool wpa_supplicant_pre_stop(char *iface)
--#
--# Gets the last set ESSID if we have one
--# We don't query for the current ESSID as it may have changed to another
--# one
--wpa_supplicant_pre_stop() {
--    ESSID=$( get_options "ESSID" )
--    ESSIDVAR=$( bash_variable "${ESSID}" )
--}	
--
-Index: lib/rcscripts/net.modules.d/iwconfig
-===================================================================
---- lib/rcscripts/net.modules.d/iwconfig	(revision 1296)
-+++ lib/rcscripts/net.modules.d/iwconfig	(working copy)
-@@ -906,10 +905,0 @@
--
--# bool iwconfig_pre_stop(char *iface)
--#
--# Gets the last set ESSID if we have one
--# We don't query for the current ESSID as it may have changed to another
--# one
--iwconfig_pre_stop() {
--    ESSID=$( get_options "ESSID" )
--    ESSIDVAR=$( bash_variable "${ESSID}" )
--}
-Index: lib/rcscripts/net.modules.d/macnet
-===================================================================
---- lib/rcscripts/net.modules.d/macnet	(revision 1296)
-+++ lib/rcscripts/net.modules.d/macnet	(working copy)
-@@ -2 +2 @@
--# Copyright (c) 2004-2005 Gentoo Foundation
-+# Copyright (c) 2005 Gentoo Foundation
-@@ -56,0 +57,4 @@
-+    # We need to bring the interface up for some interfaces, otherwise the MAC
-+    # address isn't consistent - mainly wireless cards with firmware uploading.
-+    interface_up "${iface}"
-+
-Index: lib/rcscripts/net.modules.d/rename
-===================================================================
---- lib/rcscripts/net.modules.d/rename	(revision 1296)
-+++ lib/rcscripts/net.modules.d/rename	(working copy)
-@@ -2 +2 @@
--# Copyright (c) 2004-2005 Gentoo Foundation
-+# Copyright (c) 2005 Gentoo Foundation
-@@ -18 +18,2 @@
--    before macchanger interface
-+    after macchanger macnet
-+    before wireless interface
-@@ -34,0 +36,8 @@
-+# char* rename_get_vars(char *interface)
-+#
-+# Returns a string spaced with possible user set
-+# configuration variables
-+rename_get_vars() {
-+    echo "rename_$1"
-+}
-+
-@@ -42,4 +51,2 @@
--    
--    mac=$( interface_get_mac_address "${iface}" )
--    eval newname=\"\$\{rename_${mac//:/}\}\"
--    [[ -z ${newname} ]] && eval newname=\"\$\{rename_${ifvar}\}\"
-+
-+    eval newname=\"\$\{rename_${ifvar}\}\"
-@@ -47,0 +55,10 @@
-+    # We cannot rename vlan interfaces as /proc/net/vlan/config always
-+    # returns the old interface name. We don't bail out though as it's
-+    # not critical that the interface gets renamed.
-+    if [[ -d /proc/net/vlan/config ]] ; then
-+	if grep -q "^eth0.2 " /proc/net/vlan/config ; then
-+	    eerror "Cannot rename VLAN interfaces"
-+	    return 0
-+	fi
-+    fi
-+    
-Index: etc/conf.d/wireless.example
-===================================================================
---- etc/conf.d/wireless.example	(revision 1296)
-+++ etc/conf.d/wireless.example	(working copy)
-@@ -172 +172 @@
--#dns_search_domains_ESSID="search.this.domain search.that.domain"
-+#dns_search_path_ESSID="search.this.domain search.that.domain"
-Index: etc/conf.d/net.example
-===================================================================
---- etc/conf.d/net.example	(revision 1296)
-+++ etc/conf.d/net.example	(working copy)
-@@ -188,3 +188,3 @@
--#nameservers_ESSID=( "192.168.0.1" "192.168.0.2" )
--#domain_ESSID="some.domain"
--#searchdomains_ESSID="search.this.domain search.that.domain"
-+#dns_servers_ESSID=( "192.168.0.1" "192.168.0.2" )
-+#dns_domain_ESSID="some.domain"
-+#dns_search_path_ESSID="search.this.domain search.that.domain"
-@@ -192,2 +192 @@
--# as domain and search (searchdomains) are mutually exclusive and
--# searchdomains takes precedence
-+# as domain and search are mutually exclusive.
-@@ -201 +200 @@
--#mac_nameservers_001122334455=( "192.168.0.1" "192.168.0.2" )
-+#mac_dns_servers_001122334455=( "192.168.0.1" "192.168.0.2" )
-@@ -437 +436 @@
--# dns_search_domains_eth0="this.domain that.domain"
-+# dns_search_path_eth0="this.domain that.domain"
-Index: init.d/net.lo
-===================================================================
---- init.d/net.lo	(revision 1296)
-+++ init.d/net.lo	(working copy)
-@@ -785,0 +786,5 @@
-+    # Load our ESSID variable so users can use it in predown() instead
-+    # of having to write code.
-+    local ESSID=$( get_options "ESSID" ) ESSIDVAR
-+    [[ -n ${ESSID} ]] && ESSIDVAR=$( bash_variable "${ESSID}" )
-+
-Index: init.d/modules
-===================================================================
---- init.d/modules	(revision 1296)
-+++ init.d/modules	(working copy)
-@@ -79,7 +78,0 @@
--	# Here we should fail, as a modular kernel do need
--	# depmod command ...
--	if [[ ! -x /sbin/depmod ]]; then
--		eerror "ERROR:  system is missing /sbin/depmod !"
--		return 1
--	fi
--
-@@ -88,2 +81,3 @@
--	if [[ -z "${CDBOOT}" ]] && [[ $(get_KV) -lt $(KV_to_int '2.5.48') || \
--	     -x /sbin/modprobe.old ]] && [[ ! -e /etc/modules.conf ]] ; then
-+	if [[ -z "${CDBOOT}" ]] && [[ ! -e /etc/modules.conf ]] && \
-+	   [[ $(get_KV) -lt $(KV_to_int '2.5.48') || -x /sbin/modprobe.old ]]
-+	then
-@@ -97,2 +91,3 @@
--	if [[ -z "${CDBOOT}" ]] && [[ -f /etc/modules.conf || \
--	      $(get_KV) -ge $(KV_to_int '2.5.48') ]]; then
-+	if [[ -z "${CDBOOT}" ]] && \
-+	   [[ -f /etc/modules.conf || $(get_KV) -ge $(KV_to_int '2.5.48') ]]
-+	then
-@@ -120 +115 @@
--	[[ -n $(modprobe -l -t boot) ]] && modprobe -a -t boot \*  &>/dev/null
-+	[[ -n $(modprobe -l -t boot) ]] && modprobe -a -t boot \* &>/dev/null
-Index: init.d/keymaps
-===================================================================
---- init.d/keymaps	(revision 1296)
-+++ init.d/keymaps	(working copy)
-@@ -37 +37,5 @@
--	# New kbd support.
-+	# Turn on unicode if user wants it
-+	if [[ ${UNICODE} == "yes" ]] ; then
-+		/usr/bin/kbd_mode -u
-+	fi
-+
-@@ -56 +59,0 @@
--		/usr/bin/kbd_mode -u
-Index: ChangeLog
-===================================================================
---- ChangeLog	(revision 1296)
-+++ ChangeLog	(working copy)
-@@ -3,0 +4,28 @@
-+  19 Jul 2005; Roy Marples <uberlord@gentoo.org>:
-+
-+    ${ESSID} and ${ESSIDVAR} are now available in predown() - fixes #99106
-+
-+  18 Jul 2005; Roy Marples <uberlord@gentoo.org>:
-+
-+    Changed wpa-supplicant to wpa_supplicant when reporting that it is not
-+    installed. Fixes #99381
-+
-+    Fixed some startup problems caused by a mixture of inactive +
-+    begin_service/end_service functions.
-+
-+  16 Jul 2005; Martin Schlemmer <azarah@gentoo.org>:
-+
-+    Add Darwin support for start-stop-daemon, bug #82421.
-+
-+  15 Jul 2005; Martin Schlemmer <azarah@gentoo.org>:
-+
-+    Do not run depmod in modules-update if System.map is missing, bug #59188.
-+
-+  14 Jul 2005; Mike Frysinger <vapier@gentoo.org>:
-+
-+    Remove pointless check of depmod existence in modules init.d since the 
-+    modules-update script checks for it.
-+
-+    Run kbd_mode earlier for unicode users so initial loadkeys doesn't 
-+    trigger a warning #94048 by Eugene Pavlovsky.
-+
-Index: src/start-stop-daemon.c
-===================================================================
---- src/start-stop-daemon.c	(revision 1296)
-+++ src/start-stop-daemon.c	(working copy)
-@@ -30,0 +31,3 @@
-+ * Updated by Kito <kito@gentoo.org>:
-+ *   Add support for Darwin, additional patches from opendarwin.org
-+ * 	 fix for Gentoo bug 72145 from eldad@gentoo.org
-@@ -54,0 +58,2 @@
-+#elif defined(__APPLE__)
-+#  define OSDarwin
-@@ -66 +71 @@
--#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
-+#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
-@@ -707 +712,2 @@
--#elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD)
-+		return;
-+#elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
-@@ -710 +715,0 @@
--#endif
-@@ -711,0 +717 @@
-+#endif
-@@ -893,0 +900,17 @@
-+#if defined(OSDarwin)
-+int
-+pid_is_user(pid_t pid, uid_t uid)
-+{
-+	int mib[4];
-+	size_t size;
-+	struct kinfo_proc ki;
-+
-+	size = sizeof(ki);
-+	mib[0] = CTL_KERN;
-+	mib[1] = KERN_PROC;
-+	mib[2] = KERN_PROC_PID;
-+	mib[3] = pid;
-+	if (sysctl(mib, 4, &ki, &size, NULL, 0) < 0)
-+		errx(1, "%s", "Failure calling sysctl");
-+	return (uid == ki.kp_eproc.e_pcred.p_ruid);
-+}
-@@ -894,0 +918,54 @@
-+static int
-+pid_is_cmd(pid_t pid, const char *name)
-+{
-+	int mib[4];
-+	size_t size;
-+	struct kinfo_proc ki;
-+	
-+	size = sizeof(ki);
-+	mib[0] = CTL_KERN;
-+	mib[1] = KERN_PROC;
-+	mib[2] = KERN_PROC_PID;
-+	mib[3] = pid;
-+	if (sysctl(mib, 4, &ki, &size, NULL, 0) < 0)
-+		errx(1, "%s", "Failure calling sysctl");
-+	return (!strncmp(name, ki.kp_proc.p_comm, MAXCOMLEN));
-+}
-+
-+static void
-+do_procinit(void)
-+{
-+	int mib[3];
-+	size_t size;
-+	int nprocs, ret, i;
-+	struct kinfo_proc *procs = NULL, *newprocs;
-+	
-+	mib[0] = CTL_KERN;
-+	mib[1] = KERN_PROC;
-+	mib[2] = KERN_PROC_ALL;
-+	ret = sysctl(mib, 3, NULL, &size, NULL, 0);
-+	/* Allocate enough memory for entire process table */
-+	do {
-+		size += size / 10;
-+		newprocs = realloc(procs, size);
-+		if (newprocs == NULL) {
-+			if (procs)
-+				free(procs);
-+			errx(1, "%s", "Could not reallocate memory");
-+		}
-+		procs = newprocs;
-+		ret = sysctl(mib, 3, procs, &size, NULL, 0);
-+	} while (ret >= 0 && errno == ENOMEM);
-+
-+	if (ret < 0)
-+		errx(1, "%s", "Failure calling sysctl");
-+
-+	/* Verify size of proc structure */
-+	if (size % sizeof(struct kinfo_proc) != 0)
-+		errx(1, "%s", "proc size mismatch, userland out of sync with kernel");
-+	nprocs = size / sizeof(struct kinfo_proc);
-+	for (i = 0; i < nprocs; i++) {
-+		check(procs[i].kp_proc.p_pid);
-+	}
-+}
-+#endif /* OSDarwin */
-Index: sbin/runscript.sh
-===================================================================
---- sbin/runscript.sh	(revision 1296)
-+++ sbin/runscript.sh	(working copy)
-@@ -257 +257,6 @@
--	if ! service_inactive "${myservice}" ; then
-+	if service_inactive "${myservice}" ; then
-+		if [[ ${IN_BACKGROUND} != "true" ]] ; then
-+			ewarn "WARNING: \"${myservice}\" has already been started."
-+			return 0
-+		fi
-+	else
-@@ -296 +301,2 @@
--				start_service "${mynetservice}"
-+				if ! service_inactive "${mynetservice}" ; then
-+					start_service "${mynetservice}"
-@@ -298,7 +304,8 @@
--				# A 'need' dependency is critical for startup
--				if [[ $? != 0 ]] && ineed -t "${myservice}" "${x}" >/dev/null ; then
--					# Only worry about a net.* service if we do not have one
--					# up and running already, or if RC_NET_STRICT_CHECKING
--					# is set ....
--					if ! is_net_up ; then
--						startfail="yes"
-+					# A 'need' dependency is critical for startup
-+					if [[ $? != 0 ]] && ineed -t "${myservice}" "${x}" >/dev/null ; then
-+						# Only worry about a net.* service if we do not have one
-+						# up and running already, or if RC_NET_STRICT_CHECKING
-+						# is set ....
-+						if ! is_net_up ; then
-+							startfail="yes"
-+						fi
-@@ -309 +316,2 @@
--			start_service "${x}"
-+			if ! service_inactive "{x}"; then
-+				start_service "${x}"
-@@ -311,3 +319,4 @@
--			# A 'need' dependacy is critical for startup
--			if [[ $? != 0 ]] && ineed -t "${myservice}" "${x}" >/dev/null ; then
--				startfail="yes"
-+				# A 'need' dependacy is critical for startup
-+				if [[ $? != 0 ]] && ineed -t "${myservice}" "${x}" >/dev/null ; then
-+					startfail="yes"
-+				fi
-@@ -397,0 +407 @@
-+	end_service "${myservice}" "${retval}"
-Index: sbin/rc
-===================================================================
---- sbin/rc	(revision 1296)
-+++ sbin/rc	(working copy)
-@@ -830,2 +830 @@
--	service_started "${myservice}" || \
--		schedule_service_startup "${myservice}"
-+	service_stopped "${myservice}" && schedule_service_startup "${myservice}"
-Index: sbin/modules-update
-===================================================================
---- sbin/modules-update	(revision 1296)
-+++ sbin/modules-update	(working copy)
-@@ -233 +233 @@
--			depmod -a ${KV}
-+			ewarn "System.map not found - unable to check symbols"
-Index: sbin/rc-services.sh
-===================================================================
---- sbin/rc-services.sh	(revision 1296)
-+++ sbin/rc-services.sh	(working copy)
-@@ -383 +382,0 @@
--		! service_inactive && end_service "${service}" "${retval}"
-@@ -391 +389,0 @@
--		! service_inactive && end_service "${service}" "${retval}"
-@@ -455 +452,0 @@
--	echo "0" > "${svcdir}/exitcodes/$1"
-@@ -472 +468,0 @@
--	echo "0" > "${svcdir}/exitcodes/$1"
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre3 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre3
new file mode 100644
index 000000000000..b6d2b1c9db22
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre3
@@ -0,0 +1 @@
+MD5 97178263665d10775d8d6695e0720d63 baselayout-1.12.0_pre3.tar.bz2 169107