Push out a patch to work with different style of kernel version names,

  #177197.

Package-Manager: portage-2.1.2.7

6 files changed, 336 insertions, 12 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 02223dbf5668..0ef423d7d1b6 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,18 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.415 2007/05/05 11:52:54 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.416 2007/05/08 08:57:03 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+*baselayout-2.0.0_alpha2-r1 (08 May 2007)
+
+  08 May 2007; Roy Marples <uberlord@gentoo.org>
+  +files/baselayout-2.0.0_alpha2-kver.patch,
+  +baselayout-2.0.0_alpha2-r1.ebuild:
+  Push out a patch to work with different style of kernel version names,
+  #177197.
+
   05 May 2007; Roy Marples <uberlord@gentoo.org>
   baselayout-2.0.0_alpha2.ebuild:
   Stop installing non existant volume init script and indicate that deprecated
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 834b5307f896..8984d854e129 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -14,13 +14,17 @@ AUX baselayout-1.12.9-wireless-deprecate.patch 664 RMD160 9bcd7f2b7e0f104e3345cc
 MD5 65436e2104eb96e5153bac819bbe4f11 files/baselayout-1.12.9-wireless-deprecate.patch 664
 RMD160 9bcd7f2b7e0f104e3345cc018b3f0861e3c69c8d files/baselayout-1.12.9-wireless-deprecate.patch 664
 SHA256 2ebf280db2954783a55f1045cf5f9b2100dd257f7b34d0ad5664bc1ee286886e files/baselayout-1.12.9-wireless-deprecate.patch 664
+AUX baselayout-2.0.0_alpha2-kver.patch 571 RMD160 a7a41a3b40c732b54434da6a253ab6795f080d28 SHA1 9b9ae01f731f61cbdb8291341668732fc5f86a98 SHA256 4eff5bb65bd416e8056f8cb716ef3aa87fae91e25405de720b4e933c16df72b3
+MD5 880983511a7b27eaffe31c0741888ae9 files/baselayout-2.0.0_alpha2-kver.patch 571
+RMD160 a7a41a3b40c732b54434da6a253ab6795f080d28 files/baselayout-2.0.0_alpha2-kver.patch 571
+SHA256 4eff5bb65bd416e8056f8cb716ef3aa87fae91e25405de720b4e933c16df72b3 files/baselayout-2.0.0_alpha2-kver.patch 571
 AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783cc637392429ba2f63d321873fa1526ee SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
 DIST baselayout-1.12.10.tar.bz2 218940 RMD160 e499c08af4d73d43c2e354febbf09e48916ac24c SHA1 306090e733eaf059d0849291d6327f7ea9bae5cc SHA256 1d64cdb9cc42bca7a8eec4045ad0e7e8cafba1d6c3f92b377bc7f6f7ee668674
 DIST baselayout-1.12.9.tar.bz2 218939 RMD160 c80a3e4434bd8ce58c89ab1b988b64c012741d00 SHA1 0e5745d95412db3427961c5f796827f7867aa35b SHA256 ab89a131d0a12fa8b411189fb51b15216c3f27a422ff539767eb0d134e40dd94
-DIST baselayout-1.13.0_alpha12.tar.bz2 128921 RMD160 894f7994fd71ce588e8f314825aeedd02badf276 SHA1 4f4dfe6078ee5d71ca1aa107746118cfb64d8a1c SHA256 0f70c7a0e5bc561b76b275c07fa19003d54bced10fd739602c87b258310b6a96
+DIST baselayout-1.13.0_alpha12.tar.bz2 230982 RMD160 6401629eeb92b13eb2bfbdc7f268d45ee7ed2f51 SHA1 a565b934427e0ba8eb41869fb6b30f294198a2b2 SHA256 3b6214eb02e2549a19f2e40a71eee65981c9c9758a327d6bef128e734c47e054
 DIST baselayout-2.0.0_alpha1.tar.bz2 128006 RMD160 71da0cdbc4c870736caba7b3c7b7afe5b413eb54 SHA1 d975c51dfb845926fd450501a15a0c7938bb0d11 SHA256 bb740d967e136e35958a5e64bca777ef16b3f29194a477fc2368aa8b8fab2193
 DIST baselayout-2.0.0_alpha2.tar.bz2 132406 RMD160 259b52abf8d706338ba99fded89c503bfeee807b SHA1 13f42355ce659582e6f23a691f6cf26188987ea0 SHA256 7e0b9df754bf55fffa25a112d328a3a37d43425daf94ee48ce80cab34a3df98c
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
@@ -44,14 +48,18 @@ EBUILD baselayout-2.0.0_alpha1.ebuild 9885 RMD160 71826b60c5c4e2d935aaa2ae242243
 MD5 7e688c4c9e7d0f0eca4a807ce48bab87 baselayout-2.0.0_alpha1.ebuild 9885
 RMD160 71826b60c5c4e2d935aaa2ae2422434904334ce7 baselayout-2.0.0_alpha1.ebuild 9885
 SHA256 a34392945db74798fbf33da8218cd93f073d98e86992444f79731c62a67e3a45 baselayout-2.0.0_alpha1.ebuild 9885
