commit: 4b5a50929bfa41d4150087af559fd79619c64536 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Nov 17 19:16:40 2017 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Wed Dec 20 22:25:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5a5092
sys-apps/openrc: remove unused patches This closes #6213. sys-apps/openrc/files/openrc-9999-msg-style.patch | 81 ----------------------- sys-apps/openrc/files/openrc-9999-pause.patch | 29 -------- 2 files changed, 110 deletions(-) diff --git a/sys-apps/openrc/files/openrc-9999-msg-style.patch b/sys-apps/openrc/files/openrc-9999-msg-style.patch deleted file mode 100644 index ac325bb79bc..00000000000 --- a/sys-apps/openrc/files/openrc-9999-msg-style.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 1e307244138c8f650ab37bffa7b3cc3e3b39cd64 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Mon, 24 Mar 2008 01:48:19 -0400 -Subject: [PATCH] restore old e* func output - -Gentoo has always used the sytle: - * moo ... [ ok ] -Latest openrc now does: -* moo... [ok] - -Realistically, 4 spaces out of 80 on reduced terminals doesn't make any -sort of realistic difference and it's been just fine for the last 10 -years, so keep the default behavior. ---- - src/libeinfo/libeinfo.c | 15 ++++++--------- - 1 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c -index 8a7613c..234b1af 100644 ---- a/src/libeinfo/libeinfo.c -+++ b/src/libeinfo/libeinfo.c -@@ -643,7 +643,7 @@ static int EINFO_PRINTF(3, 0) - fprintf(f, "\n"); - if (_eprefix) - fprintf(f, "%s%s%s|", _ecolor(f, color), _eprefix, _ecolor(f, ECOLOR_NORMAL)); -- fprintf(f, "%s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL)); -+ fprintf(f, " %s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL)); - retval += _eindent(f); - va_copy(ap, va); - retval += vfprintf(f, fmt, ap) + 3; -@@ -800,7 +800,7 @@ ebegin(const char *EINFO_RESTRICT fmt, ...) - va_start(ap, fmt); - retval = _einfovn(fmt, ap); - va_end(ap); -- retval += printf("..."); -+ retval += printf(" ..."); - if (colour_terminal(stdout)) - retval += printf("\n"); - LASTCMD("ebegin"); -@@ -817,7 +817,7 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) - 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 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) - 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); - } - } - -@@ -1030,7 +1027,7 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...) - - va_start(ap, fmt); - retval = _einfovn(fmt, ap); -- retval += printf("..."); -+ retval += printf(" ..."); - if (colour_terminal(stdout)) - retval += printf("\n"); - va_end(ap); --- -1.6.6.rc3 - diff --git a/sys-apps/openrc/files/openrc-9999-pause.patch b/sys-apps/openrc/files/openrc-9999-pause.patch deleted file mode 100644 index bf2c94f8dbe..00000000000 --- a/sys-apps/openrc/files/openrc-9999-pause.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Mon, 21 Dec 2009 09:02:35 -0500 -Subject: [PATCH] restore init.d pause option - ---- - src/rc/runscript.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/src/rc/runscript.c b/src/rc/runscript.c -index 5939dae..7147902 100644 ---- a/src/rc/runscript.c -+++ b/src/rc/runscript.c -@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv) - prefix = NULL; - retval = svc_exec("status", NULL); - } else { -+ if (strcmp(optarg, "pause") == 0) { -+ ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'"); -+ deps = false; -+ optarg = "stop"; -+ } -+ - if (strcmp(optarg, "conditionalrestart") == 0 || - strcmp(optarg, "condrestart") == 0) - { --- -1.6.6.rc3 -
