Patch splashtutils to work on baselayout-2.0.0_rc5

(Portage version: 2.1.3.12)

3 files changed, 570 insertions, 2 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 00e56977dc79..4dc08c8579cb 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.114 2007/10/11 08:03:15 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.115 2007/10/11 16:01:51 uberlord Exp $
+
+  11 Oct 2007; Roy Marples <uberlord@gentoo.org>
+  +files/splashutils-1.5.2.1-baselayout-rc5.patch,
+  splashutils-1.5.2.1.ebuild:
+  Patch splashtutils to work on baselayout-2.0.0_rc5
 
   11 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
   splashutils-1.5.2.1.ebuild:
diff --git a/media-gfx/splashutils/files/splashutils-1.5.2.1-baselayout-rc5.patch b/media-gfx/splashutils/files/splashutils-1.5.2.1-baselayout-rc5.patch
new file mode 100644
index 000000000000..0afaa901054e
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.2.1-baselayout-rc5.patch
@@ -0,0 +1,558 @@
+diff -ur splashutils-gentoo-1.0.8.orig/Makefile splashutils-gentoo-1.0.8/Makefile
+--- splashutils-gentoo-1.0.8.orig/Makefile	2007-09-23 12:12:32.000000000 +0100
++++ splashutils-gentoo-1.0.8/Makefile	2007-10-11 15:24:10.000000000 +0100
+@@ -8,7 +8,7 @@
+ INCLUDES = -I../core/objs
+ 
+ splash.so: splash.o
+-	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$@ $+ -o $@ -leinfo -lfbsplash
++	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$@ $+ -o $@ -leinfo -lrc -lfbsplash
+ 
+ test: test.o
+ 	$(CC) $+ -o $@ -leinfo -lrc -ldl
+@@ -17,7 +17,7 @@
+ 	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -c -o $@ $<
+ 
+ install:
+-	install -D splash.so $(DESTDIR)/$(LIB)/rcscripts/plugins/splash.so
++	install -D splash.so $(DESTDIR)/$(LIB)/rc/plugins/splash.so
+ 
+ clean:
+ 	rm -rf *.o *.so
+diff -ur splashutils-gentoo-1.0.8.orig/splash.c splashutils-gentoo-1.0.8/splash.c
+--- splashutils-gentoo-1.0.8.orig/splash.c	2007-10-11 15:21:37.000000000 +0100
++++ splashutils-gentoo-1.0.8/splash.c	2007-10-11 15:21:14.000000000 +0100
+@@ -11,6 +11,7 @@
+  * more details.
+  *
+  */
++#include <sys/stat.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -62,7 +63,7 @@
+ 	int i;
+ 
+ 	for (i = 0; src && src[i]; i++) {
+-		dest = rc_strlist_addsort(dest, src[i]);
++		rc_strlist_addsort(&dest, src[i]);
+ 	}
+ 	return dest;
+ }
+@@ -108,7 +109,7 @@
+ 
+ 		while ((p = strsep(&token, " ")) != NULL) {
+ 			if (strlen(p) > 1) {
+-				list = rc_strlist_add(list, p);
++				rc_strlist_add(&list, p);
+ 			}
+ 		}
+ 	}
+@@ -142,9 +143,9 @@
+ 	char **confd;
+ 	char *t;
+ 
+-	confd = rc_get_config(NULL, "/etc/conf.d/splash");
++	confd = rc_config_load("/etc/conf.d/splash");
+ 
+-	t = rc_get_config_entry(confd, "SPLASH_KDMODE");
++	t = rc_config_value(confd, "SPLASH_KDMODE");
+ 	if (t) {
+ 		if (!strcasecmp(t, "graphics")) {
+ 			cfg->kdmode = KD_GRAPHICS;
+@@ -153,13 +154,13 @@
+ 		}
+ 	}
+ 
+-	t = rc_get_config_entry(confd, "SPLASH_PROFILE");
++	t = rc_config_value(confd, "SPLASH_PROFILE");
+ 	if (t) {
+ 		if (!strcasecmp(t, "on") || !strcasecmp(t, "yes"))
+ 			cfg->profile = true;
+ 	}
+ 
+-	t = rc_get_config_entry(confd, "SPLASH_TTY");
++	t = rc_config_value(confd, "SPLASH_TTY");
+ 	if (t) {
+ 		int i;
+ 		if (sscanf(t, "%d", &i) == 1 && i > 0) {
+@@ -167,11 +168,11 @@
+ 		}
+ 	}
+ 
+-	t = rc_get_config_entry(confd, "SPLASH_THEME");
++	t = rc_config_value(confd, "SPLASH_THEME");
+ 	if (t)
+ 		fbsplash_acc_theme_set(t);
+ 
+-	t = rc_get_config_entry(confd, "SPLASH_MODE_REQ");
++	t = rc_config_value(confd, "SPLASH_MODE_REQ");
+ 	if (t) {
+ 		if (!strcasecmp(t, "verbose")) {
+ 			cfg->reqmode = FBSPL_MODE_VERBOSE;
+@@ -182,32 +183,32 @@
+ 		}
+ 	}
+ 
+-	t = rc_get_config_entry(confd, "SPLASH_VERBOSE_ON_ERRORS");
++	t = rc_config_value(confd, "SPLASH_VERBOSE_ON_ERRORS");
+ 	if (t && (!strcasecmp(t, "on") || !strcasecmp(t, "yes")))
+ 		cfg->vonerr = true;
+ 
+ 	switch(type) {
+ 	case fbspl_reboot:
+-		t = rc_get_config_entry(confd, "SPLASH_REBOOT_MESSAGE");
++		t = rc_config_value(confd, "SPLASH_REBOOT_MESSAGE");
+ 		if (t)
+ 			fbsplash_acc_message_set(t);
+ 		break;
+ 
+ 	case fbspl_shutdown:
+-		t = rc_get_config_entry(confd, "SPLASH_SHUTDOWN_MESSAGE");
++		t = rc_config_value(confd, "SPLASH_SHUTDOWN_MESSAGE");
+ 		if (t)
+ 			fbsplash_acc_message_set(t);
+ 		break;
+ 
+ 	case fbspl_bootup:
+ 	default:
+-		t = rc_get_config_entry(confd, "SPLASH_BOOT_MESSAGE");
++		t = rc_config_value(confd, "SPLASH_BOOT_MESSAGE");
+ 		if (t)
+ 			fbsplash_acc_message_set(t);
+ 		break;
+ 	}
+ 
+-	t = rc_get_config_entry(confd, "SPLASH_EFFECTS");
++	t = rc_config_value(confd, "SPLASH_EFFECTS");
+ 	if (t) {
+ 		char *opt;
+ 
+@@ -262,6 +263,7 @@
+ {
+ 	char *buf;
+ 	int l = 256;
++	struct stat st;
+ 
+ 	if (arg1)
+ 		fbsplash_profile("%s %s %s\n", type, name, arg1);
+@@ -273,8 +275,7 @@
+ 
+ 	buf = malloc(l * sizeof(char*));
+ 	snprintf(buf, l, "/etc/splash/%s/scripts/%s-%s", config->theme, name, type);
+-
+-	if (!rc_is_exec(buf)) {
++	if (stat(buf, &st) != 0) {
+ 		free(buf);
+ 		return 0;
+ 	}
+@@ -348,17 +349,17 @@
+ 		svcs = get_list(NULL, FBSPLASH_CACHEDIR"/svcs_start");
+ 		svcs_cnt = strlist_count(svcs);
+ 
+-		svcs_done = rc_services_in_state(rc_service_started);
++		svcs_done = rc_services_in_state(RC_SERVICE_STARTED);
+ 
+-		tmp = rc_services_in_state(rc_service_inactive);
++		tmp = rc_services_in_state(RC_SERVICE_INACTIVE);
+ 		svcs_done = strlist_merge_sort(svcs_done, tmp);
+ 		rc_strlist_free(tmp);
+ 
+-		tmp = rc_services_in_state(rc_service_failed);
++		tmp = rc_services_in_state(RC_SERVICE_FAILED);
+ 		svcs_done = strlist_merge_sort(svcs_done, tmp);
+ 		rc_strlist_free(tmp);
+ 
+-		tmp = rc_services_in_state(rc_service_scheduled);
++		tmp = rc_services_in_state(RC_SERVICE_SCHEDULED);
+ 		svcs_done = strlist_merge_sort(svcs_done, tmp);
+ 		rc_strlist_free(tmp);
+ 
+@@ -368,13 +369,13 @@
+ 		svcs = get_list(NULL, FBSPLASH_CACHEDIR"/svcs_stop");
+ 		svcs_cnt = strlist_count(svcs);
+ 
+-		svcs_done = rc_services_in_state(rc_service_started);
++		svcs_done = rc_services_in_state(RC_SERVICE_STARTED);
+ 
+-		tmp = rc_services_in_state(rc_service_starting);
++		tmp = rc_services_in_state(RC_SERVICE_STARTING);
+ 		svcs_done = strlist_merge_sort(svcs_done, tmp);
+ 		rc_strlist_free(tmp);
+ 
+-		tmp = rc_services_in_state(rc_service_inactive);
++		tmp = rc_services_in_state(RC_SERVICE_INACTIVE);
+ 		svcs_done = strlist_merge_sort(svcs_done, tmp);
+ 		rc_strlist_free(tmp);
+ 
+@@ -401,7 +402,7 @@
+ 		if (list_has(svcs_done, name))
+ 			return 0;
+ 
+-		rc_strlist_add(svcs_done, name);
++		rc_strlist_add(&svcs_done, name);
+ 		svcs_done_cnt++;
+ 	}
+ 
+@@ -433,13 +434,13 @@
+ 		return -1;
+ 	}
+ 
+-	if ((deptree = rc_load_deptree()) == NULL) {
++	if ((deptree = rc_deptree_load()) == NULL) {
+ 		eerror("%s: failed to load deptree", __func__);
+ 		err = -2;
+ 		goto out;
+ 	}
+ 
+-	deporder = rc_order_services(deptree, bootlevel, RC_DEP_START);
++	deporder = rc_deptree_order(deptree, bootlevel, RC_DEP_START);
+ 
+ 	/* Save what we've got so far to the svcs_start. */
+ 	i = 0;
+@@ -452,7 +453,7 @@
+ 	}
+ 
+ 	t = deporder;
+-	deporder = rc_order_services(deptree, defaultlevel, RC_DEP_START);
++	deporder = rc_deptree_order(deptree, defaultlevel, RC_DEP_START);
+ 
+ 	/* Print the new services and skip ones that have already been started
+ 	 * in the 'boot' runlevel. */
+@@ -471,7 +472,7 @@
+ 
+ 	rc_strlist_free(deporder);
+ 	rc_strlist_free(t);
+-	rc_free_deptree(deptree);
++	rc_deptree_free(deptree);
+ 
+ out:
+ 	fclose(fp);
+@@ -494,13 +495,13 @@
+ 		return -1;
+ 	}
+ 
+-	if ((deptree = rc_load_deptree()) == NULL) {
++	if ((deptree = rc_deptree_load()) == NULL) {
+ 		eerror("%s: failed to load deptree", __func__);
+ 		err = -2;
+ 		goto out;
+ 	}
+ 
+-	deporder = rc_order_services(deptree, runlevel, RC_DEP_STOP);
++	deporder = rc_deptree_order(deptree, runlevel, RC_DEP_STOP);
+ 
+ 	i = 0;
+ 	if (deporder && deporder[0]) {
+@@ -512,7 +513,7 @@
+ 	}
+ 
+ 	rc_strlist_free(deporder);
+-	rc_free_deptree(deptree);
++	rc_deptree_free(deptree);
+ out:
+ 	fclose(fp);
+ 	return err;
+@@ -587,12 +588,13 @@
+ 	char *save[] = { "profile", "svcs_start", NULL };
+ 	char buf[128];
+ 	int cnt = 0;
++	struct stat st;
+ 
+ 	fbsplash_send("exit\n");
+ 	snprintf(buf, 128, "/proc/%d", pid_daemon);
+ 
+ 	/* Wait up to 1.0s for the splash daemon to exit. */
+-	while (rc_is_dir(buf) && cnt < 100) {
++	while (stat(buf, &st) == 0 && cnt < 100) {
+ 		usleep(10000);
+ 		cnt++;
+ 	}
+@@ -610,14 +612,15 @@
+ 	}
+ }
+ 
+-int _splash_hook (rc_hook_t hook, const char *name)
++int rc_plugin_hook (rc_hook_t hook, const char *name)
+ {
+ 	int i = 0;
+ 	fbspl_type_t type = fbspl_bootup;
+ 	char *runlev;
+ 	bool skip = false;
++	int retval = 0;
+ 
+-	runlev = rc_get_runlevel();
++	runlev = rc_runlevel_get();
+ 	if (!strcmp(runlev, RC_LEVEL_REBOOT))
+ 		type = fbspl_reboot;
+ 	else if (!strcmp(runlev, RC_LEVEL_SHUTDOWN))
+@@ -627,22 +630,22 @@
+ 	 * autoconfig service is present, when we get a list of services
+ 	 * that will be started by it and mark them as coldplugged. */
+ 	if (name && !strcmp(name, RC_LEVEL_SYSINIT)) {
+-		if (hook == rc_hook_runlevel_start_out) {
++		if (hook == RC_HOOK_RUNLEVEL_START_OUT) {
+ 			FILE *fp;
+ 			char **list = NULL;
+ 			int i;
+ 
+ 			fp = popen("if [ -e /etc/init.d/autoconfig ]; then . /etc/init.d/autoconfig ; list_services ; fi", "r");
+ 			if (!fp)
+-				return 0;
++				goto exit;
+ 
+ 			list = get_list_fp(NULL, fp);
+ 			for (i = 0; list && list[i]; i++) {
+-				rc_mark_service(list[i], rc_service_coldplugged);
++				rc_service_mark(list[i], RC_SERVICE_COLDPLUGGED);
+ 			}
+ 			pclose(fp);
+ 		}
+-		return 0;
++		goto exit;
+ 	}
+ 
+ 	/* Get boot and default levels from env variables exported by RC.
+@@ -653,21 +656,21 @@
+ 	/* Don't do anything if we're starting/stopping a service, but
+ 	 * we aren't in the middle of a runlevel switch. */
+ 	if (!(rc_runlevel_starting() || rc_runlevel_stopping())) {
+-		if (hook != rc_hook_runlevel_stop_in &&
+-			hook != rc_hook_runlevel_stop_out &&
+-			hook != rc_hook_runlevel_start_in &&
+-			hook != rc_hook_runlevel_start_out)
+-			return 0;
++		if (hook != RC_HOOK_RUNLEVEL_STOP_IN &&
++			hook != RC_HOOK_RUNLEVEL_STOP_OUT &&
++			hook != RC_HOOK_RUNLEVEL_START_IN &&
++			hook != RC_HOOK_RUNLEVEL_START_OUT)
++			goto exit;
+ 	} else {
+ 		/* We're starting/stopping a runlevel. Check whether we're
+ 		 * actually booting/rebooting. */
+ 		if (rc_runlevel_starting() && strcmp(runlev, bootlevel) &&
+ 			strcmp(runlev, defaultlevel) && strcmp(runlev, RC_LEVEL_SYSINIT))
+-			return 0;
++			goto exit;
+ 
+ 		if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) &&
+ 			strcmp(runlev, RC_LEVEL_REBOOT) && strcmp(runlev, RC_LEVEL_SHUTDOWN))
+-			return 0;
++			goto exit;
+ 	}
+ 
+ 	if (!config) {
+@@ -677,29 +680,33 @@
+ 	}
+ 
+ 	/* Extremely weird.. should never happen. */
+-	if (!config)
+-		return -1;
++	if (!config) {
++		retval = -1;
++		goto exit;
++	}
+ 
+ 	/* Don't do anything if we're not running in silent mode. */
+ 	if (!(config->reqmode & FBSPL_MODE_SILENT))
+-		return 0;
++		goto exit;
+ 
+ 	switch (hook) {
+-	case rc_hook_runlevel_stop_in:
++	case RC_HOOK_RUNLEVEL_STOP_IN:
+ 		/* Start the splash daemon on reboot. The theme hook is called
+ 		 * from splash_start(). */
+ 		if (strcmp(name, RC_LEVEL_REBOOT) == 0 || strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
+ 			if ((i = splash_start(name))) {
+ 				fbsplash_set_verbose(0);
+-				return i;
++				retval= i;
++				goto exit;
+ 			} else {
+-				if (rc_service_state("gpm", rc_service_started)) {
++				if (rc_service_state("gpm") & RC_SERVICE_STARTED) {
+ 					fbsplash_send("set gpm\n");
+ 					fbsplash_send("repaint\n");
+ 				}
+ 			}
+ 			splash_theme_hook("rc_init", "post", name);
+-			return i;
++			retval = i;
++			goto exit;
+ 		} else {
+ 			splash_theme_hook("rc_exit", "pre", name);
+ 			splash_theme_hook("rc_exit", "post", name);
+@@ -708,15 +715,17 @@
+ 		}
+ 		break;
+ 
+-	case rc_hook_runlevel_stop_out:
++	case RC_HOOK_RUNLEVEL_STOP_OUT:
+ 		/* Make sure the progress indicator reaches 100%, even if
+ 		 * something went wrong along the way. */
+ 		if (strcmp(name, RC_LEVEL_REBOOT) == 0 || strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
+ 			config->verbosity = FBSPL_VERB_QUIET;
+ 			i = fbsplash_check_daemon(&pid_daemon);
+ 			config->verbosity = FBSPL_VERB_NORMAL;
+-			if (i)
+-				return -1;
++			if (i) {
++				retval = -1;
++				goto exit;
++			}
+ 
+ 			fbsplash_send("progress %d\n", FBSPL_PROGRESS_MAX);
+ 			fbsplash_send("paint\n");
+@@ -724,7 +733,7 @@
+ 		}
+ 		break;
+ 
+-	case rc_hook_runlevel_start_in:
++	case RC_HOOK_RUNLEVEL_START_IN:
+ 		/* Start the splash daemon during boot right after we finish
+ 		 * sysinit and are entering the boot runlevel. Due to historical
+ 		 * reasons, we simulate a full sysinit cycle here for the theme
+@@ -740,14 +749,16 @@
+ 		splash_theme_hook("rc_init", "post", name);
+ 		break;
+ 
+-	case rc_hook_runlevel_start_out:
++	case RC_HOOK_RUNLEVEL_START_OUT:
+ 		/* Stop the splash daemon after boot-up is finished. */
+ 		if (strcmp(name, bootlevel)) {
+ 			config->verbosity = FBSPL_VERB_QUIET;
+ 			i = fbsplash_check_daemon(&pid_daemon);
+ 			config->verbosity = FBSPL_VERB_NORMAL;
+-			if (i)
+-				return -1;
++			if (i) {
++				retval = -1;
++				goto exit;
++			}
+ 
+ 			/* Make sure the progress indicator reaches 100%, even if
+ 			 * something went wrong along the way. */
+@@ -761,50 +772,55 @@
+ 		}
+ 		break;
+ 
+-	case rc_hook_service_start_now:
++	case RC_HOOK_SERVICE_START_NOW:
+ do_start:
+ 		/* If we've been inactive, do nothing since the service has
+ 		 * already been handled before it went inactive. */
+-		if (rc_service_state(name, rc_service_wasinactive))
+-			return 0;
++		if (rc_service_state(name) & RC_SERVICE_WASINACTIVE)
++			goto exit;
+ 
+ 		/* If we're starting or stopping a service, we're being called by
+ 		 * runscript and thus have to reload our config. */
+-		if (splash_init(true))
+-			return -1;
++		if (splash_init(true)) {
++			retval = -1;
++			goto exit;
++		}
+ 		i = splash_svc_handle(name, "svc_start", skip);
+ 		break;
+ 
+-	case rc_hook_service_start_out:
++	case RC_HOOK_SERVICE_START_OUT:
+ 		/* If a service gets scheduled, we want to increment the progress
+ 		 * bar (as it is no longer blocking boot completion). However,
+ 		 * the service may actually start during boot (some time after
+ 		 * being scheduled), so we don't want to increment the progress
+ 		 * bar twice. The following if clause satisfies this by catching
+ 		 * the first case but not the second. */
+-		if (rc_service_state(name, rc_service_scheduled) &&
+-		    !rc_service_state(name, rc_service_starting)) {
++		if ((rc_service_state(name) & RC_SERVICE_SCHEDULED) &&
++		    !(rc_service_state(name) & RC_SERVICE_STARTING)) {
+ 			skip = true;
+ 			goto do_start;
+ 		}
+ 		break;
+ 
+-	case rc_hook_service_start_done:
++	case RC_HOOK_SERVICE_START_DONE:
+ 		config->verbosity = FBSPL_VERB_QUIET;
+ 		i = fbsplash_check_daemon(&pid_daemon);
+ 		config->verbosity = FBSPL_VERB_NORMAL;
+-		if (i)
+-			return -1;
++		if (i) {
++			retval = -1;
++			goto exit;
++		}
+ 
+-		if (!rc_service_state(name, rc_service_failed) &&
+-		    !rc_service_state(name, rc_service_stopped)) {
++		if (!(rc_service_state(name) & RC_SERVICE_FAILED) &&
++		    !(rc_service_state(name) & RC_SERVICE_STOPPED)) {
+ 			bool gpm = false;
+ 
+ 			if (!strcmp(name, "gpm")) {
++				struct stat st;
+ 				int cnt = 0;
+ 				gpm = true;
+ 				/* Wait up to 0.25s for the GPM socket to appear. */
+-				while (rc_exists("/dev/gpmctl") && cnt < 25) {
++				while (stat("/dev/gpmctl", &st) == 0 && cnt < 25) {
+ 					usleep(10000);
+ 					cnt++;
+ 				}
+@@ -826,9 +842,11 @@
+ 		config = NULL;
+ 		break;
+ 
+-	case rc_hook_service_stop_now:
+-		if (splash_init(false))
+-			return -1;
++	case RC_HOOK_SERVICE_STOP_NOW:
++		if (splash_init(false)) {
++			retval = -1;
++			goto exit;
++		}
+ 
+ 		/* We need to stop localmount from unmounting our cache dir.
+ 		   Luckily plugins can add to the unmount list. */
+@@ -843,14 +861,16 @@
+ 		i = splash_svc_handle(name, "svc_stop", false);
+ 		break;
+ 
+-	case rc_hook_service_stop_done:
++	case RC_HOOK_SERVICE_STOP_DONE:
+ 		config->verbosity = FBSPL_VERB_QUIET;
+ 		i = fbsplash_check_daemon(&pid_daemon);
+ 		config->verbosity = FBSPL_VERB_NORMAL;
+-		if (i)
+-			return -1;
++		if (i) {
++			retval = -1;
++			goto exit;
++		}
+ 
+-		if (rc_service_state(name, rc_service_stopped)) {
++		if (rc_service_state(name) & RC_SERVICE_STOPPED) {
+ 			i = splash_svc_state(name, "svc_stopped", 1);
+ 		} else {
+ 			i = splash_svc_state(name, "svc_stop_failed", 1);
+@@ -862,7 +882,7 @@
+ 		config = NULL;
+ 		break;
+ 
+-	case rc_hook_abort:
++	case RC_HOOK_ABORT:
+ 		i = splash_stop(name);
+ 		fbsplash_lib_cleanup();
+ 		config = NULL;
+@@ -877,5 +897,7 @@
+ 		svcs = NULL;
+ 	}
+ 
++exit:
++	free (runlev);
+ 	return i;
+ }
diff --git a/media-gfx/splashutils/splashutils-1.5.2.1.ebuild b/media-gfx/splashutils/splashutils-1.5.2.1.ebuild
index 115a43ec1baf..f17caaec6226 100644
--- a/media-gfx/splashutils/splashutils-1.5.2.1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.2.1.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.5.2.1.ebuild,v 1.3 2007/10/11 08:03:15 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.2.1.ebuild,v 1.4 2007/10/11 16:01:51 uberlord Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -96,6 +96,11 @@ src_unpack() {
 	fi
 
 	sed -i -e "s#/lib/splash#/$(get_libdir)/splash#" "${S}"/scripts/{splash_manager,splash_geninitramfs}
+
+	if has_version ">=sys-apps/baselayout-2.0.0_rc5"; then
+		cd "${SG}"
+		epatch "${FILESDIR}/${P}-baselayout-rc5.patch"
+	fi
 }
 
 src_compile() {