Version bump, includes critical fix for bug 407757 ifconfig binary move.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 437 insertions, 34 deletions

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 1b463260f457..b7c13a7fea66 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST net-tools-1.60_p20110409135728-patches-1.tar.xz 3976 RMD160 96b104edca816ae41af32fd2a77bbf4486dbb69e SHA1 358c2f3c2a388ca415cd93bce7cb492df3cfafe2 SHA256 6ec48e4e97f64734747c5a1639203179ab12a83faceaada739fa576e0a01df73
 DIST net-tools-1.60_p20110409135728.tar.xz 223168 RMD160 61ef911a9bf6bc28d92de96a9ccdbe852eb06f12 SHA1 47e6c6684999cccf48e014cb2248bc03677e5627 SHA256 2379dab69c68c0b6755cd063c9cb170d4b3862be9f0154cf4c28d749d232b98f
 DIST net-tools-1.60_p201111202031570500-patches-1.tar.xz 3348 RMD160 e3a5ee4a4ccb943bbf97d0eb0c57bea2ed102052 SHA1 0aa724cf0ab29db6e36d6a3bb96c0fb4a4c52b5b SHA256 98a5e20f4cc6aca911e3b24cc04a071bff0f694023013755dc195da26089f837
@@ -9,24 +6,7 @@ DIST net-tools-1.60_p20120127084908-patches-1.tar.xz 3332 RMD160 c4f8a55e6883204
 DIST net-tools-1.60_p20120127084908.tar.xz 224992 RMD160 64b1b0045f5394e6678f6a6ce9c868fef09df2f5 SHA1 495046e76eefbe3b3f14875db04873da7884be52 SHA256 408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94
 EBUILD net-tools-1.60_p20110409135728.ebuild 2255 RMD160 db4b3c05982f59f732a51125143610142d875c76 SHA1 6d3475263a73bf2043fb2e29a0ec55ff9ce44c36 SHA256 80b1c01a4484b7f2f71ac2f9f2ce4d634f694a60ec349b2648c833bcd7797aa5
 EBUILD net-tools-1.60_p20111120203157.ebuild 2701 RMD160 84257979a6945c7229ef43799f80dedee6e38105 SHA1 dad6f7dee27845c2508745f8eeb6918b69a00a0d SHA256 bbc16f8c9638661edca133c2a096b40cf6af75c93909ea35d27752cb5cb80b65
-EBUILD net-tools-1.60_p20120127084908.ebuild 2646 RMD160 730178cca6c84fe6662843483c94e133dc85598b SHA1 c7609b330d2e099f968fd0608ba40a9c70100004 SHA256 3459eb9fea4d27ad937d804dc3cbdb8ef33523913a6af282eaf8e6db4056fbea
+EBUILD net-tools-1.60_p20120127084908.ebuild 2632 RMD160 a5c47f139223745fd14821a03f7ef88d80d0da3b SHA1 9020fa874ea4d2e6a73eac2d4e19cc34ff5f5b67 SHA256 2a3727a3e93878cb00634104e2f2174e16d6a98f8fccbe7cdb09c8dd9b20a0f5
 EBUILD net-tools-9999.ebuild 2590 RMD160 7493169771bda765782b39a94b8ce4ec26769778 SHA1 15b9fc7987374d8f9403d30b44273f6019eefb66 SHA256 075cd48c7ad1e9b5bd6a7c3f93849251853afe902947244fba92fb8378acbd0b
-MISC ChangeLog 19632 RMD160 ab09528ac7154b82d4559a4c7344250e0f4a84e3 SHA1 b2d2dfd4f630f478e4719862aad4b7367f40c3cf SHA256 ee35dcfe3c2005b868671b4d895453387b122f2ecea690522f66a626ee054d72
+MISC ChangeLog 19793 RMD160 0d02ec42c8551361490745d366244321b9153f67 SHA1 2a7139b008e7d2bcddfbebcf370023d65c32f36c SHA256 a039df79a390d20cad07ba125917a0d19d59efdd2b23b700af832381ea3b36a5
 MISC metadata.xml 283 RMD160 81fc4d8272396ca42e82bdb0c886829cee76d462 SHA1 aa3da7f4f3a7bd1f794ef04bcc42c80a84480ee2 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPXQSDAAoJELEHsLL7fEFW4pkP/j/YPWeybzVs26mZgvPA9mcd
