Restore more e* output style.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

3 files changed, 54 insertions, 15 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 796d2a500ab0..85a23afa50d6 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.101 2009/12/07 09:09:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.102 2009/12/21 13:48:09 vapier Exp $
+
+  21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
+  files/openrc-9999-msg-style.patch:
+  Restore more e* output style.
 
   07 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
   openrc-9999.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 886422c5d152..5dcc76455339 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX openrc-9999-msg-style.patch 1714 RMD160 15a9a9075dce18fb0beece6a3324c143ec973ed2 SHA1 b9082ab1160952a3412be3deb3825d901cce5d49 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e
+AUX openrc-9999-msg-style.patch 2775 RMD160 af958b2a8ed5ad29f25b53bad9a426cf7e173405 SHA1 251b8d0a52bb6e98d80a5213afc4d067583441fc SHA256 637fc2d13e0940b55b7d4613ebf8ebabdee87a802a2690191c01fd5ee7cb3581
 AUX openrc.logrotate 71 RMD160 4e7370ca873bd917f16e2b8cfc4bc71accbf2353 SHA1 ef1f26020db432f96a1485f72a189b288ef6873b SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c
 DIST openrc-0.5.3.tar.bz2 153281 RMD160 995181494c81c376223d7df90d48e3b7eaad69ad SHA1 fd82495c94c7d68d6493bca7623fc962f9a3cb6b SHA256 1e3120906d93fb1746f00355eb42b2ee510daafdad79d7c0dea2eb48eea3ad43
 EBUILD openrc-0.5.3.ebuild 13233 RMD160 5f4b2899920c9f56c22fe09e110ca510b4850176 SHA1 7d9d8c376d740f3e8f06486be60cbca565f6501b SHA256 b23626bc9064713c2b58e94a4cf8b74b07a0bcd0d7581e79af075063ea15595e
 EBUILD openrc-9999.ebuild 13233 RMD160 274753edaa2ef56544455c5b2242a1c634363f15 SHA1 404345e0f39665016af92857f4f3882cdc9ee162 SHA256 73a0b27f0634407ba4d47cd3c8d3a4cae7df56d5d662f84b2405d04d7e3a040c
-MISC ChangeLog 21233 RMD160 15011b2ecc015931c3dad4f9133f43f6ca3eabac SHA1 65f47e4e486d57ded216bfa6f87ce85679d636d3 SHA256 25bec5421853667f973a180d2c3f366a76a895af2eef2ce12d001b1e368bea9d
+MISC ChangeLog 21353 RMD160 04533c1e4b926268afed9b82019646fd3d8ebb1c SHA1 bdb65ef1d9cb7b5d944405bfce15899520cd8e21 SHA256 f30be84518a788be820c6ca8bb940074f2c9efb3f41721c489231dc7792d921e
 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkscxlIACgkQlPl3HsVfCDq9sgCfZu3v6GjZtz6HoAO0FHfj8Hau
-bxUAnjHmGRom2ZLwGFXEYfLxR7KYcHa3
-=ztwa
+iF4EAREIAAYFAksvfN0ACgkQTwhj9JtAlp4ZWwD/bBSZjroThFXh992irfvtTgC6
+MeF20k0Epcm3xfA4HW0BAMez6/jakt6hXipep8tCR1w8xt69ADOtAviUHJwfmukr
+=kqlc
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/files/openrc-9999-msg-style.patch b/sys-apps/openrc/files/openrc-9999-msg-style.patch
index 0ba3697facf5..ac325bb79bcf 100644
--- a/sys-apps/openrc/files/openrc-9999-msg-style.patch
+++ b/sys-apps/openrc/files/openrc-9999-msg-style.patch
@@ -1,17 +1,43 @@
-From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001
+From 1e307244138c8f650ab37bffa7b3cc3e3b39cd64 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.
+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 |    9 +++------
- 1 files changed, 3 insertions(+), 6 deletions(-)
+ 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 f8ddcb5..c46cacb 100644
+index 8a7613c..234b1af 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,
+@@ -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;
  
@@ -20,7 +46,7 @@ index f8ddcb5..c46cacb 100644
  
  	/* 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,
+@@ -831,18 +831,15 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg)
  	if (term_is_cons25)
  		cols--;
  
@@ -41,6 +67,15 @@ index f8ddcb5..c46cacb 100644
  	}
  }
  
+@@ -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.5.4.4
+1.6.6.rc3