removed old version

(Portage version: 2.2_rc55/cvs/Linux i686)

7 files changed, 9 insertions, 718 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 98f8a61e1757..4269ac9b90ca 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.99 2009/12/02 23:42:29 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.100 2009/12/06 19:00:43 williamh Exp $
+
+  06 Dec 2009; William Hubbs <williamh@gentoo.org> -openrc-0.5.2-r2.ebuild,
+  -files/openrc-0.5.2-dont-wipe-wtmp.patch,
+  -files/openrc-0.5.2-fix-default-domain.patch,
+  -files/openrc-0.5.2-fix-iproute2-support.patch,
+  -files/openrc-0.5.2-linux-containers.patch,
+  -files/openrc-0.5.2-ppp-options.patch:
+  removed old version
 
 *openrc-0.5.3 (02 Dec 2009)
 
diff --git a/sys-apps/openrc/files/openrc-0.5.2-dont-wipe-wtmp.patch b/sys-apps/openrc/files/openrc-0.5.2-dont-wipe-wtmp.patch
deleted file mode 100644
index d99fd472dad1..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-dont-wipe-wtmp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3ec425ce9bcd0bb91f74ac7394aa9ee3f10013bd Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Wed, 28 Oct 2009 20:53:35 -0500
-Subject: [PATCH] Don't wipe wtmp
-
-Thanks to jasiu@belsznica.pl for the patch.
----
- init.d/bootmisc.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
-index 1ec5748..5e24531 100644
---- a/init.d/bootmisc.in
-+++ b/init.d/bootmisc.in
-@@ -95,7 +95,7 @@ start()
- 		for x in "" $xtra; do
- 			mkutmp /var/run/utmp$x
- 		done
--		[ -e /var/log/wtmp ] && mkutmp /var/log/wtmp
-+		[ -e /var/log/wtmp ] || mkutmp /var/log/wtmp
- 		eend 0
- 
- 		ebegin "Cleaning /var/run"
--- 
-1.6.4.4
-
diff --git a/sys-apps/openrc/files/openrc-0.5.2-fix-default-domain.patch b/sys-apps/openrc/files/openrc-0.5.2-fix-default-domain.patch
deleted file mode 100644
index c172886dac61..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-fix-default-domain.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3c8ea5896a8c7a6f7cc97cff1bd7b3c8a5739a61 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sun, 25 Oct 2009 00:03:20 +0100
-Subject: [PATCH 1/3] Fix default domain
-
----
- init.d/network.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/init.d/network.in b/init.d/network.in
-index 5e60963..7f64b17 100644
---- a/init.d/network.in
-+++ b/init.d/network.in
-@@ -174,7 +174,7 @@ start()
- {
- 	local cr=0 r= int= intv= cmd= args= upcmd=
- 
--	if [ -z "$domainname" && -s /etc/defaultdomain ]; then
-+	if [ -z "$domainname" -a -s /etc/defaultdomain ]; then
- 		domainname=$(cat /etc/defaultdomain)
- 	fi
- 	if [ -n "$domainname" ]; then
--- 
-1.6.4.4
-
diff --git a/sys-apps/openrc/files/openrc-0.5.2-fix-iproute2-support.patch b/sys-apps/openrc/files/openrc-0.5.2-fix-iproute2-support.patch
deleted file mode 100644
index e204267b63d9..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-fix-iproute2-support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From aa6d81180167192ad41a73e896f58db89a81d371 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Mon, 19 Oct 2009 22:25:40 -0500
-Subject: [PATCH] fix iproute2 support for gentoo bug 289762
-
----
- init.d/network.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/init.d/network.in b/init.d/network.in
-index 5e60963..396c67d 100644
---- a/init.d/network.in
-+++ b/init.d/network.in
-@@ -109,11 +109,11 @@ runip()
- 	local int="$1" err=
- 
- 	shift
--	err=$(LC_ALL=C ip address add "$@" dev "$int" 2>&1)
-+	err=$(LC_ALL=C ip address add "$@" dev "$int" brd + 2>&1)
- 	if [ -z "$err" ]; then
- 		# ip does not bring up the interface when adding addresses
--		if ! intup; then
--			ip set link up dev "$int"
-+		if ! $intup; then
-+			ip link set "$int" up
- 			intup=true
- 		fi
- 		return 0
--- 
-1.6.4.4
-
diff --git a/sys-apps/openrc/files/openrc-0.5.2-linux-containers.patch b/sys-apps/openrc/files/openrc-0.5.2-linux-containers.patch
deleted file mode 100644
index 1543b173e035..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-linux-containers.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 95ee39ab1c9ce313725098999cf1d05b42f9c126 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Wed, 4 Nov 2009 19:21:24 +0000
-Subject: [PATCH 2/3] Add support for Linux Containers, fixes #202.
- Patch by bug reporter.
-
----
- init.d/fsck.in       |    2 +-
- init.d/hwclock.in    |    2 +-
- init.d/localmount.in |    2 +-
- init.d/modules.in    |    2 +-
- init.d/mount-ro.in   |    2 +-
- init.d/numlock.in    |    2 +-
- init.d/procfs.in     |    2 +-
- init.d/root.in       |    2 +-
- init.d/swap.in       |    2 +-
- init.d/swclock.in    |    2 +-
- man/runscript.8      |    4 +++-
- src/librc/librc.c    |    2 ++
- src/librc/rc.h.in    |    1 +
- 13 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/init.d/fsck.in b/init.d/fsck.in
-index 68cdf14..279e25c 100644
---- a/init.d/fsck.in
-+++ b/init.d/fsck.in
-@@ -9,7 +9,7 @@ _IFS="
- depend()
- {
- 	use dev clock modules
--	keyword -jail -openvz -prefix -timeout -vserver
-+	keyword -jail -openvz -prefix -timeout -vserver -lxc
- }
- 
- _abort() {
-diff --git a/init.d/hwclock.in b/init.d/hwclock.in
-index ea9fa34..e99900f 100644
---- a/init.d/hwclock.in
-+++ b/init.d/hwclock.in
-@@ -28,7 +28,7 @@ depend()
- 	else
- 		before *
- 	fi
--	keyword -openvz -prefix -uml -vserver -xenu
-+	keyword -openvz -prefix -uml -vserver -xenu -lxc
- }
- 
- setupopts()
-diff --git a/init.d/localmount.in b/init.d/localmount.in
-index 89a4801..a4d1116 100644
---- a/init.d/localmount.in
-+++ b/init.d/localmount.in
-@@ -8,7 +8,7 @@ depend()
- {
- 	need fsck
- 	use lvm modules mtab
--	keyword -jail -openvz -prefix -vserver
-+	keyword -jail -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/modules.in b/init.d/modules.in
-index c2270ff..7c0b993 100644
---- a/init.d/modules.in
-+++ b/init.d/modules.in
-@@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules."
- depend()
- {
- 	use isapnp
--	keyword -openvz -prefix -vserver
-+	keyword -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
-index 45e0fab..69032d7 100644
---- a/init.d/mount-ro.in
-+++ b/init.d/mount-ro.in
-@@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot."
- depend()
- {
- 	need killprocs savecache
--	keyword -prefix -openvz -vserver
-+	keyword -prefix -openvz -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/numlock.in b/init.d/numlock.in
-index 9d88fa0..7bf3dc7 100644
---- a/init.d/numlock.in
-+++ b/init.d/numlock.in
-@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
- depend()
- {
- 	need localmount
--	keyword -openvz -prefix -vserver
-+	keyword -openvz -prefix -vserver -lxc
- }
- 
- _setleds()
-diff --git a/init.d/procfs.in b/init.d/procfs.in
-index 712adc2..2b73bd7 100644
---- a/init.d/procfs.in
-+++ b/init.d/procfs.in
-@@ -8,7 +8,7 @@ depend()
- {
- 	use modules devfs
- 	need localmount
--	keyword -openvz -prefix -vserver
-+	keyword -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/root.in b/init.d/root.in
-index 6dc37c8..0689060 100644
---- a/init.d/root.in
-+++ b/init.d/root.in
-@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
- depend()
- {
- 	need fsck
--	keyword -jail -openvz -prefix -vserver
-+	keyword -jail -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/swap.in b/init.d/swap.in
-index 564531b..d99b9b8 100644
---- a/init.d/swap.in
-+++ b/init.d/swap.in
-@@ -5,7 +5,7 @@
- depend()
- {
- 	need localmount
--	keyword -jail -openvz -prefix -vserver
-+	keyword -jail -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/swclock.in b/init.d/swclock.in
-index 2d091fe..3357fc7 100644
---- a/init.d/swclock.in
-+++ b/init.d/swclock.in
-@@ -8,7 +8,7 @@ depend()
- {
- 	before *
- 	provide clock
--	keyword -openvz -prefix -uml -vserver -xenu
-+	keyword -openvz -prefix -uml -vserver -xenu -lxc
- }
- 
- # swclock is an OpenRC built in
-diff --git a/man/runscript.8 b/man/runscript.8
-index a3e1f2e..22de825 100644
---- a/man/runscript.8
-+++ b/man/runscript.8
-@@ -22,7 +22,7 @@
- .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- .\" SUCH DAMAGE.
- .\"
--.Dd July 1, 2009
-+.Dd November 4, 2009
- .Dt RUNSCRIPT 8 SMM
- .Os OpenRC
- .Sh NAME
-@@ -143,6 +143,8 @@ When in a jail, exclude this service from any dependencies. The service can
- still be run directly.
- .It Dv -openvz
- Same as -jail, but for OpenVZ systems.
-+.It Dv -lxc
-+Same as -jail, but for Linux Resource Containers (LXC).
- .It Dv -shutdown
- Don't stop this service when shutting the system down.
- This normally quite safe as remaining daemons will be sent a SIGTERM just
-diff --git a/src/librc/librc.c b/src/librc/librc.c
-index 96e3195..34bd9e1 100644
---- a/src/librc/librc.c
-+++ b/src/librc/librc.c
-@@ -233,6 +233,8 @@ rc_sys(void)
- 		return RC_SYS_VSERVER;
- 	else if (exists("/proc/vz/veinfo") && !exists("/proc/vz/version"))
- 		return RC_SYS_OPENVZ;
-+	else if (file_regex("/proc/self/cgroup", ":/.+$"))
-+		return RC_SYS_LXC;
- 	else if (file_regex("/proc/self/status",
- 		"envID:[[:space:]]*[1-9]"))
- 		return RC_SYS_OPENVZ; /* old test */
-diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
-index 373f1d1..4b7977e 100644
---- a/src/librc/rc.h.in
-+++ b/src/librc/rc.h.in
-@@ -268,6 +268,7 @@ bool rc_service_daemons_crashed(const char *);
-  * Some services cannot work in these systems, or we do something else. */
- #define RC_SYS_JAIL    "JAIL"
- #define RC_SYS_OPENVZ  "OPENVZ"
-+#define RC_SYS_LXC     "LXC"
- #define RC_SYS_PREFIX  "PREFIX"
- #define RC_SYS_UML     "UML"
- #define RC_SYS_VSERVER "VSERVER"
--- 
-1.6.4.4
-
diff --git a/sys-apps/openrc/files/openrc-0.5.2-ppp-options.patch b/sys-apps/openrc/files/openrc-0.5.2-ppp-options.patch
deleted file mode 100644
index 473e91d2f8d8..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-ppp-options.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4a892a23ba440a90d8a55f6d19d686917fd3e76e Mon Sep 17 00:00:00 2001
-From: Nao Nakashima <nao.nakashima@gmail.com>
-Date: Wed, 4 Nov 2009 19:40:52 +0000
-Subject: [PATCH 3/3] Fix ppp options ordering.
- Fixes #205.
-
----
- net/pppd.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/pppd.sh b/net/pppd.sh
-index 5967f0b..a8c8882 100644
---- a/net/pppd.sh
-+++ b/net/pppd.sh
-@@ -90,7 +90,7 @@ pppd_pre_start()
- 	eval passwordset=\$\{password_${IFVAR}-x\}
- 	if [ -n "${username}" ] \
- 	&& [ -n "${password}" -o -z "${passwordset}" ]; then
--		opts="${opts} plugin passwordfd.so passwordfd 0"
-+		opts="plugin passwordfd.so ${opts} passwordfd 0"
- 	fi
- 	
- 	if ! ${hasdefaultmetric}; then
-@@ -155,7 +155,7 @@ pppd_pre_start()
- 			opts="${opts} connect true"
- 			set -- "$@" "${link}"
- 		fi
--		opts="${opts} plugin $1.so"
-+		opts="plugin $1.so ${opts}"
- 		shift
- 		opts="${opts} $@"
- 	done
--- 
-1.6.4.4
-
diff --git a/sys-apps/openrc/openrc-0.5.2-r2.ebuild b/sys-apps/openrc/openrc-0.5.2-r2.ebuild
deleted file mode 100644
index 47487c05b78d..000000000000
--- a/sys-apps/openrc/openrc-0.5.2-r2.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.2-r2.ebuild,v 1.3 2009/11/13 19:40:33 zzam Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://roy.marples.name/openrc.git"
-	inherit git
-	KEYWORDS=""
-else
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://roy.marples.name/openrc"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD"
-
-RDEPEND="virtual/init
-	kernel_FreeBSD? ( sys-process/fuser-bsd )
-	elibc_glibc? ( >=sys-libs/glibc-2.5 )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	>=sys-apps/baselayout-2.0.0
-	kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 )
-	!<sys-fs/udev-133
-	!<sys-apps/sysvinit-2.86-r11"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-make_args() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
-	MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes"
-
-	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
-	export BRANDING="Gentoo ${brand}"
-}
-
-pkg_setup() {
-	export DEBUG=$(usev debug)
-	export MKPAM=$(usev pam)
-	export MKTERMCAP=$(usev ncurses)
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	sed -i 's:0444:0644:' mk/sys.mk
-	sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342
-	sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264
-	epatch "${FILESDIR}"/${P}-fix-default-domain.patch
-	epatch "${FILESDIR}"/${P}-linux-containers.patch
-	epatch "${FILESDIR}"/${P}-ppp-options.patch
-	epatch "${FILESDIR}"/${P}-fix-iproute2-support.patch
-	epatch "${FILESDIR}"/${P}-dont-wipe-wtmp.patch
-	epatch "${FILESDIR}"/openrc-9999-msg-style.patch
-}
-
-src_compile() {
-	make_args
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-$(echo ${EGIT_VERSION} | cut -c1-8)"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk
-	fi
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
-}
-
-# 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 || die
-
-	# install the readme for the new network scripts
-	dodoc README.net
-
-	# 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
-
-	# Stick with "old" net as the default for now
-	doconfd conf.d/net || die
-	rm -f "${D}"/usr/share/${PN}/network
-	ln -s /etc/init.d/net.lo "${D}"/usr/share/${PN}/net.lo
-
-	# 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 ')'
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-}
-
-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/
-
-	# upgrade timezone file ... do it before moving clock
-	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
-		(
-		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
-
-	# 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 out 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}
-
-	# 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
-
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	# /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
-
-	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"
-}