-nEFcflqZm77UAxsLQfBIwXmL4+oNouTx9CTglIm2wdVrX/0Sfnb5fKz439IbwZJ3
-ZdTIRGVQoqvqErQeEpNvfNNOxs9P2SPEUafOw5sROFDnyJddTvgeD2QEqRPikD/B
-w8V6kTMHOMUiiNGYXXfI05TvWUrZjAkr5Mis9hufE/Wf1QGyW7mca2f4FXLpv6C1
-aSnJNnB3yOdinnEZznJCIt5KQW8F0P3kdoJpLQtICZFXF1WwuhodEjjkrYclL43v
-L2YyqxWM5CgHwqMiXEX2hB40D9JOOCRwaCydYKYakJCVJRtEPHyJzuD0pOLra/R9
-3FSm/ssZZqO53Bqo6yLQoU/nKdo0/bkr9eQ59nGjKeU2CR2cj2GEXrreMKOxV93h
-NslYK7+6ntGSdDwnSpPnVS4qnWyZcVtghLfMoPkdfGvJvKessgIu4Az+iy35Ty4e
-3E8WhU5H+V9zaDRKgyezQqvOT/vRQoWNcpixRl7sn3Ij6WQpkgQZRGLdMK6mgBjG
-Am4jVk1PgG084Cu8GLnOIeqRNdZDfCsow244cHYDJj3Zeh2nEZWiMh9r80NsFYm8
-jf37xOONAxPnCH2nHoQ+CEcBbi+RLyLoq5BWSQ6cYb9bO4OY8WIfRnRlotkxUwyF
-hzd6gGFKxlEbOeldFRvF
-=KKw/
------END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index b83c2cd0825f..a9f23c57d8a7 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.215 2012/02/26 03:40:01 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.216 2012/03/11 20:14:37 robbat2 Exp $
+
+*openrc-0.9.9.3 (11 Mar 2012)
+
+  11 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> +openrc-0.9.9.3.ebuild:
+  Version bump, includes critical fix for bug 407757 ifconfig binary move.
 
 *openrc-0.9.9.2 (26 Feb 2012)
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 82be2974917b..aa1a41393e57 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openrc-0.8.3-ccwgroup.patch 1992 RMD160 7a403f5107b17c200b81e4290292e74ec9f222fe SHA1 228f924991c870e7a9ab227c0b9d99e00dbb3d8a SHA256 5a092cc0ab90507c28f8bd6af34b67fbb3d8a9ddce257195dde55128f87324fc
 AUX openrc-0.8.3-deprecation_warning.patch 1055 RMD160 f91a0ca1aba21c9da5e968ae66f709e1751459d1 SHA1 8a07d6106ce4675087224c5cd22d5c9ce01696fb SHA256 fa95aaa34db3556240031fcfb5e33d85e44da2a2f74562faa97c75f569d4efa0
 AUX openrc-9999-msg-style.patch 2775 RMD160 af958b2a8ed5ad29f25b53bad9a426cf7e173405 SHA1 251b8d0a52bb6e98d80a5213afc4d067583441fc SHA256 637fc2d13e0940b55b7d4613ebf8ebabdee87a802a2690191c01fd5ee7cb3581
@@ -12,20 +9,15 @@ DIST openrc-0.9.4.tar.bz2 163514 RMD160 b0c5b10a562b7a906d762f9b735aa386be6c4afa
 DIST openrc-0.9.8.4.tar.bz2 166843 RMD160 2d48429eb2acac513dab803b282eaf495db66be3 SHA1 4987928b46ad37406ceca26bc0d09f4281669b71 SHA256 904e139a90d5f610b59f9e0cc52ddac487c58e4fa73468b5e9fdac1a03362533
 DIST openrc-0.9.9.1.tar.bz2 169195 RMD160 8c408cb7c73d48519686f55efbcae90a53a7131d SHA1 b3f8a7ac11c04ea6c085f7002f3d98e4e3d2bc5a SHA256 c5a528242689f7ccfc6eadcede831edc85255283032fb8362f9e039edfa90f3b
 DIST openrc-0.9.9.2.tar.bz2 169141 RMD160 2d0ec3ce1ba0ca1c1568936830ea39e4a2187261 SHA1 06415fe27fa9775701bdde456355cdb77ac10bc9 SHA256 2f85d5dd2c4c7cbc124cd83aca1034c0fd3515e0603dc51891e7d9a323a89935
