Add support for rc-abort in the baselayout2 splash plugin.

Package-Manager: portage-2.1.2.6

4 files changed, 65 insertions, 13 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 448baaa2ad73..84db470c87c0 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.90 2007/05/07 19:24:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.91 2007/05/07 19:55:25 spock Exp $
+
+  07 May 2007; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.4.2-rcabort.patch, splashutils-1.4.2.ebuild:
+  Add support for rc-abort in the baselayout2 splash plugin.
 
   07 May 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   splashutils-1.4.1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 6918982788f5..46fb0b98d949 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -33,6 +33,10 @@ AUX splashutils-1.4.1-multilib.patch 1892 RMD160 14678774877802baffcc8ec5ffce566
 MD5 9e0d21e4c3b1e96ee23e1b61be037c46 files/splashutils-1.4.1-multilib.patch 1892
 RMD160 14678774877802baffcc8ec5ffce56611fa08bf5 files/splashutils-1.4.1-multilib.patch 1892
 SHA256 6678b201888cf21ea4b86252332aba6b482abfc3e21856d1f038599eadfce560 files/splashutils-1.4.1-multilib.patch 1892
+AUX splashutils-1.4.2-rcabort.patch 1214 RMD160 d09a6cf2d329558d889370501a3ab512e45ea8fe SHA1 d2306bde95cc8beb84dd204e3cbb8fc6234a73be SHA256 61935fe7f392b6e80df958c789fa840a11ced7f51d662afd77a76ef4e490c8b3
+MD5 d4de491ea4a0ceb5cce09e1188ccb6cf files/splashutils-1.4.2-rcabort.patch 1214
+RMD160 d09a6cf2d329558d889370501a3ab512e45ea8fe files/splashutils-1.4.2-rcabort.patch 1214
+SHA256 61935fe7f392b6e80df958c789fa840a11ced7f51d662afd77a76ef4e490c8b3 files/splashutils-1.4.2-rcabort.patch 1214
 AUX splashutils-depscan.patch 2197 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 SHA1 6e8406a714b71446089b4337f329c9eeeff0465e SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9
 MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
@@ -72,14 +76,14 @@ EBUILD splashutils-1.4.1.ebuild 6752 RMD160 f7375ebbe89a3f1cdc18a45aaacc62abb391
 MD5 f238a914fa03c86893436e0fc82427ea splashutils-1.4.1.ebuild 6752
 RMD160 f7375ebbe89a3f1cdc18a45aaacc62abb391aa4e splashutils-1.4.1.ebuild 6752
 SHA256 00de966753f1df3872087c7d803f444d5d260a4cca467a0a33433b980085b4eb splashutils-1.4.1.ebuild 6752
