removed old version

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

8 files changed, 9 insertions, 925 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 3d1524141838..a325bff901d2 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.92 2009/11/08 19:43:41 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.93 2009/11/08 23:15:43 williamh Exp $
+
+  08 Nov 2009; William Hubbs <williamh@gentoo.org>
+  -files/0.4.2/0001-msg-style.patch,
+  -files/0.4.2/0002-useful-functions.patch, -files/0.4.2/0003-KV.patch,
+  -files/0.4.3/0001-fix-is_older_than.patch,
+  -files/0.4.3/0002-support-custom-status.patch, -openrc-0.4.3-r4.ebuild,
+  -files/0.4.3/0003-command-line-size-fix.patch:
+  removed old version
 
   08 Nov 2009; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
   Fix the live ebuild to remove /etc/conf.d/net.example and
diff --git a/sys-apps/openrc/files/0.4.2/0001-msg-style.patch b/sys-apps/openrc/files/0.4.2/0001-msg-style.patch
deleted file mode 100644
index ab3559e71a70..000000000000
--- a/sys-apps/openrc/files/0.4.2/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.2/0002-useful-functions.patch b/sys-apps/openrc/files/0.4.2/0002-useful-functions.patch
deleted file mode 100644
index a307386f9504..000000000000
--- a/sys-apps/openrc/files/0.4.2/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.2/0003-KV.patch b/sys-apps/openrc/files/0.4.2/0003-KV.patch
deleted file mode 100644
index 8ab646f32c0d..000000000000
--- a/sys-apps/openrc/files/0.4.2/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.3/0001-fix-is_older_than.patch b/sys-apps/openrc/files/0.4.3/0001-fix-is_older_than.patch
deleted file mode 100644
index 263e06a000c4..000000000000
--- a/sys-apps/openrc/files/0.4.3/0001-fix-is_older_than.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: src/librc/librc-depend.c
-===================================================================
---- src/librc/librc-depend.c	(Revision 1497)
-+++ src/librc/librc-depend.c	(Revision 1498)
-@@ -565,27 +565,31 @@
- 		return true;
- 
- 	if (newer) {
--		if (mtime < buf.st_mtime)
-+		if (mtime < buf.st_mtime) {
-+			if (rel == NULL)
-+				return false;
- 			retval = false;
-+		}
- 		if (rel != NULL) {
- 			if (*rel < buf.st_mtime) {
- 				if (file)
- 					strlcpy(file, target, PATH_MAX);
- 				*rel = buf.st_mtime;
- 			}
--		} else
--			return retval;
-+		}
- 	} else {
--		if (mtime > buf.st_mtime)
-+		if (mtime > buf.st_mtime) {
-+			if (rel == NULL)
-+				return false;
- 			retval = false;
-+		}
- 		if (rel != NULL) {
- 			if (*rel > buf.st_mtime) {
- 				if (file)
- 					strlcpy(file, target, PATH_MAX);
- 				*rel = buf.st_mtime;
- 			}
--		} else
--			return retval;
-+		}
- 	}
- 
- 	/* If not a dir then reset errno */
diff --git a/sys-apps/openrc/files/0.4.3/0002-support-custom-status.patch b/sys-apps/openrc/files/0.4.3/0002-support-custom-status.patch
deleted file mode 100644
index 7459eacdd3db..000000000000
--- a/sys-apps/openrc/files/0.4.3/0002-support-custom-status.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Index: openrc-0.4.3/sh/runscript.sh.in
-===================================================================
---- openrc-0.4.3.orig/sh/runscript.sh.in
-+++ openrc-0.4.3/sh/runscript.sh.in
-@@ -45,7 +45,32 @@ describe()
- 	done
- }
- 
--# Template start / stop functions
-+# Report status
-+_status()
-+{
-+	if service_stopping; then
-+		ewarn "status: stopping"
-+		return 4
-+	elif service_starting; then
-+		ewarn "status: starting"
-+		return 8
-+	elif service_inactive; then
-+		ewarn "status: inactive"
-+		return 16
-+	elif service_started; then
-+		if service_crashed; then
-+			eerror "status: crashed"
-+			return 32
-+		fi
-+		einfo "status: started"
-+		return 0
-+	else
-+		einfo "status: stopped"
-+		return 1
-+	fi
-+}
-+
-+# Template start / stop / status functions
- start()
- {
- 	[ -n "${command}" ] || return 0
-@@ -85,6 +110,11 @@ stop()
- 	eend $? "Failed to stop ${RC_SVCNAME}"
- }
- 
-+status()
-+{
-+	_status
-+}
-+
- yesno ${RC_DEBUG} && set -x
- 
- _conf_d=${RC_SERVICE%/*}/../conf.d
-@@ -134,7 +164,7 @@ unset _f
- 
- while [ -n "$1" ]; do
- 	# See if we have the required function and run it
--	for _cmd in describe start stop ${extra_commands:-${opts}} \
-+	for _cmd in describe start stop status ${extra_commands:-${opts}} \
- 		${extra_started_commands}; do
- 		if [ "${_cmd}" = "$1" ]; then
- 			if [ "$(command -v "$1")" = "$1" ]; then
-Index: openrc-0.4.3/src/rc/Makefile
-===================================================================
---- openrc-0.4.3.orig/src/rc/Makefile
-+++ openrc-0.4.3/src/rc/Makefile
-@@ -18,7 +18,7 @@ RC_BINLINKS=	einfon einfo ewarnn ewarn e
- 		service_starting service_started \
- 		service_stopping service_stopped \
- 		service_inactive service_wasinactive \
--		service_hotplugged service_started_daemon \
-+		service_hotplugged service_started_daemon service_crashed \
- 		checkpath fstabinfo mountinfo rc-depend \
- 		service_get_value service_set_value get_options save_options \
- 		shell_var is_newer_than is_older_than
-Index: openrc-0.4.3/src/rc/rc-applets.c
-===================================================================
---- openrc-0.4.3.orig/src/rc/rc-applets.c
-+++ openrc-0.4.3/src/rc/rc-applets.c
-@@ -295,6 +295,10 @@ static int do_service(int argc, char **a
- 		}
- 		ok = rc_service_started_daemon(service, exec, NULL, idx);
- 			
-+	} else if (strcmp(applet, "service_crashed") == 0) {
-+		ok = (_rc_can_find_pids() &&
-+				rc_service_daemons_crashed(service) &&
-+				errno != EACCES);
- 	} else
- 		eerrorx("%s: unknown applet", applet);
- 
-Index: openrc-0.4.3/src/rc/runscript.c
-===================================================================
---- openrc-0.4.3.orig/src/rc/runscript.c
-+++ openrc-0.4.3/src/rc/runscript.c
-@@ -34,6 +34,7 @@
- #include <sys/file.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-+#include <sys/wait.h>
- 
- #include <ctype.h>
- #include <dlfcn.h>
-@@ -412,11 +413,10 @@ write_prefix(const char *buffer, size_t 
- 	return ret;
- }
- 
--static bool
-+static int
- svc_exec(const char *arg1, const char *arg2)
- {
--	bool execok;
--	int fdout = fileno(stdout);
-+	int ret, fdout = fileno(stdout);
- 	struct termios tt;
- 	struct winsize ws;
- 	int i;
-@@ -527,13 +527,13 @@ svc_exec(const char *arg1, const char *a
- 		master_tty = -1;
- 	}
- 
--	execok = rc_waitpid(service_pid) == 0 ? true : false;
--	if (!execok && errno == ECHILD)
-+	ret = WEXITSTATUS(rc_waitpid(service_pid));
-+	if (ret != 0 && errno == ECHILD)
- 		/* killall5 -9 could cause this */
--		execok = true;
-+		ret = 0;
- 	service_pid = 0;
- 
--	return execok;
-+	return ret;
- }
- 
- static bool
-@@ -584,39 +584,6 @@ svc_wait(const char *svc)
- 	return retval;
- }
- 
--static RC_SERVICE
--svc_status(void)
--{
--	char status[10];
--	int (*e) (const char *fmt, ...) EINFO_PRINTF(1, 2) = einfo;
--	RC_SERVICE state = rc_service_state(service);
--
--	if (state & RC_SERVICE_STOPPING) {
--		snprintf(status, sizeof(status), "stopping");
--		e = ewarn;
--	} else if (state & RC_SERVICE_STARTING) {
--		snprintf(status, sizeof(status), "starting");
--		e = ewarn;
--	} else if (state & RC_SERVICE_INACTIVE) {
--		snprintf(status, sizeof(status), "inactive");
--		e = ewarn;
--	} else if (state & RC_SERVICE_STARTED) {
--		errno = 0;
--		if (_rc_can_find_pids() &&
--		    rc_service_daemons_crashed(service) &&
--		    errno != EACCES)
--		{
--			snprintf(status, sizeof(status), "crashed");
--			e = eerror;
--		} else
--			snprintf(status, sizeof(status), "started");
--	} else
--		snprintf(status, sizeof(status), "stopped");
--
--	e("status: %s", status);
--	return state;
--}
--
- static void
- make_exclusive(void)
- {
-@@ -881,7 +848,7 @@ svc_start(bool deps)
- 		setenv("IN_BACKGROUND", ibsave, 1);
- 	hook_out = RC_HOOK_SERVICE_START_DONE;
- 	rc_plugin_run(RC_HOOK_SERVICE_START_NOW, applet);
--	started = svc_exec("start", NULL);
-+	started = (svc_exec("start", NULL) == 0);
- 	if (ibsave)
- 		unsetenv("IN_BACKGROUND");
- 
-@@ -1058,7 +1025,7 @@ svc_stop(bool deps)
- 		setenv("IN_BACKGROUND", ibsave, 1);
- 	hook_out = RC_HOOK_SERVICE_STOP_DONE;
- 	rc_plugin_run(RC_HOOK_SERVICE_STOP_NOW, applet);
--	stopped = svc_exec("stop", NULL);
-+	stopped = (svc_exec("stop", NULL) == 0);
- 	if (ibsave)
- 		unsetenv("IN_BACKGROUND");
- 
-@@ -1383,10 +1350,10 @@ runscript(int argc, char **argv)
- 			rc_stringlist_free(services);
- 			services = NULL;
- 		} else if (strcmp (optarg, "status") == 0) {
--			RC_SERVICE r = svc_status();
--			retval = (int) r;
--			if (retval & RC_SERVICE_STARTED)
--				retval = 0;
-+			save = prefix;
-+			eprefix(NULL);
-+			prefix = NULL;
-+			retval = svc_exec("status", NULL);
- 		} else {
- 			if (strcmp(optarg, "conditionalrestart") == 0 ||
- 			    strcmp(optarg, "condrestart") == 0)
diff --git a/sys-apps/openrc/files/0.4.3/0003-command-line-size-fix.patch b/sys-apps/openrc/files/0.4.3/0003-command-line-size-fix.patch
deleted file mode 100644
index 85805b9db03c..000000000000
--- a/sys-apps/openrc/files/0.4.3/0003-command-line-size-fix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: src/librc/librc.h
-===================================================================
---- src/librc/librc.h (revision 7c81f74b60b9d15ed472f1ca63cab0a105a84c08)
-+++ src/librc/librc.h (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
-@@ -73,6 +73,4 @@
- #define librc_hidden_def(x) hidden_def(x)
- 
--ssize_t rc_getline(char **, size_t *, FILE *);
--
- librc_hidden_proto(rc_config_list)
- librc_hidden_proto(rc_config_load)
-Index: src/librc/rc.h.in
-===================================================================
---- src/librc/rc.h.in (revision c0fd1b49e49cec28c1f5a3a76f9db11c62e550dc)
-+++ src/librc/rc.h.in (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
-@@ -518,4 +518,8 @@
- RC_PIDLIST *rc_find_pids(const char *, const char *const *, uid_t, pid_t);
- 
-+/* getline is a handy glibc function that not all libcs have, so
-+ * we have our own */
-+ssize_t rc_getline(char **, size_t *, FILE *);
-+
- __END_DECLS
- #endif
-Index: src/librc/rc.map
-===================================================================
---- src/librc/rc.map (revision 6615eb4b689d7aa1d047bd9ed75eca80beac9767)
-+++ src/librc/rc.map (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
-@@ -13,4 +13,5 @@
- 	rc_environ_fd;
- 	rc_find_pids;
-+	rc_getline;
- 	rc_newer_than;
- 	rc_older_than;
-Index: src/rc/rc.c
-===================================================================
---- src/rc/rc.c
-+++ src/rc/rc.c
-@@ -43,10 +43,6 @@
- #include <sys/utsname.h>
- #include <sys/wait.h>
- 
--#ifdef __linux__
--# include <asm/setup.h> /* for COMMAND_LINE_SIZE */
--#endif
--
- #include <errno.h>
- #include <dirent.h>
- #include <ctype.h>
-@@ -176,10 +172,8 @@
- proc_getent(const char *ent)
- {
- 	FILE *fp;
--	char proc[COMMAND_LINE_SIZE];
--	char *p;
--	char *value = NULL;
--	int i;
-+	char *proc, *p, *value = NULL;
-+	size_t i;
- 
- 	if (!exists("/proc/cmdline"))
- 		return NULL;
-@@ -189,8 +183,10 @@
- 		return NULL;
- 	}
- 
--	memset(proc, 0, sizeof(proc));
--	fgets(proc, sizeof(proc), fp);
-+	proc = NULL;
-+	i = 0;
-+	if (rc_getline(&proc, &i, fp) == -1 || proc == NULL)
-+		eerror("rc_getline: %s", strerror(errno));
- 	if (*proc && (p = strstr(proc, ent))) {
- 		i = p - proc;
- 		if (i == '\0' || proc[i - 1] == ' ') {
-@@ -202,6 +198,7 @@
- 	} else
- 		errno = ENOENT;
- 	fclose(fp);
-+	free(proc);
- 
- 	return value;
- }
-Index: src/test/rc.funcs.list
-===================================================================
---- src/test/rc.funcs.list (revision 6615eb4b689d7aa1d047bd9ed75eca80beac9767)
-+++ src/test/rc.funcs.list (revision 6abeec74301d8406ebbbd653b9fe9a0e234c09bf)
-@@ -21,4 +21,6 @@
- rc_find_pids
- rc_find_pids@@RC_1.0
-+rc_getline
-+rc_getline@@RC_1.0
- rc_newer_than
- rc_newer_than@@RC_1.0
diff --git a/sys-apps/openrc/openrc-0.4.3-r4.ebuild b/sys-apps/openrc/openrc-0.4.3-r4.ebuild
deleted file mode 100644
index 49dc3ffe20a9..000000000000
--- a/sys-apps/openrc/openrc-0.4.3-r4.ebuild
+++ /dev/null
@@ -1,338 +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-r4.ebuild,v 1.1 2009/10/08 16:31:27 billie 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
-
-	# 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
-	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"
-}