+DIST openrc-0.9.9.3.tar.bz2 169462 RMD160 a787cfe0ebb3978e77675cfb65f53175d7a88343 SHA1 152765f15ebaf024166d781e70d59996f3f9ec66 SHA256 75487579982eddee9bbc7c3f6515ef8924eefd35c4829361e2b4c4c69bd047ab
 DIST openrc-0.9.9.tar.bz2 169147 RMD160 a7b247d0d6c6e50615554fb98c3cb48488a11524 SHA1 1ca7c26d44dceaac85efba79bc0e75fd9da117e2 SHA256 6d2cfff069ba53fb55dc9ebca1b6a2393cf0d17670583d85641e41ca29204ab8
 EBUILD openrc-0.8.3-r1.ebuild 14138 RMD160 bc71af674de46c2d20cd9ab9da15676729a9552e SHA1 9b062083f16cdfa39d1e0f05b9aafff1eceede9b SHA256 88a215d5ff4ec346ea0a20201ac43582e0874cd1aed3035e5dbd99d88b713970
 EBUILD openrc-0.9.4.ebuild 14137 RMD160 bd5c3744c11c548cab1b92623588d557e2ee5337 SHA1 0476a5d09966e3f9c8a14115184048fcf4a54217 SHA256 21583467dc9866d9d5c60dc6410dea11a3cb8fc582eb17104a2b86672fefeb42
 EBUILD openrc-0.9.8.4.ebuild 13967 RMD160 8ea8b9e8c2d64c8c14e0729be795aaae294ce89d SHA1 382e1235affde7adcd3fe780608bcf847afae5a8 SHA256 dd100aaaf00fe0f46008cda1a0b12a6753bd6019cb606d747f0edefc7b359468
 EBUILD openrc-0.9.9.1.ebuild 14113 RMD160 73169c09e489e4692a3cbe88649980519958cb39 SHA1 635bba43244c10617b71905f5fb34404efb7811e SHA256 86e9db379c6c811631ffd923ee5dc2d99864a59fa2bcb4d0c986f65e32c20f6f
 EBUILD openrc-0.9.9.2.ebuild 14113 RMD160 0abd76f9fb44bafc3f7c3e5ab4555aa16b367ece SHA1 5e0eba6eec223bb46fd17ac5d2b9dd149b3e32e8 SHA256 6a9a71bf343c0aaac5c655c0571bbe482e32036bff495b34242ba7c40725bf61
+EBUILD openrc-0.9.9.3.ebuild 14112 RMD160 9b58e3524220ecfb7be657aa55da8f30f5f69577 SHA1 dabddc704559068cbdd0f8a3ac4093f6f68e1bcd SHA256 b0a2d4e5b7fe892450b2cf654d3813557b268ebdad0bcf735bb2f594b82e756f
 EBUILD openrc-0.9.9.ebuild 14111 RMD160 edc75f091bcf00b35d9ab016163811e5d500e04f SHA1 8426ec2433394140bce8d073b37e1cd73c2aa1ba SHA256 cd930975d6c297ded8df70a5cfbc5d36d9b1141114d8ad1eb085721c7fa736f5
 EBUILD openrc-9999.ebuild 14111 RMD160 f3f40aaf107be1ca2c4def73c4de9384529326b4 SHA1 d771b65c81173fed115a64aedd8129322984c17f SHA256 1039e0dc7366be0a43a3dd28970e3cd8039b3ec8525e66980b6d49bb2383d8c9
-MISC ChangeLog 37300 RMD160 1fb59f3ebe29c5d1da00fdd112abcfa5bd058c0d SHA1 06ea321556e3864ffe68bd137a3e5f07eeb2f56c SHA256 ac54027eacd2c2b3ff817596a8ee10d1c040153dcb0d8fee79de55d1cf5b4594
+MISC ChangeLog 37483 RMD160 bd4e6447bcc3931e86c05867be67072b0dd90879 SHA1 7ada54274681082e0a083ee7b9ee3d342677ef9a SHA256 ded09616c59615009dc029d68db6add8066573ce339b69daf9f3be2615156c94
 MISC metadata.xml 159 RMD160 b92bb52b0f2ee2c0ee08ac8b32f98c3521f9d480 SHA1 aac3cb897981c4918f5f2244d192b5bcc6727d36 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk9JqZYACgkQblQW9DDEZTgAVQCggXqex6gFyrUgCyc9P2RhRm4P
