old

(Portage version: 2.2_rc46/cvs/Linux x86_64)

16 files changed, 0 insertions, 2929 deletions

diff --git a/sys-apps/openrc/files/0.4.0/0001-msg-style.patch b/sys-apps/openrc/files/0.4.0/0001-msg-style.patch
deleted file mode 100644
index ab3559e71a70..000000000000
--- a/sys-apps/openrc/files/0.4.0/0001-msg-style.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 01:48:19 -0400
-Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo.
-
----
- src/libeinfo/libeinfo.c |    9 +++------
- 1 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
-index f8ddcb5..c46cacb 100644
---- a/src/libeinfo/libeinfo.c
-+++ b/src/libeinfo/libeinfo.c
-@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
- 	if (! msg)
- 		return;
- 
--	cols = get_term_columns(fp) - (strlen(msg) + 3);
-+	cols = get_term_columns(fp) - (strlen(msg) + 5);
- 
- 	/* cons25 is special - we need to remove one char, otherwise things
- 	 * do not align properly at all. */
-@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
- 	if (term_is_cons25)
- 		cols--;
- 
--	/* If extra spacing is required around msg, then please change
--	 * via a runtime knob and leave this default as is as it saves 2 
--	 * valuable columns when running on 80 column screens. */
- 	if (cols > 0 && colour_terminal(fp)) {
--		fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
-+		fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
- 			ecolor(ECOLOR_BRACKET), ecolor(color), msg,
- 			ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
- 	} else {
- 		if (col > 0)
- 			for (i = 0; i < cols - col; i++)
- 				fprintf(fp, " ");
--		fprintf(fp, " [%s]\n", msg);
-+		fprintf(fp, " [ %s ]\n", msg);
- 	}
- }
- 
--- 
-1.5.4.4
-
diff --git a/sys-apps/openrc/files/0.4.0/0002-useful-functions.patch b/sys-apps/openrc/files/0.4.0/0002-useful-functions.patch
deleted file mode 100644
index a307386f9504..000000000000
--- a/sys-apps/openrc/files/0.4.0/0002-useful-functions.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 02:03:39 -0400
-Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api
-
----
- sh/functions.sh.in    |   22 ++++++++++++++++++++++
- sh/rc-functions.sh.in |   23 -----------------------
- 2 files changed, 22 insertions(+), 23 deletions(-)
-
-diff --git a/sh/functions.sh.in b/sh/functions.sh.in
-index 57917ed..680f534 100644
---- a/sh/functions.sh.in
-+++ b/sh/functions.sh.in
-@@ -42,6 +42,28 @@ rc_runlevel() {
-     rc-status --runlevel
- }
- 
-+get_bootparam()
-+{
-+	local match="$1"
-+	[ -z "${match}" -o ! -r /proc/cmdline ] && return 1
-+
-+	set -- $(cat /proc/cmdline)
-+	while [ -n "$1" ]; do
-+		case "$1" in
-+			gentoo=*)
-+				local params="${1##*=}"
-+				local IFS=, x=
-+				for x in ${params}; do
-+					[ "${x}" = "${match}" ] && return 0
-+				done
-+				;;
-+		esac
-+		shift
-+	done
-+
-+	return 1
-+}
-+
- _sanitize_path()
- {
- 	local IFS=":" p= path=
-diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
-index 751d47a..c713def 100644
---- a/sh/rc-functions.sh.in
-+++ b/sh/rc-functions.sh.in
-@@ -51,29 +51,6 @@ is_union_fs()
- 	unionctl "$1" --list >/dev/null 2>&1
- }
- 
--get_bootparam()
--{
--	local match="$1"
--	[ -z "${match}" -o ! -r /proc/cmdline ] && return 1
--
--	set -- $(cat /proc/cmdline)
--	while [ -n "$1" ]; do
--		[ "$1" = "${match}" ] && return 0
--		case "$1" in
--			gentoo=*)
--				local params="${1##*=}"
--				local IFS=, x=
--				for x in ${params}; do
--					[ "${x}" = "${match}" ] && return 0
--				done
--				;;
--		esac
--		shift
--	done
--
--	return 1
--}
--
- # Add our sbin to $PATH
- case "${PATH}" in
- 	"${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);;
--- 
-1.6.0.2
-
diff --git a/sys-apps/openrc/files/0.4.0/0003-KV.patch b/sys-apps/openrc/files/0.4.0/0003-KV.patch
deleted file mode 100644
index 8ab646f32c0d..000000000000
--- a/sys-apps/openrc/files/0.4.0/0003-KV.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 03:14:02 -0400
-Subject: [PATCH] add back KV_* funcs
-
----
- sh/functions.sh.in |   35 +++++++++++++++++++++++++++++++++++
- sh/runtests.sh     |   45 +++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 80 insertions(+), 0 deletions(-)
-
-diff --git a/sh/functions.sh.in b/sh/functions.sh.in
-index 140f6dc..0522792 100644
---- a/sh/functions.sh.in
-+++ b/sh/functions.sh.in
-@@ -65,6 +65,41 @@ get_bootparam()
- 	return 1
- }
- 
-+KV_major() {
-+	[ -z "$*" ] && return 1
-+	local KV="$*"
-+	echo ${KV%%.*}
-+}
-+
-+KV_minor() {
-+	[ -z "$*" ] && return 1
-+	local KV="$*"
-+	KV=${KV#*.}
-+	echo ${KV%%.*}
-+}
-+
-+KV_micro() {
-+	[ -z "$*" ] && return 1
-+	local KV="$*"
-+	KV=${KV#*.*.}
-+	echo ${KV%%[![:digit:]]*}
-+}
-+
-+KV_to_int() {
-+	[ -z "$*" ] && return 1
-+	local KV_MAJOR="$(KV_major "$*")"
-+	local KV_MINOR="$(KV_minor "$*")"
-+	local KV_MICRO="$(KV_micro "$*")"
-+	local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))"
-+	echo "${KV_int}"
-+}
-+
-+_RC_GET_KV_CACHE=""
-+get_KV() {
-+	[ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r)
-+	echo $(KV_to_int "${_RC_GET_KV_CACHE}")
-+}
-+
- _sanitize_path()
- {
- 	local IFS=":" p= path=
-diff --git a/sh/runtests.sh b/sh/runtests.sh
-index d0d6a17..debcf4f 100755
---- a/sh/runtests.sh
-+++ b/sh/runtests.sh
-@@ -3,6 +3,19 @@
- top_srcdir=${top_srcdir:-..}
- . ${top_srcdir}/test/setup_env.sh
- 
-+checkit() {
-+	local output=$($1 $3)
-+	local lret=$?
-+	if [ ${lret} -ne 0 ] ; then
-+		((tret+=lret))
-+		echo "FAIL: exec: $*"
-+	fi
-+	if [ "${output}" != "$2" ] ; then
-+		((tret+=lret))
-+		echo "FAIL: output: $* : got='${output}' wanted='$2'"
-+	fi
-+}
-+
- ret=0
- 
- tret=0
-@@ -22,4 +35,36 @@ done
- eend ${tret}
- ((ret+=tret))
- 
-+compare_int() {
-+	local got=$(KV_to_int $1)
-+	local exp=$(KV_to_int $3)
-+	if ! [ ${got} $2 ${exp} ] ; then
-+		((tret+=1))
-+		echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})"
-+	fi
-+}
-+
-+tret=0
-+ebegin "Testing KV_{major,minor,micro,to_int}"
-+for v in \
-+	1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \
-+	1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0"
-+do
-+	checkit KV_major 1 ${v}
-+	checkit KV_minor 2 ${v}
-+	checkit KV_micro 3 ${v}
-+
-+	compare_int 1.2.2 -lt ${v}
-+	compare_int 1.2.2.10 -lt ${v}
-+	compare_int 1.2.4 -gt ${v}
-+	compare_int 1.2.4-rc0 -gt ${v}
-+	compare_int 1.2.3 -eq ${v}
-+	compare_int 1.2.3-rc0 -eq ${v}
-+	compare_int 1.2.3.2 -eq ${v}
-+	compare_int 1.2.3.3 -eq ${v}
-+	compare_int 1.2.3.4 -eq ${v}
-+done
-+eend ${tret}
-+((ret+=tret))
-+
- exit ${ret}
--- 
-1.5.4.4
-
diff --git a/sys-apps/openrc/files/0.4.0/0004-s-s-d-retry.patch b/sys-apps/openrc/files/0.4.0/0004-s-s-d-retry.patch
deleted file mode 100644
index c207c46f14d7..000000000000
--- a/sys-apps/openrc/files/0.4.0/0004-s-s-d-retry.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: /trunk/src/rc/start-stop-daemon.c
-===================================================================
---- /trunk/src/rc/start-stop-daemon.c (revision 1453)
-+++ /trunk/src/rc/start-stop-daemon.c (revision 1460)
-@@ -627,4 +627,5 @@
- 	char *name = NULL;
- 	char *pidfile = NULL;
-+	char *retry = NULL;
- 	int sig = 0;
- 	int nicelevel = 0;
-@@ -695,5 +696,5 @@
- 
- 		case 'R':  /* --retry <schedule>|<timeout> */
--			parse_schedule(optarg, sig);
-+			retry = optarg;
- 			break;
- 
-@@ -854,5 +855,7 @@
- 		*--argv = exec;
- 
--	if (stop || sig) {
-+	if (stop || sig != 0) {
-+		if (sig == 0)
-+			sig = SIGTERM;
- 		if (!*argv && !pidfile && !name && !uid)
- 			eerrorx("%s: --stop needs --exec, --pidfile,"
-@@ -877,4 +880,5 @@
- 				" with --background", applet);
- 	}
-+
- 	/* Expand ~ */
- 	if (ch_dir && *ch_dir == '~')
-@@ -956,14 +960,14 @@
- 
- 	if (stop || sig) {
--		if (!sig)
-+		if (sig == 0)
- 			sig = SIGTERM;
- 		if (!stop)
- 			oknodo = true;
--		if (!TAILQ_FIRST(&schedule)) {
--			if (test || oknodo)
--				parse_schedule("0", sig);
--			else
--				parse_schedule(NULL, sig);
--		}
-+		if (retry)
-+			parse_schedule(retry, sig);
-+		else if (test || oknodo)
-+			parse_schedule("0", sig);
-+		else
-+			parse_schedule(NULL, sig);
- 		i = run_stop_schedule(exec, (const char *const *)margv,
- 				      pidfile, uid, quiet, verbose, test);
diff --git a/sys-apps/openrc/files/0.4.0/0005-init-script-novserver.patch b/sys-apps/openrc/files/0.4.0/0005-init-script-novserver.patch
deleted file mode 100644
index 91e14b60c0b0..000000000000
--- a/sys-apps/openrc/files/0.4.0/0005-init-script-novserver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: init.d/dmesg.in
-===================================================================
---- init.d/dmesg.in	(revision 1465)
-+++ init.d/dmesg.in	(working copy)
-@@ -7,6 +7,7 @@
- depend()
- {
- 	before dev modules
-+	keyword novserver
- }
- 
- start()
-Index: init.d/sysfs.in
-===================================================================
---- init.d/sysfs.in	(revision 1465)
-+++ init.d/sysfs.in	(working copy)
-@@ -6,7 +6,7 @@
- 
- depend()
- {
--	keyword noprefix
-+	keyword noprefix novserver
- }
- 
- mount_sys()
diff --git a/sys-apps/openrc/files/0.4.2/0004-svn-version.patch b/sys-apps/openrc/files/0.4.2/0004-svn-version.patch
deleted file mode 100644
index a2f9e1ecaddf..000000000000
--- a/sys-apps/openrc/files/0.4.2/0004-svn-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openrc-0.4.2/src/rc/Makefile
-===================================================================
---- openrc-0.4.2.orig/src/rc/Makefile
-+++ openrc-0.4.2/src/rc/Makefile
-@@ -45,7 +45,7 @@ include ${MK}/${MKPAM}.mk
- 
- _SVNVER_SH=	ret=""; \
- 		if type svnversion >/dev/null 2>&1; then \
--			svnver="$$(svnversion)"; \
-+			svnver="$$(LC_ALL=C svnversion)"; \
- 			[ "$${svnver}" != exported ] && ret="-svn-$${svnver}"; \
- 		fi; \
- 		echo "$${ret}";
diff --git a/sys-apps/openrc/files/0.5.1/0001-msg-style.patch b/sys-apps/openrc/files/0.5.1/0001-msg-style.patch
deleted file mode 100644
index 0ba3697facf5..000000000000
--- a/sys-apps/openrc/files/0.5.1/0001-msg-style.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 01:48:19 -0400
-Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo.
-
----
- src/libeinfo/libeinfo.c |    9 +++------
- 1 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
-index f8ddcb5..c46cacb 100644
---- a/src/libeinfo/libeinfo.c
-+++ b/src/libeinfo/libeinfo.c
-@@ -817,7 +817,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
- 	if (!msg)
- 		return;
- 
--	cols = get_term_columns(fp) - (strlen(msg) + 3);
-+	cols = get_term_columns(fp) - (strlen(msg) + 5);
- 
- 	/* cons25 is special - we need to remove one char, otherwise things
- 	 * do not align properly at all. */
-@@ -831,18 +831,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
- 	if (term_is_cons25)
- 		cols--;
- 
--	/* If extra spacing is required around msg, then please change
--	 * via a runtime knob and leave this default as is as it saves 2 
--	 * valuable columns when running on 80 column screens. */
- 	if (cols > 0 && colour_terminal(fp)) {
--		fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
-+		fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
- 		    ecolor(ECOLOR_BRACKET), ecolor(color), msg,
- 		    ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
- 	} else {
- 		if (col > 0)
- 			for (i = 0; i < cols - col; i++)
- 				fprintf(fp, " ");
--		fprintf(fp, " [%s]\n", msg);
-+		fprintf(fp, " [ %s ]\n", msg);
- 	}
- }
- 
--- 
-1.5.4.4
-
diff --git a/sys-apps/openrc/files/0.5.1/0002-useful-functions.patch b/sys-apps/openrc/files/0.5.1/0002-useful-functions.patch
deleted file mode 100644
index edd226c48d3a..000000000000
--- a/sys-apps/openrc/files/0.5.1/0002-useful-functions.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 02:03:39 -0400
-Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api
-
----
- sh/functions.sh.in    |   22 ++++++++++++++++++++++
- sh/rc-functions.sh.in |   23 -----------------------
- 2 files changed, 22 insertions(+), 23 deletions(-)
-
-diff --git a/sh/functions.sh.in b/sh/functions.sh.in
-index 3f41f8f..be5285c 100644
---- a/sh/functions.sh.in
-+++ b/sh/functions.sh.in
-@@ -42,6 +42,29 @@ rc_runlevel() {
-     rc-status --runlevel
- }
- 
-+get_bootparam()
-+{
-+	local match="$1"
-+	[ -z "$match" -o ! -r /proc/cmdline ] && return 1
-+
-+	set -- $(cat /proc/cmdline)
-+	while [ -n "$1" ]; do
-+		[ "$1" = "$match" ] && return 0
-+		case "$1" in
-+			gentoo=*)
-+				local params="${1##*=}"
-+				local IFS=, x=
-+				for x in $params; do
-+					[ "$x" = "$match" ] && return 0
-+				done
-+				;;
-+		esac
-+		shift
-+	done
-+
-+	return 1
-+}
-+
- _sanitize_path()
- {
- 	local IFS=":" p= path=
-diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
-index ebdb768..68cd6e7 100644
---- a/sh/rc-functions.sh.in
-+++ b/sh/rc-functions.sh.in
-@@ -61,29 +61,6 @@ is_union_fs()
- 	unionctl "$1" --list >/dev/null 2>&1
- }
- 
--get_bootparam()
--{
--	local match="$1"
--	[ -z "$match" -o ! -r /proc/cmdline ] && return 1
--
--	set -- $(cat /proc/cmdline)
--	while [ -n "$1" ]; do
--		[ "$1" = "$match" ] && return 0
--		case "$1" in
--			gentoo=*)
--				local params="${1##*=}"
--				local IFS=, x=
--				for x in $params; do
--					[ "$x" = "$match" ] && return 0
--				done
--				;;
--		esac
--		shift
--	done
--
--	return 1
--}
--
- # Add our sbin to $PATH
- case "$PATH" in
- 	"$RC_LIBDIR"/sbin|"$RC_LIBDIR"/sbin:*);;
diff --git a/sys-apps/openrc/files/0.5.1/0003-KV.patch b/sys-apps/openrc/files/0.5.1/0003-KV.patch
deleted file mode 100644
index 95e1035f0546..000000000000
--- a/sys-apps/openrc/files/0.5.1/0003-KV.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Mar 2008 03:14:02 -0400
-Subject: [PATCH] add back KV_* funcs
-
----
- sh/functions.sh.in |   35 +++++++++++++++++++++++++++++++++++
- sh/runtests.sh     |   45 +++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 80 insertions(+), 0 deletions(-)
-
-diff --git a/sh/functions.sh.in b/sh/functions.sh.in
-index 140f6dc..0522792 100644
---- a/sh/functions.sh.in
-+++ b/sh/functions.sh.in
-@@ -65,6 +65,41 @@ get_bootparam()
- 	return 1
- }
- 
-+KV_major() {
-+	[ -z "$*" ] && return 1
-+	local KV="$*"
-+	echo ${KV%%.*}
-+}
-+
-+KV_minor() {
-+	[ -z "$*" ] && return 1
-+	local KV="$*"
-+	KV=${KV#*.}
-+	echo ${KV%%.*}
-+}
-+
-+KV_micro() {
-+	[ -z "$*" ] && return 1
-+	local KV="$*"
-+	KV=${KV#*.*.}
-+	echo ${KV%%[![:digit:]]*}
-+}
-+
-+KV_to_int() {
-+	[ -z "$*" ] && return 1
-+	local KV_MAJOR="$(KV_major "$*")"
-+	local KV_MINOR="$(KV_minor "$*")"
-+	local KV_MICRO="$(KV_micro "$*")"
-+	local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))"
-+	echo "${KV_int}"
-+}
-+
-+_RC_GET_KV_CACHE=""
-+get_KV() {
-+	[ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r)
-+	echo $(KV_to_int "${_RC_GET_KV_CACHE}")
-+}
-+
- _sanitize_path()
- {
- 	local IFS=":" p= path=
-diff --git a/sh/runtests.sh b/sh/runtests.sh
-index d0d6a17..debcf4f 100755
---- a/sh/runtests.sh
-+++ b/sh/runtests.sh
-@@ -3,6 +3,19 @@
- : ${top_srcdir:=..}
- . $top_srcdir/test/setup_env.sh
- 
-+checkit() {
-+	local output=$($1 $3)
-+	local lret=$?
-+	if [ ${lret} -ne 0 ] ; then
-+		((tret+=lret))
-+		echo "FAIL: exec: $*"
-+	fi
-+	if [ "${output}" != "$2" ] ; then
-+		((tret+=lret))
-+		echo "FAIL: output: $* : got='${output}' wanted='$2'"
-+	fi
-+}
-+
- ret=0
- 
- tret=0
-@@ -22,4 +35,36 @@ done
- eend $tret
- ret=$(($ret + $tret))
- 
-+compare_int() {
-+	local got=$(KV_to_int $1)
-+	local exp=$(KV_to_int $3)
-+	if ! [ ${got} $2 ${exp} ] ; then
-+		((tret+=1))
-+		echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})"
-+	fi
-+}
-+
-+tret=0
-+ebegin "Testing KV_{major,minor,micro,to_int}"
-+for v in \
-+	1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \
-+	1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0"
-+do
-+	checkit KV_major 1 ${v}
-+	checkit KV_minor 2 ${v}
-+	checkit KV_micro 3 ${v}
-+
-+	compare_int 1.2.2 -lt ${v}
-+	compare_int 1.2.2.10 -lt ${v}
-+	compare_int 1.2.4 -gt ${v}
-+	compare_int 1.2.4-rc0 -gt ${v}
-+	compare_int 1.2.3 -eq ${v}
-+	compare_int 1.2.3-rc0 -eq ${v}
-+	compare_int 1.2.3.2 -eq ${v}
-+	compare_int 1.2.3.3 -eq ${v}
-+	compare_int 1.2.3.4 -eq ${v}
-+done
-+eend ${tret}
-+: $((ret+=tret))
-+
- exit $ret
--- 
-1.5.4.4
-
diff --git a/sys-apps/openrc/openrc-0.4.1-r1.ebuild b/sys-apps/openrc/openrc-0.4.1-r1.ebuild
deleted file mode 100644
index 38e405564a7c..000000000000
--- a/sys-apps/openrc/openrc-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.1-r1.ebuild,v 1.3 2008/12/31 21:31:40 cardoe Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
-	EGIT_BRANCH="master"
-	inherit git
-else
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2
-		mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
-		http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-fi
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://roy.marples.name/openrc"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-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"
-
-pkg_setup() {
-	LIBDIR="lib"
-	[ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}"
-
-	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}"
-
-	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}"
-	epatch "${FILESDIR}"/0.4.0/*.patch
-}
-
-src_compile() {
-	# catch people running `ebuild` w/out setup
-	if [[ -z ${MAKE_ARGS} ]] ; then
-		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)"
-		sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile
-	fi
-
-	tc-export CC AR RANLIB
-	echo emake ${MAKE_ARGS}
-	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed"
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	keepdir /"${LIBDIR}"/rc/init.d
-	keepdir /"${LIBDIR}"/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
-
-	# Setup unicode defaults for silly unicode users
-	use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf
-
-	# Cater to the norm
-	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
-}
-
-add_boot_init() {
-	local initd=$1
-	# 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/boot/${initd} ]] && return
-	elog "Auto-adding '${initd}' service to your boot runlevel"
-	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${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
-
-	# default net script is just comments, so no point in biting people
-	# in the ass by accident
-	mv "${D}"/etc/conf.d/net "${T}"/
-	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
-
-	# 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
-
-	# openrc-0.4.0 no longer loads the udev addon
-	enable_udev=0
-	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
-		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
-		! has_version ">=sys-apps/openrc-0.4.0"
-	then
-		# make sure udev is in sysinit if it was enabled before
-		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=1
-				;;
-		esac
-	fi
-
-	# skip remaining migration if we already have openrc installed
-	has_version sys-apps/openrc && return 0
-
-	# baselayout boot init scripts have been split out
-	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		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() {
-	# Remove old baselayout links
-	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
-
-	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
-	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
-
-	if [[ "$enable_udev" = 1 ]]; then
-		elog "Auto adding udev init script to the sysinit runlevel"
-		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
-	fi
-
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	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"
-}
diff --git a/sys-apps/openrc/openrc-0.4.2.ebuild b/sys-apps/openrc/openrc-0.4.2.ebuild
deleted file mode 100644
index 71ab0c7df3ba..000000000000
--- a/sys-apps/openrc/openrc-0.4.2.ebuild
+++ /dev/null
@@ -1,314 +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.4.2.ebuild,v 1.2 2009/01/31 14:34:36 zzam Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk"
-	inherit subversion
-else
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2
-		mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
-		http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-fi
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://roy.marples.name/openrc"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-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"
-
-pkg_setup() {
-	LIBDIR="lib"
-	[ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}"
-
-	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}"
-
-	export DEBUG=$(usev debug)
-	export MKPAM=$(usev pam)
-	export MKTERMCAP=$(usev ncurses)
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		subversion_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	epatch "${FILESDIR}"/0.4.2/*.patch
-}
-
-src_compile() {
-	# catch people running `ebuild` w/out setup
-	if [[ -z ${MAKE_ARGS} ]] ; then
-		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svnversion)"
-		sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile
-	fi
-
-	tc-export CC AR RANLIB
-	echo emake ${MAKE_ARGS}
-	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed"
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	keepdir /"${LIBDIR}"/rc/init.d
-	keepdir /"${LIBDIR}"/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
-
-	# Setup unicode defaults for silly unicode users
-	use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf
-
-	# Cater to the norm
-	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
-}
-
-add_boot_init() {
-	local initd=$1
-	# 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/boot/${initd} ]] && return
-	elog "Auto-adding '${initd}' service to your boot runlevel"
-	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${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
-
-	# default net script is just comments, so no point in biting people
-	# in the ass by accident
-	mv "${D}"/etc/conf.d/net "${T}"/
-	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
-
-	# 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
-
-	# openrc-0.4.0 no longer loads the udev addon
-	enable_udev=0
-	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
-		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
-		! has_version ">=sys-apps/openrc-0.4.0"
-	then
-		# make sure udev is in sysinit if it was enabled before
-		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=1
-				;;
-		esac
-	fi
-
-	# skip remaining migration if we already have openrc installed
-	has_version sys-apps/openrc && return 0
-
-	# baselayout boot init scripts have been split out
-	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		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() {
-	# Remove old baselayout links
-	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
-
-	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
-	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
-
-	if [[ "$enable_udev" = 1 ]]; then
-		elog "Auto adding udev init script to the sysinit runlevel"
-		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
-	fi
-
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	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"
-}
diff --git a/sys-apps/openrc/openrc-0.4.3-r1.ebuild b/sys-apps/openrc/openrc-0.4.3-r1.ebuild
deleted file mode 100644
index 2bb38663c6e1..000000000000
--- a/sys-apps/openrc/openrc-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,317 +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.4.3-r1.ebuild,v 1.2 2009/04/18 10:40:17 hollow Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk"
-	inherit subversion
-else
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2
-		mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
-		http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-fi
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://roy.marples.name/openrc"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-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"
-
-pkg_setup() {
-	LIBDIR="lib"
-	[ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}")
-
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}"
-
-	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}"
-
-	export DEBUG=$(usev debug)
-	export MKPAM=$(usev pam)
-	export MKTERMCAP=$(usev ncurses)
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		subversion_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	epatch "${FILESDIR}"/0.4.2/0001-msg-style.patch
-	epatch "${FILESDIR}"/0.4.2/0002-useful-functions.patch
-	epatch "${FILESDIR}"/0.4.2/0003-KV.patch
-	epatch "${FILESDIR}"/0.4.3/0001-fix-is_older_than.patch
-}
-
-src_compile() {
-	# catch people running `ebuild` w/out setup
-	if [[ -z ${MAKE_ARGS} ]] ; then
-		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svnversion)"
-		sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile
-	fi
-
-	tc-export CC AR RANLIB
-	echo emake ${MAKE_ARGS}
-	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed"
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	keepdir /"${LIBDIR}"/rc/init.d
-	keepdir /"${LIBDIR}"/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
-
-	# Setup unicode defaults for silly unicode users
-	use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf
-
-	# Cater to the norm
-	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
-}
-
-add_boot_init() {
-	local initd=$1
-	# 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/boot/${initd} ]] && return
-	elog "Auto-adding '${initd}' service to your boot runlevel"
-	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${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
-
-	# default net script is just comments, so no point in biting people
-	# in the ass by accident
-	mv "${D}"/etc/conf.d/net "${T}"/
-	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
-
-	# 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
-
-	# openrc-0.4.0 no longer loads the udev addon
-	enable_udev=0
-	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
-		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
-		! has_version ">=sys-apps/openrc-0.4.0"
-	then
-		# make sure udev is in sysinit if it was enabled before
-		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=1
-				;;
-		esac
-	fi
-
-	# skip remaining migration if we already have openrc installed
-	has_version sys-apps/openrc && return 0
-
-	# baselayout boot init scripts have been split out
-	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		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() {
-	# Remove old baselayout links
-	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
-
-	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
-	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
-
-	if [[ "$enable_udev" = 1 ]]; then
-		elog "Auto adding udev init script to the sysinit runlevel"
-		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
-	fi
-
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	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"
-}
diff --git a/sys-apps/openrc/openrc-0.4.3-r2.ebuild b/sys-apps/openrc/openrc-0.4.3-r2.ebuild
deleted file mode 100644
index 27d1f734f0d4..000000000000
--- a/sys-apps/openrc/openrc-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,321 +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.4.3-r2.ebuild,v 1.3 2009/06/08 19:38:42 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk"
-	inherit subversion
-else
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2
-		mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
-		http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-fi
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://roy.marples.name/openrc"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-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"
-
-pkg_setup() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir)"
-
-	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}"
-
-	export DEBUG=$(usev debug)
-	export MKPAM=$(usev pam)
-	export MKTERMCAP=$(usev ncurses)
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		subversion_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	sed -i 's:0444:0644:' mk/sys.mk
-	epatch "${FILESDIR}"/0.4.2/0001-msg-style.patch
-	epatch "${FILESDIR}"/0.4.2/0002-useful-functions.patch
-	epatch "${FILESDIR}"/0.4.2/0003-KV.patch
-	epatch "${FILESDIR}"/0.4.3/0001-fix-is_older_than.patch
-	epatch "${FILESDIR}"/0.4.3/0002-support-custom-status.patch
-}
-
-src_compile() {
-	# catch people running `ebuild` w/out setup
-	if [[ -z ${MAKE_ARGS} ]] ; then
-		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svnversion)"
-		sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile
-	fi
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die
-	gen_usr_ldscript -a einfo rc
-
-	keepdir /$(get_libdir)/rc/{init.d,tmp}
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
-
-	# Setup unicode defaults for silly unicode users
-	use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf
-
-	# Cater to the norm
-	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
-}
-
-add_boot_init() {
-	local initd=$1
-	# 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/boot/${initd} ]] && return
-	elog "Auto-adding '${initd}' service to your boot runlevel"
-	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${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
-	mv "${D}"/etc/conf.d/net "${T}"/
-	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
-
-	# 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
-
-	# openrc-0.4.0 no longer loads the udev addon
-	enable_udev=0
-	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
-		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
-		! has_version ">=sys-apps/openrc-0.4.0"
-	then
-		# make sure udev is in sysinit if it was enabled before
-		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=1
-				;;
-		esac
-	fi
-
-	# skip remaining migration if we already have openrc installed
-	has_version sys-apps/openrc && return 0
-
-	# baselayout boot init scripts have been split out
-	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		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}
-
-	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
-	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
-
-	if [[ "$enable_udev" = 1 ]]; then
-		elog "Auto adding udev init script to the sysinit runlevel"
-		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
-	fi
-
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	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"
-}
diff --git a/sys-apps/openrc/openrc-0.4.3-r3.ebuild b/sys-apps/openrc/openrc-0.4.3-r3.ebuild
deleted file mode 100644
index c562ec3f9aaa..000000000000
--- a/sys-apps/openrc/openrc-0.4.3-r3.ebuild
+++ /dev/null
@@ -1,334 +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.4.3-r3.ebuild,v 1.4 2009/08/23 09:19:10 vapier Exp $
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk"
-	inherit subversion
-else
-	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2
-		mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
-		http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
-fi
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="http://roy.marples.name/openrc"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-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"
-
-pkg_setup() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir)"
-
-	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}"
-
-	export DEBUG=$(usev debug)
-	export MKPAM=$(usev pam)
-	export MKTERMCAP=$(usev ncurses)
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		subversion_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	sed -i 's:0444:0644:' mk/sys.mk
-	epatch "${FILESDIR}"/0.4.2/0001-msg-style.patch
-	epatch "${FILESDIR}"/0.4.2/0002-useful-functions.patch
-	epatch "${FILESDIR}"/0.4.2/0003-KV.patch
-	epatch "${FILESDIR}"/0.4.3/0001-fix-is_older_than.patch
-	epatch "${FILESDIR}"/0.4.3/0002-support-custom-status.patch
-	epatch "${FILESDIR}"/0.4.3/0003-command-line-size-fix.patch
-}
-
-src_compile() {
-	# catch people running `ebuild` w/out setup
-	if [[ -z ${MAKE_ARGS} ]] ; then
-		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svnversion)"
-		sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile
-	fi
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
-
-	# 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}"
-	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
-
-	# Setup unicode defaults for silly unicode users
-	use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf
-
-	# Cater to the norm
-	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
-}
-
-add_boot_init() {
-	local initd=$1
-	# 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/boot/${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/boot ]] ; then
-		mkdir -p "${ROOT}"/etc/runlevels/boot
-		touch "${ROOT}"/etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your boot runlevel"
-	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${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
-	mv "${D}"/etc/conf.d/net "${T}"/
-	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
-
-	# 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
-
-	# openrc-0.4.0 no longer loads the udev addon
-	enable_udev=0
-	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
-		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
-		! has_version ">=sys-apps/openrc-0.4.0"
-	then
-		# make sure udev is in sysinit if it was enabled before
-		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=1
-				;;
-		esac
-	fi
-
-	# skip remaining migration if we already have openrc installed
-	has_version sys-apps/openrc && return 0
-
-	# baselayout boot init scripts have been split out
-	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		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}
-
-	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
-
-	# 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
-
-	if [[ "$enable_udev" = 1 ]]; then
-		elog "Auto adding udev init script to the sysinit runlevel"
-		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
-	fi
-
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	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"
-}
diff --git a/sys-apps/openrc/openrc-0.5.1-r1.ebuild b/sys-apps/openrc/openrc-0.5.1-r1.ebuild
deleted file mode 100644
index 803fbc240df3..000000000000
--- a/sys-apps/openrc/openrc-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,367 +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.1-r1.ebuild,v 1.5 2009/10/18 18:13:08 tommy 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
-		mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
-		http://dev.gentoo.org/~vapier/dist/${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
-	[[ -d ${FILESDIR}/${PV} ]] \
-		&& epatch "${FILESDIR}"/${PV}/*.patch \
-		|| epatch "${FILESDIR}"/9999/*.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
-
-	# 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
-	# 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/boot/${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/boot ]] ; then
-		mkdir -p "${ROOT}"/etc/runlevels/boot
-		touch "${ROOT}"/etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your boot runlevel"
-	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${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
-
-	# openrc-0.4.0 no longer loads the udev addon
-	enable_udev=0
-	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
-		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
-		! has_version ">=sys-apps/openrc-0.4.0"
-	then
-		# make sure udev is in sysinit if it was enabled before
-		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=1
-				;;
-		esac
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# skip remaining migration if we already have openrc installed
-	has_version sys-apps/openrc || migrate_from_baselayout_1
-}
-
-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
-
-	if [[ "$enable_udev" = 1 ]]; then
-		elog "Auto adding udev init script to the sysinit runlevel"
-		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
-	fi
-
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	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"
-}
diff --git a/sys-apps/openrc/openrc-0.5.1.ebuild b/sys-apps/openrc/openrc-0.5.1.ebuild
deleted file mode 100644
index fd0637cee468..000000000000
--- a/sys-apps/openrc/openrc-0.5.1.ebuild
+++ /dev/null
@@ -1,379 +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.1.ebuild,v 1.4 2009/10/15 00:49:31 vapier 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
-		mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2
-		http://dev.gentoo.org/~vapier/dist/${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 +oldnet"
-
-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"
-
-pkg_setup() {
-	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 oldnet; then
-		MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes"
-	fi
-	export BRANDING="Gentoo ${brand}"
-
-	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
-	epatch "${FILESDIR}"/0.5.1/0001-msg-style.patch
-	epatch "${FILESDIR}"/0.5.1/0002-useful-functions.patch
-	epatch "${FILESDIR}"/0.5.1/0003-KV.patch
-}
-
-src_compile() {
-	# catch people running `ebuild` w/out setup
-	if [[ -z ${MAKE_ARGS} ]] ; then
-		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
-	fi
-
-	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_conf() {
-	local file="${D}/$1" var=$2 val=NO u
-	shift 2
-	for u ; do use $u && val=YES ; done
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?[^ ]*\1:=\1${val}\1:;s:^#::}" "${file}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
-
-	# 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}"
-	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
-
-	# Setup unicode defaults for silly unicode users
-	set_conf /etc/rc.conf unicode unicode
-
-	# Cater to the norm
-	set_conf /etc/conf.d/keymaps windowkeys x86 amd64
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/openrc.logrotate" openrc
-
-	# makefile does no longer install conf.d/net in use oldnet case, so store it
-	# where we can find it at merge time
-	if use oldnet; then
-		insinto /usr/share/doc/${PN}
-		newins conf.d/net net.default
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	# 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/boot/${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/boot ]] ; then
-		mkdir -p "${ROOT}"/etc/runlevels/boot
-		touch "${ROOT}"/etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your boot runlevel"
-	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${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)
-
-	if use oldnet; then
-		# default net script is just comments, so no point in biting people
-		# in the ass by accident
-		# Can this code be moved to pkg_postinst
-		# or does it have side effects like protecting conf.d/net if old version
-		# had it in CONTENTS and it get removed if not copying it here??
-		cp "${D}"/usr/share/doc/${PN}/net.default "${T}"/net
-		[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/
-	fi
-
-	# 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
-
-	if use oldnet; then
-		# 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
-	fi
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# openrc-0.4.0 no longer loads the udev addon
-	enable_udev=0
-	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
-		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
-		! has_version ">=sys-apps/openrc-0.4.0"
-	then
-		# make sure udev is in sysinit if it was enabled before
-		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=1
-				;;
-		esac
-	fi
-
-	if ! use oldnet; then
-		local f= links=$(find "${ROOT}"/etc/runlevels/ -name "net.*")
-		if [[ "${links}" != "" ]] ; then
-			ewarn "You have disabled installation of old-style network scripts"
-			ewarn "but they are still enabled in some runlevels:"
-			for f in $links; do
-				ewarn "\t$f"
-			done
-			ewarn "You should migrate the settings"
-			ewarn "from /etc/conf.d/net to /etc/conf.d/network"
-			ewarn "and clean runlevels from /etc/init.d/net.* and"
-			ewarn "instead add /etc/init.d/network"
-		fi
-	fi
-
-	# skip remaining migration if we already have openrc installed
-	has_version sys-apps/openrc && return 0
-
-	# baselayout boot init scripts have been split out
-	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		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}
-
-	if use oldnet; then
-		[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
-	fi
-
-	# 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
-
-	if [[ "$enable_udev" = 1 ]]; then
-		elog "Auto adding udev init script to the sysinit runlevel"
-		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
-	fi
-
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	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"
-}