+EBUILD baselayout-2.0.0_alpha2-r1.ebuild 9717 RMD160 cc62cd0a7b45e3cac2fa5bd44f8bfa5b23853a29 SHA1 06b2900f9f8d554008085c93d6d875d32c36d7ae SHA256 fb97119f02159e70f0ab85f9c30489ef47dd2aa1cb20187d25adfa97273bc7b4
+MD5 b1c3c33e8d1dce41bd086a2de6cc6758 baselayout-2.0.0_alpha2-r1.ebuild 9717
+RMD160 cc62cd0a7b45e3cac2fa5bd44f8bfa5b23853a29 baselayout-2.0.0_alpha2-r1.ebuild 9717
+SHA256 fb97119f02159e70f0ab85f9c30489ef47dd2aa1cb20187d25adfa97273bc7b4 baselayout-2.0.0_alpha2-r1.ebuild 9717
 EBUILD baselayout-2.0.0_alpha2.ebuild 9625 RMD160 e22cdc66da8761f7889356d92e28f65aad1f6f8a SHA1 7a62e8cabb45cac1282aa6531d54eb42b6fc90e0 SHA256 91808fa06202319d8eca3353667d4d8f09b44c68d169a656b69277f04b274fd6
 MD5 ea70a675b0488c8c12169ce523f05ba5 baselayout-2.0.0_alpha2.ebuild 9625
 RMD160 e22cdc66da8761f7889356d92e28f65aad1f6f8a baselayout-2.0.0_alpha2.ebuild 9625
 SHA256 91808fa06202319d8eca3353667d4d8f09b44c68d169a656b69277f04b274fd6 baselayout-2.0.0_alpha2.ebuild 9625
-MISC ChangeLog 92714 RMD160 ac2bf3cd12532e7984dfee63fb016efe33da86f6 SHA1 5d84dd90ac2b987f112166a2a65ff23278d27f09 SHA256 574e802ece4e64f451b27175cce291e22abdcb8b8823c0bcd2c3333f33efb5f7
-MD5 afbc7081858ef4b9e89327e3c8f03223 ChangeLog 92714
-RMD160 ac2bf3cd12532e7984dfee63fb016efe33da86f6 ChangeLog 92714
-SHA256 574e802ece4e64f451b27175cce291e22abdcb8b8823c0bcd2c3333f33efb5f7 ChangeLog 92714
+MISC ChangeLog 92974 RMD160 bcdbb45d8789356ceaf1d6a2324d43d37c3f3fbc SHA1 47a79e2c2f1fd71ae66bcc8ee54d610791713b55 SHA256 2d23b87d3674330d76a08df65f15944e0b35fe611d570956a63636fdcbc89c2e
+MD5 79e3d1d35fbe3442107d190b323cfb94 ChangeLog 92974
+RMD160 bcdbb45d8789356ceaf1d6a2324d43d37c3f3fbc ChangeLog 92974
+SHA256 2d23b87d3674330d76a08df65f15944e0b35fe611d570956a63636fdcbc89c2e ChangeLog 92974
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -65,12 +73,15 @@ SHA256 fc42fbfcf2988b6545dc38fd1f31ea5d21da6a25c8bb68ec6cb9c8100a639993 files/di
 MD5 0739a7f44d72e74a1f977dcd81030c18 files/digest-baselayout-1.12.9-r2 256
 RMD160 0aaebaf00ed5d13cb4eaeb420ac7859ccc666503 files/digest-baselayout-1.12.9-r2 256
 SHA256 d975250968cfce2250369add8355bc47cc2e3c8ae2ae5d606c6f69086535f510 files/digest-baselayout-1.12.9-r2 256
