We now depend on >=app-shells/bash-3.1_p7

(Portage version: 2.1_pre4-r1)

8 files changed, 70 insertions, 636 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 4a08eb75b786..e5fe0c7a6f16 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,15 @@
 # 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.302 2006/01/25 17:18:18 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.303 2006/02/14 12:48:24 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
 
+  14 Feb 2006; Roy Marples <uberlord@gentoo.org>
+  baselayout-1.12.0_pre13-r1.ebuild, -baselayout-1.12.0_pre15.ebuild,
+  baselayout-1.12.0_pre15-r1.ebuild:
+  We now depend on >=app-shells/bash-3.1_p7
+
 *baselayout-1.11.14-r3 (25 Jan 2006)
 
   25 Jan 2006; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 7242bbdc8566..ea94b343fc35 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,37 +1,75 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 75d301f51267719488efb4cf4b6f8672 ChangeLog 69075
+MD5 0031f53c7849cff0a8ef5a642bbaaf17 ChangeLog 69276
+RMD160 e47e20b4cf543610c89116dd211c9bb9d0fa81a9 ChangeLog 69276
+SHA256 dc2e05831268ec9a8257c421a3ce118e6a48255ecf07b6f1b231001dc46901b4 ChangeLog 69276
 MD5 8bd6dd1987c5333b1c1cf227a296bd76 baselayout-1.11.13-r1.ebuild 18944
+RMD160 2cfb5f3f9fac3611fc1cd5df78fe1a22b3ffa7ab baselayout-1.11.13-r1.ebuild 18944
+SHA256 2dff28182cbc93e4b1b2207087bf1c3e020715e45b7d41fb23f1a8744a672f57 baselayout-1.11.13-r1.ebuild 18944
 MD5 22a10db577b1b646d12ba31ed7b77a6c baselayout-1.11.13-r2.ebuild 19014
+RMD160 3d1348291157e3f973f4ad16e4f222fd32645593 baselayout-1.11.13-r2.ebuild 19014
+SHA256 236d09bf8aed1a3f73c26bdb287957a21212646ecb6eec21abaafa9ef6e3b2ef baselayout-1.11.13-r2.ebuild 19014
 MD5 f766cf82a790fd41852625508323d341 baselayout-1.11.14-r1.ebuild 19085
+RMD160 0158e593067ecea1dc8e989082d0dc6c3de0c2bb baselayout-1.11.14-r1.ebuild 19085
+SHA256 86fc0c637b9c47cfe5362de110b0e56f0a5419bafad6ce4ec856bf76079ab0c6 baselayout-1.11.14-r1.ebuild 19085
 MD5 f948b3c2c635db77512589bb3062238b baselayout-1.11.14-r2.ebuild 19133
+RMD160 9fbb30e8c47bead968478263689bcdb70aa29c0b baselayout-1.11.14-r2.ebuild 19133
+SHA256 c0e993ca67f68ea923ee361bd7b1205e870974413d4976a8566e172d1bc060e4 baselayout-1.11.14-r2.ebuild 19133
 MD5 0a68869598188f35025aada57e54bcdd baselayout-1.11.14-r3.ebuild 19171
+RMD160 830428af7654afc7e3c504569149910d38a30850 baselayout-1.11.14-r3.ebuild 19171
+SHA256 d654f531b014cf03d0075547b933ecfc1e8d0971abd31cf8b94e1491ab62d170 baselayout-1.11.14-r3.ebuild 19171
 MD5 83b799404d491c3b9e95a2665921f53f baselayout-1.11.14.ebuild 19039
-MD5 37705358669d6569de60a9edaf43debd baselayout-1.12.0_pre13-r1.ebuild 19333
-MD5 43cc59dc37e019ea45c484cd2b2d1a31 baselayout-1.12.0_pre15-r1.ebuild 19391
-MD5 f54f0df8f2da3275e07c9d9cf0b3e882 baselayout-1.12.0_pre15.ebuild 19289
+RMD160 113bc3c6f4484926ed4efbd3dc2821a34f84ddea baselayout-1.11.14.ebuild 19039
+SHA256 a619c8f48fd78a158a16b5e34dbc994a27773d4ad6f6f48d00cfd580745c6316 baselayout-1.11.14.ebuild 19039
+MD5 647f9e42dd55634b1e3044672aa0bf69 baselayout-1.12.0_pre13-r1.ebuild 19332
+RMD160 5f52927485e2878e915f17699ea30e9a4c62d842 baselayout-1.12.0_pre13-r1.ebuild 19332
+SHA256 87cca31d8476efa2210f2e64b60e1b11b19c034833c95123f14b82ce2c764948 baselayout-1.12.0_pre13-r1.ebuild 19332
+MD5 6b1d53d6354aa25e0a88b00574458dc0 baselayout-1.12.0_pre15-r1.ebuild 19390
+RMD160 78109f162c6ca3e0e238787cc6be99e87b68924e baselayout-1.12.0_pre15-r1.ebuild 19390
+SHA256 0a2701ffdd1fb8f5f8cead79059969877e8e51f5cd663cf38c1cd0e7901da460 baselayout-1.12.0_pre15-r1.ebuild 19390
 MD5 8d10a229861f862fca52cd8e3bc655d9 files/baselayout-1.11.0-split-out-udev.patch 7413