-EBUILD splashutils-1.4.2.ebuild 6696 RMD160 77798575405fb66345bcde6ba577d60ac223d292 SHA1 e6748152fc3c722478cc01c048a6e0d5eea02f4b SHA256 74dce78dd6c28a6ec732ded202ca9ab35e125f4146bf710dcddbc623074b1094
-MD5 e28eff083e20c80cc03234d510245926 splashutils-1.4.2.ebuild 6696
-RMD160 77798575405fb66345bcde6ba577d60ac223d292 splashutils-1.4.2.ebuild 6696
-SHA256 74dce78dd6c28a6ec732ded202ca9ab35e125f4146bf710dcddbc623074b1094 splashutils-1.4.2.ebuild 6696
-MISC ChangeLog 18156 RMD160 12ade3c1dd97ad274aa679e1e6f4649a8ed037fe SHA1 01ad27656ef6a52f613a509eefd7a5856ec90d48 SHA256 e15a0575ab736308b4939714578164645bb96575ed08a7ad153962785ee7fd07
-MD5 8e6886687f8b77fa2dbd23ee82871a3c ChangeLog 18156
-RMD160 12ade3c1dd97ad274aa679e1e6f4649a8ed037fe ChangeLog 18156
-SHA256 e15a0575ab736308b4939714578164645bb96575ed08a7ad153962785ee7fd07 ChangeLog 18156
+EBUILD splashutils-1.4.2.ebuild 6746 RMD160 4eaee227811840d1d3140015baea71053ced0ac8 SHA1 56991c517f9e436d91e0ab43ec78c6365afb1342 SHA256 19e1509e09c3026336a335bb364877b46cfe6c5e8b0f22b76a330b9bb57062e1
+MD5 36777ef3ff552ac687a1d5a27da4f41b splashutils-1.4.2.ebuild 6746
+RMD160 4eaee227811840d1d3140015baea71053ced0ac8 splashutils-1.4.2.ebuild 6746
+SHA256 19e1509e09c3026336a335bb364877b46cfe6c5e8b0f22b76a330b9bb57062e1 splashutils-1.4.2.ebuild 6746
+MISC ChangeLog 18337 RMD160 abdd528d3fc2366787deebf2ff98d6051ac8b149 SHA1 7ae9e3445044710bd0280a7ab250c243998633ad SHA256 d1cd6075ade448b0d71c24b8a10408498226ef90a25b2ffeb493794cb4d3ed5a
+MD5 26c0a6bebe51595723967ad47cd6d0d9 ChangeLog 18337
+RMD160 abdd528d3fc2366787deebf2ff98d6051ac8b149 ChangeLog 18337
+SHA256 d1cd6075ade448b0d71c24b8a10408498226ef90a25b2ffeb493794cb4d3ed5a ChangeLog 18337
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -99,7 +103,7 @@ SHA256 52f060e45eb1d3c37758360c39958a020af17fe0b4b176d52d4c7223c0f3132e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGP3zhkT4lNIS36YERAlLMAKDAJzXkkM5iCUTVA6wLPAzSwH6hWgCfXGMG
-Cvon81Ip/VmaCe5ev9717Q4=
-=lYAY
+iD8DBQFGP4Q4chej4aZK9/cRAtYMAJ9UBA/KoiqCnZpQ18yqQU3W1xDwIQCeMNIg
+y1503j1+7JP/OtNbBJwMKG4=
+=SHj+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.4.2-rcabort.patch b/media-gfx/splashutils/files/splashutils-1.4.2-rcabort.patch
new file mode 100644
index 000000000000..419737d7ed26
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.4.2-rcabort.patch
@@ -0,0 +1,41 @@
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index f4e2221..945f3aa 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -561,7 +561,13 @@ static int splash_stop(const char *runlevel)
+ 	if (splash_is_silent())
+ 		splash_set_verbose();
+ 
+-	return splash_cache_cleanup(save);
++	/* If we don't get a runlevel argument, then we're being executed
++	 * because of a rc-abort event and we don't save any data. */
++	if (runlevel == NULL) {
++		return splash_cache_cleanup(NULL);
++	} else {
++		return splash_cache_cleanup(save);
++	}
+ }
+ 
+ int _splash_hook (rc_hook_t hook, const char *name)
+@@ -579,7 +585,7 @@ int _splash_hook (rc_hook_t hook, const char *name)
+ 	/* We generally do nothing if we're in sysinit. Except if the
+ 	 * autoconfig service is present, when we get a list of services
+ 	 * that will be started by it and mark them as coldplugged. */
+-	if (!strcmp(name, RC_LEVEL_SYSINIT)) {
++	if (name && !strcmp(name, RC_LEVEL_SYSINIT)) {
+ 		if (hook == rc_hook_runlevel_start_out) {
+ 			FILE *fp;
+ 			char **list = NULL;
+@@ -793,6 +799,12 @@ do_start:
+ 		config = NULL;
+ 		break;
+ 
++	case rc_hook_abort:
++		i = splash_stop(name);
++		splash_lib_cleanup();
++		config = NULL;
++		break;
++
+ 	default:
+ 		break;
+ 	}
diff --git a/media-gfx/splashutils/splashutils-1.4.2.ebuild b/media-gfx/splashutils/splashutils-1.4.2.ebuild
index 0f16790b8451..31a196b75ce8 100644
--- a/media-gfx/splashutils/splashutils-1.4.2.ebuild
+++ b/media-gfx/splashutils/splashutils-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.4.2.ebuild,v 1.1 2007/05/06 22:17:42 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.4.2.ebuild,v 1.2 2007/05/07 19:55:25 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -64,6 +64,9 @@ src_unpack() {
 	# helper.
 	rm ${S}/libs/zlib-${V_ZLIB}/Makefile
 
+	cd ${SG}
+	epatch ${FILESDIR}/${P}-rcabort.patch
+
 	cd ${S}
 	ln -sf ${S} ${WORKDIR}/core