-MD5 1f63c977c284be84db26a09beb294ca6 files/digest-baselayout-1.13.0_alpha12 280
-RMD160 a8f2355afcfba2d47bea3b5ed76d66063dd023ae files/digest-baselayout-1.13.0_alpha12 280
-SHA256 cb5e81576090bd7ad291650b3725cf79b8abd705f87b28fe1e5342bb06e5ed0a files/digest-baselayout-1.13.0_alpha12 280
+MD5 73d1269ba801eb1a113e55b5679be37f files/digest-baselayout-1.13.0_alpha12 280
+RMD160 82ba1b5b86ef5f414bf202d8cfd1275e7e21bf97 files/digest-baselayout-1.13.0_alpha12 280
+SHA256 4e5b7e0884373590a6b434976433e8d06a3fb4d52282f416d5a25dc2d265bd8a files/digest-baselayout-1.13.0_alpha12 280
 MD5 ee4d69b5b955d11ad0682ed5276ce5cb files/digest-baselayout-2.0.0_alpha1 274
 RMD160 1f7fd2f4bec5e35f7d85e905f80a491daa18f179 files/digest-baselayout-2.0.0_alpha1 274
 SHA256 1b8d9bd46ccda9cf47f971c90b3028a54335835083dfca109a7cb5c0d95a621b files/digest-baselayout-2.0.0_alpha1 274
 MD5 c9d6221152f56d97fbe643c0705a9bb8 files/digest-baselayout-2.0.0_alpha2 274
 RMD160 2bad28312a37c1b427cd65896ddc3745fdfb16e3 files/digest-baselayout-2.0.0_alpha2 274
 SHA256 3d11fbea976d5d3be3b6dbf8f8c9a5b33642faac5aee464922afdf6775c7f878 files/digest-baselayout-2.0.0_alpha2 274