+RMD160 48eef541397ec0a21230de93518eed8a1ea63c16 files/baselayout-1.11.0-split-out-udev.patch 7413
+SHA256 397221c066cbbb65d572df431b4babde766dc92d9177005e522e0df8faa25030 files/baselayout-1.11.0-split-out-udev.patch 7413
 MD5 ec29ba4690f7c58a8d562195bc9eed42 files/baselayout-1.11.14-adsl.patch 501
+RMD160 81db918f622eba2eef3f76e0441023998b367d3f files/baselayout-1.11.14-adsl.patch 501
+SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8 files/baselayout-1.11.14-adsl.patch 501
 MD5 ab0d5a169769126f5c9d679a86244ee2 files/baselayout-1.11.14-essidnet.patch 619
+RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e files/baselayout-1.11.14-essidnet.patch 619
+SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b files/baselayout-1.11.14-essidnet.patch 619
 MD5 34964dc9fff04e8eaa948a9a60185e94 files/baselayout-1.11.14-udev-sysinit.patch 1097
+RMD160 533a2f4fb62eb1371413c120048b7f70a58fd41e files/baselayout-1.11.14-udev-sysinit.patch 1097
+SHA256 3bdaae5c1ce59856f77b57e8312a369b61fe1f3cbb17993454a699ea7703e0a6 files/baselayout-1.11.14-udev-sysinit.patch 1097
 MD5 8ea4c9d04ce5657625cf371ee8c055be files/baselayout-1.12.0_pre13-iproute2.patch 598
+RMD160 722515a13ff899c873bb22669ad8476c59af998a files/baselayout-1.12.0_pre13-iproute2.patch 598
+SHA256 d270f9e1900d1abb2b32e8295783b2f868454dfb8c12869e2964f24e17cf5010 files/baselayout-1.12.0_pre13-iproute2.patch 598
 MD5 36914006cc61a9d746502b7d85b4cb8b files/baselayout-1.12.0_pre15-1839.patch 2432
+RMD160 0abfd7c9375d8077408a425d4afa2986d4893896 files/baselayout-1.12.0_pre15-1839.patch 2432
+SHA256 0f03ec0c1b5bf8b46b990c30054f2903bca6cb58ddbd8449735399404d7a71fa files/baselayout-1.12.0_pre15-1839.patch 2432
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
+RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
+SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
 MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13-r1 70
+RMD160 48200b2167134f7ffe7373f392ae916adbaff088 files/digest-baselayout-1.11.13-r1 70
+SHA256 8be386254cdb00a3903244c63173c6f59df705f561d5e8c9e3865614baa84919 files/digest-baselayout-1.11.13-r1 70
 MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13-r2 70
+RMD160 48200b2167134f7ffe7373f392ae916adbaff088 files/digest-baselayout-1.11.13-r2 70
+SHA256 8be386254cdb00a3903244c63173c6f59df705f561d5e8c9e3865614baa84919 files/digest-baselayout-1.11.13-r2 70
 MD5 6d158e9a0e9b32c05e6633a68b39b4cc files/digest-baselayout-1.11.14 70
+RMD160 46c07fa01d82a73a31fb29a3c15584a93d7917e3 files/digest-baselayout-1.11.14 70
+SHA256 ec698c106288e0a5dbc32b961ff0fb6fdc0c0647bb529eee47e1c3230cb2d94f files/digest-baselayout-1.11.14 70
 MD5 6d158e9a0e9b32c05e6633a68b39b4cc files/digest-baselayout-1.11.14-r1 70
+RMD160 46c07fa01d82a73a31fb29a3c15584a93d7917e3 files/digest-baselayout-1.11.14-r1 70
+SHA256 ec698c106288e0a5dbc32b961ff0fb6fdc0c0647bb529eee47e1c3230cb2d94f files/digest-baselayout-1.11.14-r1 70
 MD5 6d158e9a0e9b32c05e6633a68b39b4cc files/digest-baselayout-1.11.14-r2 70
+RMD160 46c07fa01d82a73a31fb29a3c15584a93d7917e3 files/digest-baselayout-1.11.14-r2 70
+SHA256 ec698c106288e0a5dbc32b961ff0fb6fdc0c0647bb529eee47e1c3230cb2d94f files/digest-baselayout-1.11.14-r2 70
 MD5 6d158e9a0e9b32c05e6633a68b39b4cc files/digest-baselayout-1.11.14-r3 70