-OCYAn1hJyvDSpV/WBlz8vYdnVJXLCm+/
-=/X9A
------END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.9.9.3.ebuild b/sys-apps/openrc/openrc-0.9.9.3.ebuild
new file mode 100644
index 000000000000..401f3e51a7fa
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.9.9.3.ebuild
@@ -0,0 +1,426 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.9.9.3.ebuild,v 1.1 2012/03/11 20:14:37 robbat2 Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
+[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
+inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
+if [[ ${PV} != "9999" ]] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	elibc_glibc? ( >=sys-libs/glibc-2.5 )
+	ncurses? ( sys-libs/ncurses )
+	pam? ( sys-auth/pambase )
+	>=sys-apps/baselayout-2.0.0
+	kernel_linux? (
+		sys-process/psmisc
+	)
+	!<sys-fs/udev-133"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+make_args() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	if use selinux; then
+			MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	if ! use static-libs; then
+			MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no"
+	fi
+}
+
+pkg_setup() {
+	export DEBUG=$(usev debug)
+	export MKPAM=$(usev pam)
+	export MKTERMCAP=$(usev ncurses)
+}
+
+src_prepare() {
+	sed -i 's:0444:0644:' mk/sys.mk || die
+	sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	make_args
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${D}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	make_args
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	keepdir /$(get_libdir)/rc/{init.d,tmp}
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+	rm -rf "${D}"/etc/runlevels
+
+	# Install the default net configuration
+	doconfd conf.d/net
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install the gentoo pam.d file
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \
+		|| return
+	[[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${ROOT}"/etc/runlevels/${runlevel}
+		touch "${ROOT}"/etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${ROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# default net script is just comments, so no point in biting people
+	# in the ass by accident.  we save in preinst so that the package
+	# manager doesnt go throwing etc-update crap at us -- postinst is
+	# too late to prevent that.  this behavior also lets us keep the
+	# file in the CONTENTS for binary packages.
+	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${ROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# upgrade timezone file ... do it before moving clock
+	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
+		(
+		unset TIMEZONE
+		source "${ROOT}"/etc/conf.d/clock
+		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
+		)
+	fi
+
+	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
+	local clock
+	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
+	if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
+		mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
+	fi
+	if [[ -e ${ROOT}/etc/init.d/clock ]] ; then
+		rm -f "${ROOT}"/etc/init.d/clock
+	fi
+	if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
+		rm -f "${ROOT}"/etc/runlevels/boot/clock
+		ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
+	fi
+	if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
+		rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock
+		ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock}
+	fi
+
+	# /etc/conf.d/rc is no longer used for configuration
+	if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then
+		elog "/etc/conf.d/rc is no longer used for configuration."
+		elog "Please migrate your settings to /etc/rc.conf as applicable"
+		elog "and delete /etc/conf.d/rc"
+	fi
+
+	# force net init.d scripts into symlinks
+	for f in "${ROOT}"/etc/init.d/net.* ; do
+		[[ -e ${f} ]] || continue # catch net.* not matching anything
+		[[ ${f} == */net.lo ]] && continue # real file now
+		[[ ${f} == *.openrc.bak ]] && continue
+		if [[ ! -L ${f} ]] ; then
+			elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
+			elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
+			mv "${f}" "${f}.openrc.bak"
+			ln -snf net.lo "${f}"
+		fi
+	done
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	has_version sys-apps/openrc || migrate_from_baselayout_1
+	has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
+}
+
+# >=openrc-0.4.0 no longer loads the udev addon
+migrate_udev_init_script() {
+	# make sure udev is in sysinit if it was enabled before
+	local enable_udev=false
+	local rc_devices=$(
+		[[ -f /etc/rc.conf ]] && source /etc/rc.conf
+		[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
+		echo "${rc_devices:-${RC_DEVICES:-auto}}"
+	)
+	case ${rc_devices} in
+		udev|auto)
+			enable_udev=true
+			;;
+	esac
+
+	if $enable_udev; then
+		add_boot_init udev sysinit
+		add_boot_init udev-postmount default
+	fi
+}
+
+migrate_from_baselayout_1() {
+	# baselayout boot init scripts have been split out
+	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
+		# baselayout-1 is always "old" net, so ignore "new" net
+		[[ ${f} == "network" ]] && continue
+
+		add_boot_init ${f}
+	done
+
+	# Try to auto-add some addons when possible
+	add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
+	add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
+	add_boot_init_mit_config /etc/mdadm.conf mdraid
+	add_boot_init_mit_config /etc/evms.conf evms
+	[[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper
+	[[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
+	elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
+	elog "init.d scripts.  If you use such a thing, make sure you have the"
+	elog "required init.d scripts added to your boot runlevel."
+
+	# Upgrade our state for baselayout-1 users
+	if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
+		(
+		[[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc
+		svcdir=${svcdir:-/var/lib/init.d}
+		if [[ ! -d ${ROOT}${svcdir}/started ]] ; then
+			ewarn "No state found, and no state exists"
+			elog "You should reboot this host"
+		else
+			mkdir -p "${ROOT}${LIBDIR}/rc/init.d"
+			einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d"
+			mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d
+			rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \
+				"${ROOT}${LIBDIR}"/rc/init.d/console
+			umount "${ROOT}${svcdir}" 2>/dev/null
+			rm -rf "${ROOT}${svcdir}"
+		fi
+		)
+	fi
+
+	# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
+	if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+		elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
+		rm -f "${ROOT}"/etc/modules.autoload.d/.keep*
+		rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
+		if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+			local f v
+			for f in "${ROOT}"/etc/modules.autoload.d/* ; do
+				v=${f##*/}
+				v=${v#kernel-}
+				v=${v//[^[:alnum:]]/_}
+				gawk -v v="${v}" -v f="${f##*/}" '
+				BEGIN { print "\n### START: Auto-converted from " f "\n" }
+				{
+					if ($0 ~ /^[^#]/) {
+						print "modules_" v "=\"${modules_" v "} " $1 "\""
+						gsub(/[^[:alnum:]]/, "_", $1)
+						printf "module_" $1 "_args_" v "=\""
+						for (i = 2; i <= NF; ++i) {
+							if (i > 2)
+								printf " "
+							printf $i
+						}
+						print "\"\n"
+					} else
+						print
+				}
+				END { print "\n### END: Auto-converted from " f "\n" }
+				' "${f}" >> "${D}"/etc/conf.d/modules
+			done
+				rm -f "${f}"
+			rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
+		fi
+	fi
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Remove old baselayout links
+	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
+	rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
+		rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${ROOT}"/etc/runlevels/sysinit
+			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \
+				"${ROOT}"/etc/runlevels/sysinit
+		fi
+		if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${ROOT}"/etc/runlevels/shutdown
+			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \
+				"${ROOT}"/etc/runlevels/shutdown
+		fi
+	fi
+
+	# /etc/conf.d/net.example is no longer valid
+	local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example"
+	local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
+	if [[ -e "${NET_EXAMPLE}" ]] ; then
+		if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
+			rm -f "${NET_EXAMPLE}"
+			elog "${NET_EXAMPLE} has been removed."
+		else
+			sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
+			elog "${NET_EXAMPLE} should be removed."
+		fi
+		elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example"
+	fi
+
+	# /etc/conf.d/wireless.example is no longer valid
+	local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example"
+	local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
+	if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
+		if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
+			rm -f "${WIRELESS_EXAMPLE}"
+			elog "${WIRELESS_EXAMPLE} is deprecated and has been removed."
+		else
+			sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}"
+			elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
+		fi
+		elog "If you are using the old style network scripts,"
+		elog "Configure wireless settings in ${ROOT}/etc/conf.d/net"
+		elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example"
+	fi
+
+	if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+		ewarn "/etc/modules.autoload.d is no longer used.  Please convert"
+		ewarn "your files to /etc/conf.d/modules and delete the directory."
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${ROOT}etc/local.d"
+		mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start
+		mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${ROOT}"etc/local.d/*{start,stop}
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	elog "You should now update all files in /etc, using etc-update"
+	elog "or equivalent before restarting any services or this host."
+	elog
+	elog "Please read the migration guide available at:"
+	elog "http://www.gentoo.org/doc/en/openrc-migration.xml"
+}