Fix parsing of the boot messages so that the progress variable works properly.

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-rc8 x86_64

4 files changed, 71 insertions, 9 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 0627e7db1cef..a03f6eba2c3a 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.152 2009/01/08 20:01:31 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.153 2009/01/08 21:01:05 spock Exp $
+
+  08 Jan 2009; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.5.4.3-fix_rc_var.patch, splashutils-1.5.4.3.ebuild:
+  Fix parsing of the boot messages so that the progress variable works
+  properly.
 
   08 Jan 2009; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.3.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index b65332abbec7..dcb22d439696 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX splashutils-1.5.4.3-fix_rc_var.patch 1084 RMD160 d60bdea6625c9ce4d42d281c38888b8bcb823525 SHA1 31b831b79ea3944a52d0ca9fd45891c73170c758 SHA256 c51b29f3c6191ac6259db52f56050a34872f07a78463a1ac1e4fbaf89d2f81d8
 AUX splashutils-1.5.4.3-makefile.patch 1257 RMD160 1fb565cb543efe438f5c47cf490aa3cffe07d559 SHA1 011baf9ea9c1313edb3045dc7a52c28d3b84c83e SHA256 6ca31fc77f75bda368642da7effbaa0fd3c69bce86c9e04bfe55b9ab4d259cf3
 AUX splashutils-openrc-0.4-fix.patch 2750 RMD160 b9e7694c7e2d2083e62f321f232be9054696f06b SHA1 1d3c6c7418a0ada751dec57dff075af709f0b383 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846
 DIST freetype-2.3.5.tar.bz2 1279861 RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 SHA1 45695d44c74be31944d807526a7e69a818e4afd2 SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
@@ -13,13 +14,13 @@ DIST splashutils-lite-1.5.4.2.tar.bz2 421894 RMD160 defb12e3cedccbfd3f3ebdf75305
 DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.5.4.2.ebuild 6944 RMD160 7fa668b3e5219d30822678a048e314da286b107f SHA1 6c74f59a4c59f90a90a3d724653778c59cb12e36 SHA256 3173487db24e8fa897c8afefb680f4fe98f54f9d65840ae4a6759ae82533f207
-EBUILD splashutils-1.5.4.3.ebuild 7063 RMD160 f0eefd3621802bd61b3aed79e3114e63f242c5c7 SHA1 23441e6f2ea3e6dd60bbc1137096c09041301f98 SHA256 06c188fda3e481c42c2a4d7a03bafbbbdbefbed33d1f5dfe8f2c4f262d0f979f
-MISC ChangeLog 28415 RMD160 97cbfedf4b2390d536085d5e1ac640142596f3c0 SHA1 b2ab9e728901cc3ae5a237884ab16e75e99dc7d3 SHA256 52e24f00911c585c8275bcd2f3cf2e7b670114315648e0389a243557d529804d
+EBUILD splashutils-1.5.4.3.ebuild 7120 RMD160 e71ea2bb83720f1a5900b0c87ab1255842b4f9b4 SHA1 156b232d7fcefcefd14ea7fc0d31bc78d42e5758 SHA256 48a1c6e5e6278caf791c5c7b337567d461506136a7f4112818f65b7a42dede8e
+MISC ChangeLog 28628 RMD160 5a46c62002d0b3cdb538c5a1319c938bb63b81d3 SHA1 33eae719fe9bd5c5420266776efc8fa144e3359d SHA256 090c42230b9ddb8af840ee432609a747dc10e5aa1e01fd9f203a117c0daad904
 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklmW5sACgkQchej4aZK9/eidgCeJVJFTNW6okhYT90d1bT3SHjE
-9c0An0QuAbYqb24hr/Tf/YdsGR0ow3l7
-=ZdA/
+iEYEARECAAYFAklmaY8ACgkQchej4aZK9/dpmQCfW9Zt8dLO0OzSvz3BtyRYWyNg
+KSkAn1GqAPgTB9mmxBdg97pcWDDpeLSs
+=EZPh
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-fix_rc_var.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-fix_rc_var.patch
new file mode 100644
index 000000000000..3b9e06b41f21
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-fix_rc_var.patch
@@ -0,0 +1,55 @@
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index b6fa774..726315f 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -134,6 +134,19 @@ static void get_list(RC_STRINGLIST *list, const char *file)
+ 	}
+ }
+ 
++static void fix_rc_variable(char *s)
++{
++	do {
++		char *t = strstr(s, "\\$");
++
++		if (t) {
++			memmove(t, t+1, strlen(t));
++		} else {
++			break;
++		}
++	} while(1);
++}
++
+ /*
+  * Get splash settings from /etc/conf.d/splash
+  */
+@@ -189,21 +202,27 @@ static int splash_config_gentoo(fbspl_cfg_t *cfg, fbspl_type_t type)
+ 	switch(type) {
+ 	case fbspl_reboot:
+ 		t = rc_config_value(confd, "SPLASH_REBOOT_MESSAGE");
+-		if (t)
++		if (t) {
++			fix_rc_variable(t);
+ 			fbsplash_acc_message_set(t);
++		}
+ 		break;
+ 
+ 	case fbspl_shutdown:
+ 		t = rc_config_value(confd, "SPLASH_SHUTDOWN_MESSAGE");
+-		if (t)
++		if (t) {
++			fix_rc_variable(t);
+ 			fbsplash_acc_message_set(t);
++		}
+ 		break;
+ 
+ 	case fbspl_bootup:
+ 	default:
+ 		t = rc_config_value(confd, "SPLASH_BOOT_MESSAGE");
+-		if (t)
++		if (t) {
++			fix_rc_variable(t);
+ 			fbsplash_acc_message_set(t);
++		}
+ 		break;
+ 	}
+ 
diff --git a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
index 68f8112f796b..d506db2dc141 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.5 2009/01/08 20:01:31 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.6 2009/01/08 21:01:05 spock Exp $
 
 EAPI="1"
 
@@ -86,11 +86,12 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/splashutils-1.5.4.3-makefile.patch
 
+	cd "${SG}"
 	if has_version ">=sys-apps/openrc-0.4.0"; then
-		cd "${SG}"
 		epatch "${FILESDIR}"/splashutils-openrc-0.4-fix.patch
-		cd "${S}"
 	fi
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-fix_rc_var.patch
+	cd "${S}"
 
 	rm -f m4/*
 	eautoreconf