-MD5 2c06dc3a42153a5b07bab75e0337f0be files/digest-baselayout-1.12.0_pre13-r1 76
-MD5 2629fa7eb55e4f72024f4e46e7b2714b files/digest-baselayout-1.12.0_pre15 76
-MD5 2629fa7eb55e4f72024f4e46e7b2714b files/digest-baselayout-1.12.0_pre15-r1 76
+RMD160 46c07fa01d82a73a31fb29a3c15584a93d7917e3 files/digest-baselayout-1.11.14-r3 70
+SHA256 ec698c106288e0a5dbc32b961ff0fb6fdc0c0647bb529eee47e1c3230cb2d94f files/digest-baselayout-1.11.14-r3 70
+MD5 a65d49ca9a3a16bf744aebc2180cc299 files/digest-baselayout-1.12.0_pre13-r1 274
+RMD160 a3b004639a949ac82a707e3413b23eb96bf0587b files/digest-baselayout-1.12.0_pre13-r1 274
+SHA256 536181e6af76b11cbe6d8f612c6438482a9e0cbfb59b7280c5a6011c3e411219 files/digest-baselayout-1.12.0_pre13-r1 274
+MD5 ba4752adfc475828b3adc88338133130 files/digest-baselayout-1.12.0_pre15-r1 274
+RMD160 89085f7874bfd4be9ab48a7ce6c7e8b843aed1e9 files/digest-baselayout-1.12.0_pre15-r1 274
+SHA256 e47055f8bac04c7175c39daa659fa48f87a8f0e1d46519325cda7592efbbea20 files/digest-baselayout-1.12.0_pre15-r1 274
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD17LpEbVyYKaZ/NERAsENAKCFGt3ajIaelidMrIPh3fYC+ofqcgCeLvW5
-IsibtmrHKXMwX11HlJRIrGM=
-=BJM7
------END PGP SIGNATURE-----
+RMD160 99e2546d3cc014ca5af909b5adb2f43693664bad metadata.xml 385
+SHA256 fbd7e4a5615d68c8d6f9438136dd18e41c43b393a9c00b0bea12661d790441e1 metadata.xml 385
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild
index cf28d46d5353..0f854f968b66 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_pre13-r1.ebuild,v 1.4 2006/01/17 00:35:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild,v 1.5 2006/02/14 12:48:24 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -22,7 +22,7 @@ IUSE="bootstrap build static unicode"
 RDEPEND=">=sys-apps/sysvinit-2.86-r3
 	!build? ( !bootstrap? (
 		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.0-r10
+		>=app-shells/bash-3.1_p7
 		>=sys-apps/coreutils-5.2.1
 	) )"
 DEPEND="virtual/os-headers
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre15-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre15-r1.ebuild
index d0adb787fa6e..adc492d62b9e 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre15-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre15-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_pre15-r1.ebuild,v 1.1 2006/01/24 22:16:37 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre15-r1.ebuild,v 1.2 2006/02/14 12:48:24 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -22,7 +22,7 @@ IUSE="bootstrap build static unicode"
 RDEPEND=">=sys-apps/sysvinit-2.86-r3
 	!build? ( !bootstrap? (
 		>=sys-libs/readline-5.0-r1
-		>=app-shells/bash-3.0-r10
+		>=app-shells/bash-3.1_p7
 		>=sys-apps/coreutils-5.2.1
 	) )"
 DEPEND="virtual/os-headers
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre15.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre15.ebuild
deleted file mode 100644
index 5bce25865bed..000000000000
--- a/sys-apps/baselayout/baselayout-1.12.0_pre15.ebuild
+++ /dev/null
@@ -1,612 +0,0 @@
-# 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_pre15.ebuild,v 1.1 2006/01/20 10:35:24 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.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}"
-
-	# 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 ;;
-		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.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 /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.modules.d ${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
-
-	# 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 /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/files/digest-baselayout-1.12.0_pre13-r1 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre13-r1
index 81f156abf3cd..7956aed2092e 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre13-r1
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre13-r1
@@ -1 +1,3 @@
-MD5 ad7fd817722a33d4d53d16a22b2869ad baselayout-1.12.0_pre13.tar.bz2 211300
+MD5 5da63f08b0a0fbf38dd5b1eeee60e7a8 baselayout-1.12.0_pre13.tar.bz2 212505
+RMD160 a453a84fd9d08d9eca20a787b9efe036624d6fe0 baselayout-1.12.0_pre13.tar.bz2 212505
+SHA256 a3e21454dbaf246042706e4d36cf107ebdc24fbfe64b716b30b94b309b70c9ee baselayout-1.12.0_pre13.tar.bz2 212505
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre15 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre15
deleted file mode 100644
index be5c68961f3a..000000000000
--- a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51ef8ea7d375af1336245db1c7ed4220 baselayout-1.12.0_pre15.tar.bz2 213087
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre15-r1 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre15-r1
index be5c68961f3a..4b74e411d912 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre15-r1
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre15-r1
@@ -1 +1,3 @@
 MD5 51ef8ea7d375af1336245db1c7ed4220 baselayout-1.12.0_pre15.tar.bz2 213087
+RMD160 ea2bc93fb29c99eb89281ae700d16affc784c5a7 baselayout-1.12.0_pre15.tar.bz2 213087
+SHA256 1af27abccc0f44c5a603921ee1232d08165a05eafad56e01ddaaddd7948b2576 baselayout-1.12.0_pre15.tar.bz2 213087