+MD5 c9d6221152f56d97fbe643c0705a9bb8 files/digest-baselayout-2.0.0_alpha2-r1 274
+RMD160 2bad28312a37c1b427cd65896ddc3745fdfb16e3 files/digest-baselayout-2.0.0_alpha2-r1 274
+SHA256 3d11fbea976d5d3be3b6dbf8f8c9a5b33642faac5aee464922afdf6775c7f878 files/digest-baselayout-2.0.0_alpha2-r1 274
diff --git a/sys-apps/baselayout/baselayout-2.0.0_alpha2-r1.ebuild b/sys-apps/baselayout/baselayout-2.0.0_alpha2-r1.ebuild
new file mode 100644
index 000000000000..f3909f64a456
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.0.0_alpha2-r1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0_alpha2-r1.ebuild,v 1.1 2007/05/08 08:57:03 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bootstrap build pam static unicode kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+		!build? (
+			!bootstrap? (
+				kernel_linux? ( >=sys-apps/coreutils-5.2.1 )
+				kernel_FreeBSD? ( sys-process/fuser-bsd )
+			)
+		)
+		pam? ( virtual/pam )
+		!<net-misc/dhcpcd-2.0.0"
+DEPEND="virtual/os-headers"
+PDEPEND="virtual/init
+	!build? ( !bootstrap? (
+		kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 sys-apps/makedev )
+	) )"
+
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Work with different styles of kernel versions.
+	epatch "${FILESDIR}/${P}"-kver.patch
+
+	# Setup unicode defaults for silly unicode users
+	if use unicode ; then
+		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+	fi
+
+	# SPARC does not like stty, so we disable RC_INTERACTIVE which requires it
+	# see Gentoo bug #104067.
+	if use sparc ; then \
+		sed -i -e '/^RC_INTERACTIVE=/s:yes:no:' etc/conf.d/rc || die
+	fi
+}
+
+make_opts() {
+	local libdir="lib"
+	[[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+	local opts="${opts} LIB=${libdir}"
+
+	if use kernel_linux ; then
+		opts="${opts} OS=Linux"
+	else
+		opts="${opts} OS=BSD"
+	fi
+	use pam && opts="${opts} HAVE_PAM=1"
+
+	echo "${opts}"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake $(make_opts) ARCH=$(tc-arch) CC=$(tc-getCC) || die
+}
+
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+	if [[ -f "${ROOT}/etc/conf.d/$1" ]]; 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/$1" > "${D}/etc/conf.d/$1"
+	fi
+}
+
+pkg_preinst() {
+	# Move our makefiles to a temporay location
+	mv "${D}"/usr/share/baselayout/{Makefile,default.mk,runlevels}* "${T}"
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	if use build || use bootstrap ; then
+		local libdirs="$(get_all_libdirs)" dir=
+		# Create our multilib dirs - the Makefile has no knowledge of this
+		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+		for dir in ${libdirs}; do
+			mkdir -p "${ROOT}${dir}"
+			touch "${ROOT}${dir}"/.keep
+			mkdir -p "${ROOT}usr/${dir}"
+			touch "${ROOT}usr/${dir}"/.keep
+			mkdir -p "${ROOT}usr/local/${dir}"
+			touch "${ROOT}usr/local/${dir}"/.keep
+		done
+
+		# Ugly compatibility with stupid ebuilds and old profiles symlinks
+		if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+			rm -r "${ROOT}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+			local lib=$(get_abi_LIBDIR ${DEFAULT_ABI})
+			ln -s "${lib}" "${ROOT}lib"
+			ln -s "${lib}" "${ROOT}usr/lib"
+			ln -s "${lib}" "${ROOT}usr/local/lib"
+		fi
+
+		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+	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
+}
+
+src_install() {
+	make $(make_opts) DESTDIR="${D}" install
+	dodoc ChangeLog COPYRIGHT
+
+	# Should this belong in another ebuild? Like say binutils?
+	# 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
+		local libdirs="$(get_all_libdirs)" libdirs_env= dir=
+		: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+		for dir in ${libdirs}; do
+			libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+		done
+
+		# 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 ${ROOT}lib32 || -d ${ROOT}lib32 ]] && ! hasq lib32 ${libdirs}; then
+			libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+		fi
+		echo "LDPATH=\"${libdirs_env}\"" > "${T}"/04multilib
+		doenvd "${T}"/04multilib
+	fi
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
+
+	# Remove the installed runlevels, as we don't know about $ROOT yet
+	rm -rf "${D}/etc/runlevels"
+
+	# Copy the make files to /usr/share/baselayout so we can re-use them in
+	# postinst, otherwise binpkg will break.
+	insinto /usr/share/baselayout
+	doins -r Makefile default.mk runlevels*
+}
+
+pkg_postinst() {
+	# Make our runlevels if they don't exist
+	if [[ ! -e ${ROOT}etc/runlevels ]] ; then
+		einfo "Making default runlevels"
+		make -C "${T}" $(make_opts) DESTDIR="${ROOT}" runlevels_install >/dev/null
+	fi
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[[ -e "${ROOT}etc/${x}" ]] && continue
+		[[ -e "${ROOT}usr/share/baselayout/${x}" ]] || continue
+		cp -p "${ROOT}usr/share/baselayout/${x}" ${ROOT}etc
+	done
+
+	# We need to copy svcdir if upgrading
+	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
+		(
+		source "${ROOT}etc/conf.d/rc"
+		svcdir="${svcdir:-/var/lib/init.d}"
+		einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}lib/rcscripts/init.d"
+		cp -RPp "${ROOT}${svcdir}"/* "${ROOT}"lib/rcscripts/init.d
+		rm -rf "${ROOT}"lib/rcscripts/init.d/daemons
+		umount "${ROOT}${svcdir}" 2>/dev/null
+		rm -rf "${ROOT}${svcdir}"
+		)
+	elif has_version "<sys-apps/${PN}-2.0.0_alpha" ; then
+		# The format has changed since 1.13
+		rm -rf "${ROOT}lib/rcscripts/init.d/daemons"
+	fi
+
+	if [[ ${ROOT} == / ]] && ! use build && ! use bootstrap; then
+		/$(get_libdir)/rcscripts/bin/rc-depend --update
+	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 release ${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"
+
+	local lo="net.lo0"
+	use kernel_linux && lo="net.lo"
+	for f in ${ROOT}etc/init.d/net.*; do
+		[[ -L ${f} || ${f} == "${ROOT}etc/init.d/${lo}" ]] && continue
+		echo
+		einfo "WARNING: You have older net.* files in ${ROOT}etc/init.d/"
+		einfo "They need to be converted to symlinks to ${lo}.	If you haven't"
+		einfo "made personal changes to those files, you can update with the"
+		einfo "following command:"
+		einfo
+		einfo "	 /bin/ls ${ROOT}etc/init.d/net.* | grep -v '/${lo}$' | xargs -n1 ln -sfvn ${lo}"
+		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'"
+	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 "that no longer work"
+			ewarn
+			ewarn "You are advised to review the new configuration variables as"
+			ewarn "found in ${ROOT}etc/conf.d/net.example"
+	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/{conf.d,init.d}/domainname \
+			"${ROOT}"/etc/runlevels/*/domainname
+		echo
+		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
+}
+
+# Handle our downgraders
+# We should remove this when <1.13 has been removed from the tree
+pkg_postrm() {
+	# Remove dir if downgrading
+	if has_version "<sys-apps/${PN}-1.13.0_alpha" ; then
+		(
+		source "${ROOT}etc/conf.d/rc"
+		svcdir="${svcdir:-/var/lib/init.d}"
+		einfo "Moving state from ${ROOT}lib/rcscripts/init.d to ${ROOT}${svcdir}"
+		mkdir -p "${ROOT}${svcdir}"
+		cp -RPp "${ROOT}lib/rcscripts/init.d"/* "${ROOT}${svcdir}"
+		rm -rf "${ROOT}${svcdir}"/daemons
+		umount "${ROOT}lib/rcscripts/init.d" 2>/dev/null
+		rm -rf "${ROOT}lib/rcscripts/init.d"
+		)
+	fi
+}
diff --git a/sys-apps/baselayout/files/baselayout-2.0.0_alpha2-kver.patch b/sys-apps/baselayout/files/baselayout-2.0.0_alpha2-kver.patch
new file mode 100644
index 000000000000..e7f73be59095
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-2.0.0_alpha2-kver.patch
@@ -0,0 +1,21 @@
+Index: sh/functions.sh
+===================================================================
+--- sh/functions.sh	(revision 2687)
++++ sh/functions.sh	(working copy)
+@@ -104,11 +104,12 @@
+ KV_to_int() {
+ 	[ -z $1 ] && return 1
+ 
+-	local KV_MAJOR=${1%%.*}
+-	local x=${1#*.}
++	local x=${1%%-*}
++	local KV_MAJOR=${x%%.*}
++	x=${x#*.}
+ 	local KV_MINOR=${x%%.*}
+-	x=${1#*.*.}
+-	local KV_MICRO=${x%%-*}
++	x=${x#*.}
++	local KV_MICRO=${x%%.*}
+ 	local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
+ 
+ 	# We make version 2.2.0 the minimum version we will handle as
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12
index e50ac500b70d..d4f6ab3b89ac 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12
+++ b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha12
@@ -1,3 +1,3 @@
-MD5 ed1cbd72c654201c9ff7dafcc3f2ba65 baselayout-1.13.0_alpha12.tar.bz2 128921
-RMD160 894f7994fd71ce588e8f314825aeedd02badf276 baselayout-1.13.0_alpha12.tar.bz2 128921
-SHA256 0f70c7a0e5bc561b76b275c07fa19003d54bced10fd739602c87b258310b6a96 baselayout-1.13.0_alpha12.tar.bz2 128921
+MD5 8de97deb8317f58da52c688f06439e4d baselayout-1.13.0_alpha12.tar.bz2 230982
+RMD160 6401629eeb92b13eb2bfbdc7f268d45ee7ed2f51 baselayout-1.13.0_alpha12.tar.bz2 230982
+SHA256 3b6214eb02e2549a19f2e40a71eee65981c9c9758a327d6bef128e734c47e054 baselayout-1.13.0_alpha12.tar.bz2 230982
diff --git a/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha2-r1 b/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha2-r1
new file mode 100644
index 000000000000..915943d49b39
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-2.0.0_alpha2-r1
@@ -0,0 +1,3 @@
+MD5 612e328545f421c0c58e1ac61fd0d1f7 baselayout-2.0.0_alpha2.tar.bz2 132406
+RMD160 259b52abf8d706338ba99fded89c503bfeee807b baselayout-2.0.0_alpha2.tar.bz2 132406
+SHA256 7e0b9df754bf55fffa25a112d328a3a37d43425daf94ee48ce80cab34a3df98c baselayout-2.0.0_alpha2.tar.bz2 132406