Commits

Providence SALUMU  committed 52e856c

splashutils: don_t commit using truetype use

  • Participants
  • Parent commits 3bff702

Comments (0)

Files changed (16)

File media-gfx/splashutils/Manifest

+AUX splashutils-1.5.4.3-daemon-exit-signal.patch 2764 RMD160 cbfc7e4139fbf9f7b28a53da5ff53f5420c4c5fd SHA1 5e30fa7c4d76ad559f13795b022d45169a2bee71 SHA256 8d7d17ae6591f3de0bde18c537166710b1eac0f6aeb1507aecdf8d6a3d1553eb
+AUX splashutils-1.5.4.3-fix_rc_var.patch 1084 RMD160 d60bdea6625c9ce4d42d281c38888b8bcb823525 SHA1 31b831b79ea3944a52d0ca9fd45891c73170c758 SHA256 c51b29f3c6191ac6259db52f56050a34872f07a78463a1ac1e4fbaf89d2f81d8
+AUX splashutils-1.5.4.3-libjpeg.patch 1693 RMD160 d26031ef3f618bca870431dc1c2fdeba443dca23 SHA1 1c557e9db5a93470e8c6fcde6d63ade1f75fc3bc SHA256 83d9a0ededa96c213a3120c45969d6b8f00e97f2104a221541badd67f82259c7
+AUX splashutils-1.5.4.3-makefile.patch 1257 RMD160 1fb565cb543efe438f5c47cf490aa3cffe07d559 SHA1 011baf9ea9c1313edb3045dc7a52c28d3b84c83e SHA256 6ca31fc77f75bda368642da7effbaa0fd3c69bce86c9e04bfe55b9ab4d259cf3
+AUX splashutils-1.5.4.3-nondefault-runlevel.patch 894 RMD160 7c337e018858e091106ed3dbc71212ebaa213d39 SHA1 dbf40c7ef79ea62e113a087b3784dfd8aaea3f31 SHA256 c462ef5e4c2514bad9a5aca78cce923109bcb0cff5a292286e74b2f1e8ec457f
+AUX splashutils-1.5.4.3-openrc-effects.patch 2261 RMD160 ad5b78025b1a2520a1b44a43f3afe1fc131ab54e SHA1 72d03fd782faf611399ea9e0217af6d6739731a8 SHA256 ea416ce53c805241b05bfff48439c4c26dbbb717001356ec08f8820ff8baec09
+AUX splashutils-1.5.4.3-openrc-umount-fix.patch 1152 RMD160 a5acc1c648ca41d1aabe823c6e44aad53a1bc965 SHA1 98c6233e367a54e137ef1637725924a8a2d32871 SHA256 56f48bd31c0d405abbb2d320c131f109fcf6ee7a2ef5bed00b024dd872ef31ea
+AUX splashutils-1.5.4.3-splash_geninitramfs.patch 606 RMD160 cf5b1cb43bb39acf40b761bba700a742930e91b9 SHA1 c5844ce733f3da949f12ab0cd6dc5786dba5c7e4 SHA256 9fe2d8c232a58089e902af3aebeba569669310fc1219da5d2c8775d4e10929ca
+AUX splashutils-1.5.4.4-fbtruetype-bzip2.patch 435 RMD160 abdfcfe139206a9dc41ab61e9339936ee91f2263 SHA1 eadf39871f9676590f91fab61f36f64137fa827b SHA256 b9ccd9d4d288500a1c5950691d929b52d29706e3a03a75063ed167b4bdb7b7b5
+AUX splashutils-1.5.4.4-fbtruetype-bzip2.patch~ 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 RMD160 76f7b0d7caf56c260439a5a7655e6435259df422 SHA1 f53bce95c24e6c9d2cc8c59e0d7b37043e294fcd SHA256 92ee0727bfd9fe6f9565d09546ea63079467f67c2d57385713a62d0b617bb1bf
+AUX splashutils-openrc-0.4-fix.patch 2750 RMD160 b9e7694c7e2d2083e62f321f232be9054696f06b SHA1 1d3c6c7418a0ada751dec57dff075af709f0b383 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846
+AUX splashutils-openrc-0.4.3-runlevel-fix.patch 3472 RMD160 2e45065be3e8f670034df92a83e6c8ee9f8fb237 SHA1 a4d7bae4844070697091f84bd4a7602b8eabab26 SHA256 9e122dc031acee6996375170ae8954a0ea78cc99ba9265ab2e4ba540da25cb94
+DIST freetype-2.3.12.tar.bz2 1453034 RMD160 57437a2bc0d85859cff2ca1253b36e64629397a1 SHA1 ebf0438429c0bedd310059326d91646c3c91016b SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92
+DIST freetype-2.3.5.tar.bz2 1279861 RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 SHA1 45695d44c74be31944d807526a7e69a818e4afd2 SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
+DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 SHA1 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
+DIST jpegsrc.v8a.tar.gz 962018 RMD160 cdf6c356ea1a631e37256893e80206ad6ecc3fab SHA1 78077fb22f0b526a506c21199fbca941d5c671a9 SHA256 bf86a5eaafa79b5d60feb27bee08df2db4c9ca2fb40d453e7a2080f7663a713b
+DIST libpng-1.2.18.tar.bz2 623690 RMD160 ea81056a896eb038fa5d7fde2b7fa626c1a2e31e SHA1 42156e45fa999b242dc63c261e9253ce0dd810ab SHA256 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62
+DIST libpng-1.2.43.tar.bz2 678799 RMD160 6c108f06ae32a86ddd8571e9031f143932f19531 SHA1 28ea29305d233669ce565894a95151e4427d1f34 SHA256 c76d5540b0c09e130497be8906e0acadbbf9e299d0aa2258d912c4ee7cacc82a
+DIST libpng-1.4.3.tar.bz2 658335 RMD160 ad0abc000e0a338d94ff7f8fe2b862d5944ec7bb SHA1 82eda95439daaef6ed564b1532cf805b01759557 SHA256 2b022f39f4788505ad62a4b1f4a33286228d544719680da40f3626393ecde4a2
+DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94e44149ab SHA1 d3d0df74b4f613e505d662134a7af5c0cc488108 SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336
+DIST splashutils-gentoo-1.0.16.tar.bz2 15568 RMD160 f4831c381ac875b5bf9ad9ff527ae2e6cfd2b5d5 SHA1 6756807056c94f4dcc99f73489039dced6aecf4b SHA256 f9c51f442b5a638ac68a731925da57c3402d9506f160681fc01bf80e396d409d
+DIST splashutils-gentoo-1.0.17.tar.bz2 15814 RMD160 283baea7b24cd5cc41c63da9fd8f3120fa51e40c SHA1 128d7f5cadc16d486f3a1e4836b9c248169a61f8 SHA256 6877263d0b6f5a3532db0d6a531cd4d41fbc6c45a16c5d10050e9048ecc1af81
+DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
+DIST splashutils-lite-1.5.4.4.tar.bz2 441340 RMD160 f67a93aa38bcbda7131c8570533aa021d43bb77f SHA1 46c5aa6e25d7623f46ca2158c10c5ba5d0774744 SHA256 bc0e22293d4550281d2289672da3acb42594c18a75b9d00ba75526e05162ec6b
+DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
+EBUILD splashutils-1.5.4.3-r2.ebuild 8043 RMD160 5a42f8f87d6e41b60ef8b5cbff4b4f4dc4509a88 SHA1 044ec62599091a714408f0301d6f20238246d060 SHA256 2525b3bc99dc68455cc7b7eef5b4b3df18ab93946cff8e1534f38199a84f0cf9
+EBUILD splashutils-1.5.4.3.ebuild 7851 RMD160 266d9fa741112185cc75c452f8a2d3cd3f21b443 SHA1 503e4ae676b6d8180362f1096557aa71b387bdd7 SHA256 63a83558720438fc5813c8d03ed4706e77be4bf0a831bdb4cee9bd55140a74ed
+EBUILD splashutils-1.5.4.4.ebuild 7823 RMD160 0fc9025778cf0ccc7a8b0a251530ec6f0484db6f SHA1 aad791fcfa7fa854d6cc9082a3d14e8330063659 SHA256 5b76a44506830194532d3c5774f1f7c63f8c7fa0a654aa33135f024bba0501c5

File media-gfx/splashutils/files/splashutils-1.5.4.3-daemon-exit-signal.patch

+diff --git a/core/src/daemon.c b/core/src/daemon.c
+index e3463fc..eae23ec 100644
+--- a/core/src/daemon.c
++++ b/core/src/daemon.c
+@@ -306,6 +306,35 @@ void handler_alarm(int unused)
+ 	return;
+ }
+ 
++int process_switch_sig(int sig)
++{
++	/* Switch from silent to verbose. */
++	if (sig == SIGUSR1) {
++		pthread_mutex_lock(&mtx_paint);
++		pthread_mutex_lock(&mtx_tty);
++		ioctl(fd_tty[config.tty_s], VT_RELDISP, 1);
++		pthread_mutex_unlock(&mtx_tty);
++
++		ctty = CTTY_VERBOSE;
++		pthread_mutex_unlock(&mtx_paint);
++		return 1;
++	/* Switch back to silent. */
++	} else if (sig == SIGUSR2) {
++		pthread_mutex_lock(&mtx_paint);
++		pthread_mutex_lock(&mtx_tty);
++		ioctl(fd_tty[config.tty_s], VT_RELDISP, 2);
++		pthread_mutex_unlock(&mtx_tty);
++
++		ctty = CTTY_SILENT;
++		pthread_mutex_unlock(&mtx_paint);
++
++		switch_silent();
++		return 2;
++	}
++
++	return 0;
++}
++
+ /*
+  * Signal handler.
+  *
+@@ -315,7 +344,7 @@ void handler_alarm(int unused)
+  */
+ void* thf_sighandler(void *unusued)
+ {
+-	sigset_t sigset;
++	sigset_t sigset, sigset_switch;
+ 	int sig;
+ 
+ 	/* We don't handle SIGALRM. */
+@@ -329,31 +358,39 @@ void* thf_sighandler(void *unusued)
+ 	sigaddset(&sigset, SIGTERM);
+ 	sigaddset(&sigset, SIGINT);
+ 
++	sigemptyset(&sigset_switch);
++	sigaddset(&sigset_switch, SIGUSR1);
++	sigaddset(&sigset_switch, SIGUSR2);
++
+ 	while (1) {
+ 		sigwait(&sigset, &sig);
+ 
+-		/* Switch from silent to verbose. */
+-		if (sig == SIGUSR1) {
+-			pthread_mutex_lock(&mtx_paint);
+-			pthread_mutex_lock(&mtx_tty);
+-			ioctl(fd_tty[config.tty_s], VT_RELDISP, 1);
+-			pthread_mutex_unlock(&mtx_tty);
+-
+-			ctty = CTTY_VERBOSE;
+-			pthread_mutex_unlock(&mtx_paint);
+-		/* Switch back to silent. */
+-		} else if (sig == SIGUSR2) {
+-			pthread_mutex_lock(&mtx_paint);
+-			pthread_mutex_lock(&mtx_tty);
+-			ioctl(fd_tty[config.tty_s], VT_RELDISP, 2);
+-			pthread_mutex_unlock(&mtx_tty);
+-
+-			ctty = CTTY_SILENT;
+-			pthread_mutex_unlock(&mtx_paint);
++		process_switch_sig(sig);
++
++		/* Internally generated terminate signal */
++		if (sig == SIGINT) {
++			struct timespec timeout;
++			timeout.tv_sec = 0;
++			timeout.tv_nsec = 0;
++			bool pending = true;
++
++			/*
++			 * Process any remaining signals.  There are no guarantees as to the
++			 * order in which the signals are delivered, so we have to make sure
++			 * all pending signals are processed before exiting.
++			 */
++			while (pending) {
++				sig = sigtimedwait(&sigset_switch, NULL, &timeout);
++
++				if (sig == -1) {
++					/* No more pending signals. */
++					if (errno == EAGAIN)
++						pending = false;
++				} else {
++					process_switch_sig(sig);
++				}
++			}
+ 
+-			switch_silent();
+-		} else if (sig == SIGINT) {
+-			/* internally generated terminate signal */
+ 			do_cleanup();
+ 			pthread_exit(NULL);
+ 		} else if (sig == SIGTERM) {

File media-gfx/splashutils/files/splashutils-1.5.4.3-fix_rc_var.patch

+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;
+ 	}
+ 

File media-gfx/splashutils/files/splashutils-1.5.4.3-libjpeg.patch

+diff --git a/core/libs/Makefile.am b/core/libs/Makefile.am
+index d070b29..c0a9258 100644
+--- a/core/libs/Makefile.am
++++ b/core/libs/Makefile.am
+@@ -53,7 +53,7 @@ libfreetype.a: klibc_compat.h
+ 	if ! $(MAKE) --question $(AM_MAKEFLAGS) CFLAGS="$(K_CFLAGS)" library ; then \
+ 		$(call infmsg,MAKE,libfreetype.a) ; \
+ 	fi ; \
+-	$(MAKE) $(AM_MAKEFLAGS) CFLAGS="-c $(K_CFLAGS)" CCexe="$(BUILD_CC)" library $(OUTPUT)
++	$(MAKE) $(AM_MAKEFLAGS) CFLAGS="-c $(K_CFLAGS)" CCexe="$(BUILD_CC)" ANSIFLAGS="" library $(OUTPUT)
+ 	$(Q)$(MKDIR_P) $(@D)
+ 	$(Q)cp -f libfreetype/.libs/libfreetype.a $@
+ 
+@@ -62,18 +62,18 @@ libjpeg.a:
+ 	$(Q)cd libjpeg ; \
+ 	if test ! -e ./Makefile ; then \
+ 		$(call infmsg,CONF,libjpeg.a) ; \
+-		CC=$(KLCC) CFLAGS="$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg" $(LIBJPEG_SOURCE)/configure \
++		CC=$(KLCC) CFLAGS="$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg -include $(abs_top_srcdir)/libs/klibc_compat.h" $(LIBJPEG_SOURCE)/configure \
+ 		--host=$(host) --build=$(build_triplet) $(OUTPUT) ; \
+ 		echo "#define NO_GETENV 1" >> jconfig.h ; \
+ 		$(SED) -i "s#CFLAGS=.*#CFLAGS=$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg#" Makefile ; \
+ 		$(SED) -i "s:#define JMESSAGE.*::" $(LIBJPEG_SOURCE)/jerror.c ; \
+ 	fi ; \
+-	if ! $(MAKE) --question $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.a ; then  \
++	if ! $(MAKE) --question $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.la ; then  \
+ 		$(call infmsg,MAKE,libjpeg.a) ; \
+ 	fi ; \
+-	$(MAKE) $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.a $(OUTPUT)
++	$(MAKE) $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.la $(OUTPUT)
+ 	$(Q)$(MKDIR_P) $(@D)
+-	$(Q)cp -f libjpeg/libjpeg.a $@
++	$(Q)cp -f libjpeg/.libs/libjpeg.a $@
+ 
+ libpng.a: libz.a
+ 	$(Q)cd $(LIBPNG_SOURCE) ; \

File media-gfx/splashutils/files/splashutils-1.5.4.3-makefile.patch

+diff --git a/core/src/Makefile.am b/core/src/Makefile.am
+index 20cb03e..fa6919d 100644
+--- a/core/src/Makefile.am
++++ b/core/src/Makefile.am
+@@ -119,7 +119,7 @@ libfbsplashrender_la_SOURCES  = \
+ 	fbsplash.h
+ libfbsplashrender_la_CFLAGS   = $(AM_CFLAGS)
+ libfbsplashrender_la_LDFLAGS  = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version)
+-libfbsplashrender_la_LIBADD   = -lfbsplash
++libfbsplashrender_la_LIBADD   = libfbsplash.la
+ 
+ libfbsplashrender_la_CFLAGS  += $(JPEG_CFLAGS)
+ libfbsplashrender_la_LIBADD  += $(JPEG_LIBS)
+@@ -258,10 +258,10 @@ fbcondecor_helper_LDFLAGS  += -static
+ endif
+ 
+ # Override automake's generation of target rules for building fbcondecor_helper.
+-fbcondecor_helper: $(fbcondecor_helper_LDADD) $(fbcondecor_helper_OBJECTS)
++fbcondecor_helper: $(fbcondecor_helper_LDADD) $(fbcondecor_helper_OBJECTS) $(lib_LTLIBRARIES)
+ 	@$(call infmsg,LD,$@)
+ 	$(Q)$(MKDIR_P) $(@D)
+-	$(Q)$(KLCC) $(fbcondecor_helper_CFLAGS) $(fbcondecor_helper_LDFLAGS) $+ $(fbcondecor_helper_LDADD) -o $@
++	$(Q)$(KLCC) $(fbcondecor_helper_CFLAGS) $(fbcondecor_helper_LDFLAGS) $(fbcondecor_helper_OBJECTS) $(fbcondecor_helper_LDADD) -o $@
+ 	$(Q)$(STRIP) $@
+ 
+ # Override automake's generation of target rules for building fbcondecor_helper object files.
+

File media-gfx/splashutils/files/splashutils-1.5.4.3-nondefault-runlevel.patch

+commit 6f9aa3a3bc11e539613facf3caba5dcdb43c0117
+Author: Michał Januszewski <spock@gentoo.org>
+Date:   Sun Nov 22 20:56:47 2009 +0100
+
+    gentoo: make sure the splash daemon works when boot goes through a named runlevel other than default
+
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index d831d0c..4b9a5b9 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -777,10 +777,12 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ 			hook != RC_HOOK_RUNLEVEL_START_OUT)
+ 			goto exit;
+ 	} else {
++		int pid;
++
+ 		/* 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))
++			strcmp(runlev, RC_LEVEL_SYSINIT) && fbsplash_check_daemon(&pid))
+ 			goto exit;
+ 
+ 		if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) &&

File media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-effects.patch

+commit 7cf5fd02bbc6422ddbc9af7185cc47657148deb0
+Author: Michał Januszewski <spock@gentoo.org>
+Date:   Sun Apr 4 16:19:40 2010 +0200
+
+    gentoo: only enable the effects that are actually selected.
+
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index 4b9a5b9..5220571 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -660,7 +660,7 @@ static int splash_start(const char *runlevel)
+ 			 (config->type == fbspl_reboot) ? "reboot" : ((config->type == fbspl_shutdown) ? "shutdown" : "bootup"),
+ 			 (config->kdmode == KD_GRAPHICS) ? "--kdgraphics" : "",
+ 			 (config->textbox_visible) ? "--textbox" : "",
+-			 (config->effects & (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) ? "--effects=fadeout,fadein" :
++			 ((config->effects & (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) == (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) ? "--effects=fadeout,fadein" :
+ 				 ((config->effects & FBSPL_EFF_FADEOUT) ? "--effects=fadeout" :
+ 					 ((config->effects & FBSPL_EFF_FADEIN) ? "--effects=fadein" : "")));
+ 
+@@ -716,11 +716,7 @@ static int splash_stop(const char *runlevel)
+ 
+ 	/* 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 fbsplash_cache_cleanup(NULL);
+-	} else {
+-		return fbsplash_cache_cleanup(save);
+-	}
++	return fbsplash_cache_cleanup(save);
+ }
+ 
+ int rc_plugin_hook(RC_HOOK hook, const char *name)
+
+commit d711147fc835cf408a9a4e7432fc565a6b952183
+Author: Michał Januszewski <spock@gentoo.org>
+Date:   Sun Apr 4 16:57:23 2010 +0200
+
+    gentoo: add some comments in splash.conf
+
+diff --git a/gentoo/splash.conf b/gentoo/splash.conf
+index 4cf0a32..f056382 100644
+--- a/gentoo/splash.conf
++++ b/gentoo/splash.conf
+@@ -21,7 +21,10 @@ SPLASH_TEXTBOX="no"
+ SPLASH_AUTOVERBOSE="0"
+ 
+ # Name of the boot service starting X.  Useful in cases when X is started
+-# by a custom initscript, other than the usual 'xdm'.
++# by a custom initscript, other than the usual 'xdm'.  If you are using a
++# custom X initscript and do not set this variable correctly, do not be
++# surprised if you end up at tty1 at the end of the boot process (instead of
++# in an X session).
+ # SPLASH_XSERVICE="xdm"
+ 
+ #########################################################################

File media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-umount-fix.patch

+commit ae4b5cc9c2d904e18db51876d9bd292504714600
+Author: Michał Januszewski <spock@gentoo.org>
+Date:   Mon Apr 6 20:59:48 2009 +0200
+
+    Prevent umounting of theme directories.
+    
+    Some themes dynamically modify themselves during boot.  In order to be
+    able to do that, they mount a tmpfs in their main directory.  Prevent
+    openrc from umounting this directory when rebooting.
+
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index 048e0ec..d831d0c 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -968,10 +968,10 @@ do_start:
+ 		if (name && !strcmp(name, "localmount")) {
+ 			char *umounts = getenv("RC_NO_UMOUNTS");
+ 
+-            if (umounts)
+-                fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s:%s", umounts, FBSPLASH_CACHEDIR);
+-            else
+-                fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s", FBSPLASH_CACHEDIR);
++			if (umounts)
++				fprintf(rc_environ_fd, "RC_NO_UMOUNTS=%s:" FBSPLASH_CACHEDIR ":/etc/splash/%s", umounts, config->theme);
++			else
++				fprintf(rc_environ_fd, "RC_NO_UMOUNTS=" FBSPLASH_CACHEDIR ":/etc/splash/%s", config->theme);
+ 		}
+ 		i = splash_svc_handle(name, "svc_stop", false);
+ 		break;

File media-gfx/splashutils/files/splashutils-1.5.4.3-splash_geninitramfs.patch

+diff --git a/core/scripts/splash_geninitramfs.in b/core/scripts/splash_geninitramfs.in
+index 9d75d21..ff9b75b 100644
+--- a/core/scripts/splash_geninitramfs.in
++++ b/core/scripts/splash_geninitramfs.in
+@@ -149,7 +149,7 @@ if [ "$mode" == "a" ]; then
+ fi
+ 
+ printv "o Creating directory structure.."
+-mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,lib/splash/proc,root,sbin,lib/splash/sys}
++mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,@libdir@/splash/proc,root,sbin,@libdir@/splash/sys}
+ 
+ if [ $EUID == 0 ]; then
+ 	[[ ! -e "${imgdir}/dev/null" ]] 	&& mknod "${imgdir}/dev/null" c 1 3

File media-gfx/splashutils/files/splashutils-1.5.4.4-fbtruetype-bzip2.patch

+--- fbtruetype/Makefile.old	2011-07-12 16:57:03.110616657 +0300
++++ fbtruetype/Makefile.old	2011-07-12 16:48:31.656254788 +0300
+@@ -23,7 +23,7 @@ 
+ OBJECTS  = fbtruetype.o messages.o console.o ttf.o luxisri.o
+ 
+ LDFLAGS  += -L$(LIBDIR)
+-LIBSS    = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm
++LIBSS    = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a $(LIBDIR)/libbz2.a -lm
+ LIBSD    = -lfreetype -lm
+ 
+ CFLAGS   += -I/usr/include/freetype2

File media-gfx/splashutils/files/splashutils-1.5.4.4-gentoo-typo-fix.patch

+commit 74dda8291efae78f00bb781148c8fd4fccaeb764
+Author: Michał Januszewski <spock@gentoo.org>
+Date:   Tue Jun 14 23:23:33 2011 +0200
+
+    Fix typo in the Gentoo initscript.
+
+diff --git a/gentoo/init-fbcondecor b/gentoo/init-fbcondecor
+index b66f40a..ce921b6 100755
+--- a/gentoo/init-fbcondecor
++++ b/gentoo/init-fbcondecor
+@@ -12,7 +12,7 @@ start() {
+ 	splash_setup
+ 
+ 	if [ -z "${FBCONDECOR_TTYS}" ]; then
+-		FBCONDECOR_TTYS=$(seq 1 "${rc_tty_number:-${RC_TTY_NUMBER}:-12}")
++		FBCONDECOR_TTYS=$(seq 1 "${rc_tty_number:-${RC_TTY_NUMBER:-12}}")
+ 	fi
+ 
+ 	local err=0

File media-gfx/splashutils/files/splashutils-openrc-0.4-fix.patch

+commit a58099249acdce1fbdab19f5dfea0704c4c545f2
+Author: Michał Januszewski <spock@gentoo.org>
+Date:   Sun Dec 28 13:32:16 2008 +0100
+
+    gentoo: make the splash plugin work with OpenRC 0.4.*
+
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index 26d0fa4..b6fa774 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -593,7 +593,7 @@ static int splash_start(const char *runlevel)
+ 
+ 	/* Get a list of services that we'll have to handle. */
+ 	/* We're rebooting/shutting down. */
+-	if (!strcmp(runlevel, RC_LEVEL_SHUTDOWN) || !strcmp(runlevel, RC_LEVEL_REBOOT)) {
++	if (!strcmp(runlevel, RC_LEVEL_SHUTDOWN)) {
+ 		if ((err = fbsplash_cache_prep()))
+ 			return err;
+ 		splash_svcs_stop(runlevel);
+@@ -690,10 +690,14 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ 	int retval = 0;
+ 
+ 	runlev = rc_runlevel_get();
+-	if (!strcmp(runlev, RC_LEVEL_REBOOT))
+-		type = fbspl_reboot;
+-	else if (!strcmp(runlev, RC_LEVEL_SHUTDOWN))
+-		type = fbspl_shutdown;
++	if (!strcmp(runlev, RC_LEVEL_SHUTDOWN)) {
++		char *t = getenv("RUNLEVEL");
++		if (t && !strcmp(t, "6")) {
++			type = fbspl_reboot;
++		} else {
++			type = fbspl_shutdown;
++		}
++	}
+ 
+ 	/* Get boot and default levels from env variables exported by RC.
+ 	 * If unavailable, use the default ones. */
+@@ -716,7 +720,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ 			list = rc_stringlist_new();
+ 			get_list_fp(list, fp);
+ 			TAILQ_FOREACH(s, list, entries)
+-				rc_service_mark(s->value, RC_SERVICE_COLDPLUGGED);
++				rc_service_mark(s->value, RC_SERVICE_HOTPLUGGED);
+ 			pclose(fp);
+ 			rc_stringlist_free(list);
+ 		}
+@@ -739,7 +743,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ 			goto exit;
+ 
+ 		if (rc_runlevel_stopping() && strcmp(runlev, bootlevel) &&
+-			strcmp(runlev, RC_LEVEL_REBOOT) && strcmp(runlev, RC_LEVEL_SHUTDOWN))
++			strcmp(runlev, RC_LEVEL_SHUTDOWN))
+ 			goto exit;
+ 	}
+ 
+@@ -763,7 +767,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ 	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 (strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
+ 			if ((i = splash_start(name))) {
+ 				fbsplash_set_verbose(0);
+ 				retval= i;
+@@ -788,7 +792,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ 	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) {
++		if (strcmp(name, RC_LEVEL_SHUTDOWN) == 0) {
+ 			config->verbosity = FBSPL_VERB_QUIET;
+ 			i = fbsplash_check_daemon(&pid_daemon);
+ 			config->verbosity = FBSPL_VERB_NORMAL;

File media-gfx/splashutils/files/splashutils-openrc-0.4.3-runlevel-fix.patch

+commit 4bb63f7fb23b11591e2984ce87d4f36d80e29d65
+Author: Michał Januszewski <spock@gentoo.org>
+Date:   Wed Mar 25 22:26:04 2009 +0100
+
+    gentoo: export the sysvinit RUNLEVEL variable for compatibility reasons
+    
+    OpenRC 0.4.3+ no longer exports some sysvinit variables, including
+    RUNLEVEL.  In order to avoid breaking themes and scripts which still
+    rely on this variable being present, we compute a suitable RUNLEVEL
+    value using the data available in OpenRC and then export it in
+    splash_call().
+
+diff --git a/gentoo/splash.c b/gentoo/splash.c
+index 726315f..048e0ec 100644
+--- a/gentoo/splash.c
++++ b/gentoo/splash.c
+@@ -41,7 +41,7 @@
+ #define SPLASH_CMD "export SPLASH_XRES='%d'; export SPLASH_YRES='%d';" \
+ 				   "export SOFTLEVEL='%s'; export BOOTLEVEL='%s';" \
+ 				   "export DEFAULTLEVEL='%s'; export svcdir=${RC_SVCDIR};" \
+-				   ". /sbin/splash-functions.sh; %s %s %s"
++				   "export RUNLEVEL='%s'; . /sbin/splash-functions.sh; %s %s %s"
+ 
+ static char		*bootlevel = NULL;
+ static char		*defaultlevel = NULL;
+@@ -260,11 +260,32 @@ static int splash_config_gentoo(fbspl_cfg_t *cfg, fbspl_type_t type)
+ 	return 0;
+ }
+ 
++static const char *splash_sysvinit_runlevel(const char *runlevel)
++{
++	const char *runlev = runlevel ? runlevel : rc_runlevel_get();
++
++	if (!strcmp(runlev, RC_LEVEL_SHUTDOWN)) {
++		char *t = getenv("RC_REBOOT");
++		if (t && !strcmp(t, "YES")) {
++			return "6";
++		} else {
++			return "0";
++		}
++	} else if (!strcmp(runlev, RC_LEVEL_SYSINIT)) {
++		return "S";
++	} else if (!strcmp(runlev, RC_LEVEL_SINGLE)) {
++		return "1";
++	} else {
++		return "3";
++	}
++}
++
++
+ /*
+  * Call a function from /sbin/splash-functions.sh.
+  * This is rather slow, so use it only when really necessary.
+  */
+-static int splash_call(const char *cmd, const char *arg1, const char *arg2)
++static int splash_call(const char *cmd, const char *arg1, const char *arg2, const char *runlevel)
+ {
+ 	char *c;
+ 	int l;
+@@ -285,7 +306,8 @@ static int splash_call(const char *cmd, const char *arg1, const char *arg2)
+ 
+ 	snprintf(c, l, SPLASH_CMD, xres, yres,
+ 			arg1 ? (strcmp(arg1, RC_LEVEL_SYSINIT) == 0 ? bootlevel : soft) : soft,
+-			bootlevel, defaultlevel, cmd, arg1 ? arg1 : "", arg2 ? arg2 : "");
++			bootlevel, defaultlevel, runlevel,
++			cmd, arg1 ? arg1 : "", arg2 ? arg2 : "");
+ 	l = system(c);
+ 	free(c);
+ 	return l;
+@@ -316,15 +338,16 @@ static int splash_theme_hook(const char *name, const char *type, const char *arg
+ 	}
+ 
+ 	if (!strcmp(name, "rc_init") || !strcmp(name, "rc_exit")) {
+-		l = splash_call(buf, arg1, getenv("RUNLEVEL"));
++		const char *t = splash_sysvinit_runlevel(arg1);
++		l = splash_call(buf, arg1, t, t);
+ 	} else if (!strcmp(name, "svc_started") || !strcmp(name, "svc_stopped")) {
+ 		/*
+ 		 * Set the 2nd parameter to 0 so that we don't break themes using the
+ 		 * legacy interface in which these events contained an error code.
+ 		 */
+-		l = splash_call(buf, arg1, "0");
++		l = splash_call(buf, arg1, "0", splash_sysvinit_runlevel(NULL));
+ 	} else {
+-		l = splash_call(buf, arg1, NULL);
++		l = splash_call(buf, arg1, NULL, splash_sysvinit_runlevel(NULL));
+ 	}
+ 	free(buf);
+ 	return l;
+@@ -710,8 +733,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ 
+ 	runlev = rc_runlevel_get();
+ 	if (!strcmp(runlev, RC_LEVEL_SHUTDOWN)) {
+-		char *t = getenv("RUNLEVEL");
+-		if (t && !strcmp(t, "6")) {
++		if (!strcmp(splash_sysvinit_runlevel(NULL), "6")) {
+ 			type = fbspl_reboot;
+ 		} else {
+ 			type = fbspl_shutdown;

File media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild

+# Copyright 1999-2010 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-r2.ebuild,v 1.5 2010/04/04 15:20:23 spock Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.16"
+V_JPEG="8a"
+V_PNG="1.2.43"
+V_ZLIB="1.2.3"
+V_FT="2.3.12"
+
+ZLIBSRC="libs/zlib-${V_ZLIB}"
+LPNGSRC="libs/libpng-${V_PNG}"
+JPEGSRC="libs/jpeg-${V_JPEG}"
+FT2SRC="libs/freetype-${V_FT}"
+
+RESTRICT="test"
+IUSE="hardened +png +truetype +mng gpm fbcondecor"
+
+DESCRIPTION="Framebuffer splash utilities."
+HOMEPAGE="http://fbsplash.berlios.de"
+SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
+	mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2
+	mirror://gentoo/${MISCSPLASH}.tar.bz2
+	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
+	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
+	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
+	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+RDEPEND="gpm? ( sys-libs/gpm )
+	truetype? ( >=media-libs/freetype-2 )
+	png? ( >=media-libs/libpng-1.2.7 )
+	mng? ( media-libs/lcms media-libs/libmng )
+	>=media-libs/jpeg-6b:0
+	>=sys-apps/baselayout-1.9.4-r5
+	app-arch/cpio
+	media-gfx/fbgrab
+	!sys-apps/lcdsplash"
+DEPEND="${RDEPEND}
+	>=dev-libs/klibc-1.5
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P/_/-}"
+SG="${WORKDIR}/${GENTOOSPLASH}"
+SM="${WORKDIR}/${MISCSPLASH}"
+
+pkg_setup() {
+	if use hardened; then
+		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
+		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
+		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
+		ewarn "the splash kernel helper."
+	fi
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
+	# We need to delete the Makefile and let it be rebuilt when splashutils
+	# is being configured. Either that, or we end up with a segfaulting kernel
+	# helper.
+	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
+
+	cd "${S}"
+	ln -sf "${S}/src" "${WORKDIR}/core"
+
+	if ! tc-is-cross-compiler && \
+	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
+		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
+		ewarn "splashutils, you're on your own, as this configuration is not supported."
+	else
+		# This should make splashutils compile on systems with hardened GCC.
+		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
+	fi
+
+	if ! use truetype ; then
+		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
+	fi
+
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-makefile.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_geninitramfs.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-libjpeg.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-daemon-exit-signal.patch
+
+	cd "${SG}"
+	if has_version ">=sys-apps/openrc-0.4.0"; then
+		epatch "${FILESDIR}"/splashutils-openrc-0.4-fix.patch
+		if has_version ">=sys-apps/openrc-0.4.3"; then
+			epatch "${FILESDIR}"/splashutils-openrc-0.4.3-runlevel-fix.patch
+		fi
+	fi
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-fix_rc_var.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-umount-fix.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-nondefault-runlevel.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-effects.patch
+	cd "${S}"
+
+	rm -f m4/*
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${SM}"
+	emake CC="${CC}" LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
+
+	cd "${S}"
+	econf \
+		$(use_with png) \
+		$(use_with mng) \
+		$(use_with gpm) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttf-kernel) \
+		$(use_enable fbcondecor) \
+		--docdir=/usr/share/doc/${PF} \
+		--with-freetype2-src=${FT2SRC} \
+		--with-jpeg-src=${JPEGSRC} \
+		--with-lpng-src=${LPNGSRC} \
+		--with-zlib-src=${ZLIBSRC} \
+		--with-essential-libdir=/$(get_libdir) || die "failed to configure splashutils"
+}
+
+src_compile() {
+	emake CC="${CC}" STRIP="true" || die "failed to build splashutils"
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		emake LIB=$(get_libdir) || die "failed to build the splash plugin"
+	fi
+}
+
+src_install() {
+	local LIB=$(get_libdir)
+
+	# Sabayon: tweak /etc/conf.d/splash settings
+	sed -i 's/SPLASH_VERBOSE_ON_ERRORS="yes"/SPLASH_VERBOSE_ON_ERRORS="no"/g' "${SG}"/splash.conf || \
+		die "cannot tweak SPLASH_VERBOSE_ON_ERRORS"
+	sed -i 's/SPLASH_AUTOVERBOSE=".*"/SPLASH_AUTOVERBOSE="20"/g' "${SG}"/splash.conf || \
+		die "cannot tweak SPLASH_AUTOVERBOSE"
+
+	cd "${SM}"
+	make DESTDIR="${D}" LIB=${LIB} install || die
+
+	cd "${S}"
+	make DESTDIR="${D}" STRIP="true" install || die
+
+	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
+	gen_usr_ldscript libfbsplash.so
+
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
+	doenvd 99splash
+
+	if use fbcondecor ; then
+		newinitd "${SG}"/init-fbcondecor fbcondecor
+		newconfd "${SG}"/fbcondecor.conf fbcondecor
+	fi
+	newconfd "${SG}"/splash.conf splash
+
+	insinto /usr/share/${PN}
+	doins "${SG}"/initrd.splash
+
+	insinto /etc/splash
+	doins "${SM}"/fbtruetype/luxisri.ttf
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin"
+	else
+		cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/
+	fi
+
+	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
+	keepdir /${LIB}/splash/{tmp,cache,bin}
+	dosym /${LIB}/splash/bin/fbres /sbin/fbres
+
+
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
+pkg_postinst() {
+	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+		elog "This package has been designed with udev in mind. Other solutions, such as"
+		elog "devfs or a static /dev tree might work, but are generally discouraged and"
+		elog "not supported. If you decide to switch to udev, you might want to have a"
+		elog "look at 'The Gentoo udev Guide', which can be found at"
+		elog "  http://www.gentoo.org/doc/en/udev-guide.xml"
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
+		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
+		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
+		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
+		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
+		elog "to use fbcondecor, run:"
+		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
+		elog "and re-emerge splashutils."
+	fi
+
+	if ! test -f /proc/cmdline ||
+		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
+		elog "It is required that you add 'console=tty1' to your kernel"
+		elog "command line parameters."
+		elog ""
+		elog "After these modifications, the relevant part of the kernel command"
+		elog "line might look like:"
+		elog "  splash=silent,fadein,theme:emergence console=tty1"
+		elog ""
+	fi
+
+	if ! has_version 'media-gfx/splash-themes-livecd' &&
+		! has_version 'media-gfx/splash-themes-gentoo'; then
+		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+		elog "core splashutils package. To get some themes you might want to emerge:"
+		elog "  media-gfx/splash-themes-livecd"
+		elog "  media-gfx/splash-themes-gentoo"
+	fi
+
+	elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
+	elog "'fbcondecor'.  Accordingly, the old 'splash' initscript is now called"
+	elog "'fbcondecor'.  Make sure you update your system.  See:"
+	elog "    http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
+	elog "for further info about the name changes."
+	elog ""
+	elog "Also note that splash_util has now been split into splash_util, fbsplashd"
+	elog "and fbcondecor_ctl."
+}

File media-gfx/splashutils/splashutils-1.5.4.3.ebuild

+# 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.17 2009/12/07 19:58:11 spock Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.16"
+V_JPEG="6b"
+V_PNG="1.2.18"
+V_ZLIB="1.2.3"
+V_FT="2.3.5"
+
+ZLIBSRC="libs/zlib-${V_ZLIB}"
+LPNGSRC="libs/libpng-${V_PNG}"
+JPEGSRC="libs/jpeg-${V_JPEG}"
+FT2SRC="libs/freetype-${V_FT}"
+
+RESTRICT="test"
+IUSE="hardened +png +truetype +mng gpm fbcondecor"
+
+DESCRIPTION="Framebuffer splash utilities."
+HOMEPAGE="http://fbsplash.berlios.de"
+SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
+	mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2
+	mirror://gentoo/${MISCSPLASH}.tar.bz2
+	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
+	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
+	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
+	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+RDEPEND="gpm? ( sys-libs/gpm )
+	truetype? ( >=media-libs/freetype-2 )
+	png? ( >=media-libs/libpng-1.2.7 )
+	mng? ( media-libs/lcms media-libs/libmng )
+	>=media-libs/jpeg-6b
+	>=sys-apps/baselayout-1.9.4-r5
+	app-arch/cpio
+	media-gfx/fbgrab
+	!sys-apps/lcdsplash"
+DEPEND="${RDEPEND}
+	>=dev-libs/klibc-1.5
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P/_/-}"
+SG="${WORKDIR}/${GENTOOSPLASH}"
+SM="${WORKDIR}/${MISCSPLASH}"
+
+pkg_setup() {
+	if use hardened; then
+		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
+		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
+		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
+		ewarn "the splash kernel helper."
+	fi
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
+	# We need to delete the Makefile and let it be rebuilt when splashutils
+	# is being configured. Either that, or we end up with a segfaulting kernel
+	# helper.
+	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
+
+	cd "${S}"
+	ln -sf "${S}/src" "${WORKDIR}/core"
+
+	if ! tc-is-cross-compiler && \
+	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
+		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
+		ewarn "splashutils, you're on your own, as this configuration is not supported."
+	else
+		# This should make splashutils compile on systems with hardened GCC.
+		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
+	fi
+
+	if ! use truetype ; then
+		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
+	fi
+
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-makefile.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_geninitramfs.patch
+
+	cd "${SG}"
+	if has_version ">=sys-apps/openrc-0.4.0"; then
+		epatch "${FILESDIR}"/splashutils-openrc-0.4-fix.patch
+		if has_version ">=sys-apps/openrc-0.4.3"; then
+			epatch "${FILESDIR}"/splashutils-openrc-0.4.3-runlevel-fix.patch
+		fi
+	fi
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-fix_rc_var.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-umount-fix.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-nondefault-runlevel.patch
+	cd "${S}"
+
+	rm -f m4/*
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${SM}"
+	emake CC="${CC}" LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
+
+	cd "${S}"
+	econf \
+		$(use_with png) \
+		$(use_with mng) \
+		$(use_with gpm) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttf-kernel) \
+		$(use_enable fbcondecor) \
+		--docdir=/usr/share/doc/${PF} \
+		--with-freetype2-src=${FT2SRC} \
+		--with-jpeg-src=${JPEGSRC} \
+		--with-lpng-src=${LPNGSRC} \
+		--with-zlib-src=${ZLIBSRC} \
+		--with-essential-libdir=/$(get_libdir) || die "failed to configure splashutils"
+}
+
+src_compile() {
+	emake CC="${CC}" STRIP="true" || die "failed to build splashutils"
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		emake LIB=$(get_libdir) || die "failed to build the splash plugin"
+	fi
+}
+
+src_install() {
+	local LIB=$(get_libdir)
+
+	cd "${SM}"
+	make DESTDIR="${D}" LIB=${LIB} install || die
+
+	cd "${S}"
+	make DESTDIR="${D}" STRIP="true" install || die
+
+	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
+	gen_usr_ldscript libfbsplash.so
+
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
+	doenvd 99splash
+
+	if use fbcondecor ; then
+		newinitd "${SG}"/init-fbcondecor fbcondecor
+		newconfd "${SG}"/fbcondecor.conf fbcondecor
+	fi
+
+	# Sabayon: tweak /etc/conf.d/splash settings
+	sed -i 's/SPLASH_VERBOSE_ON_ERRORS="yes"/SPLASH_VERBOSE_ON_ERRORS="no"/g' "${SG}"/splash.conf || \
+		die "cannot tweak SPLASH_VERBOSE_ON_ERRORS"
+	sed -i 's/SPLASH_AUTOVERBOSE=".*"/SPLASH_AUTOVERBOSE="20"/g' "${SG}"/splash.conf || \
+		die "cannot tweak SPLASH_AUTOVERBOSE"
+
+	newconfd "${SG}"/splash.conf splash
+
+	insinto /usr/share/${PN}
+	doins "${SG}"/initrd.splash
+
+	insinto /etc/splash
+	doins "${SM}"/fbtruetype/luxisri.ttf
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin"
+	else
+		cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/
+	fi
+
+	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
+	keepdir /${LIB}/splash/{tmp,cache,bin}
+	dosym /${LIB}/splash/bin/fbres /sbin/fbres
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
+pkg_postinst() {
+	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+		elog "This package has been designed with udev in mind. Other solutions, such as"
+		elog "devfs or a static /dev tree might work, but are generally discouraged and"
+		elog "not supported. If you decide to switch to udev, you might want to have a"
+		elog "look at 'The Gentoo udev Guide', which can be found at"
+		elog "  http://www.gentoo.org/doc/en/udev-guide.xml"
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
+		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
+		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
+		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
+		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
+		elog "to use fbcondecor, run:"
+		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
+		elog "and re-emerge splashutils."
+	fi
+
+	if ! test -f /proc/cmdline ||
+		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
+		elog "It is required that you add 'console=tty1' to your kernel"
+		elog "command line parameters."
+		elog ""
+		elog "After these modifications, the relevant part of the kernel command"
+		elog "line might look like:"
+		elog "  splash=silent,fadein,theme:emergence console=tty1"
+		elog ""
+	fi
+
+	if ! has_version 'media-gfx/splash-themes-livecd' &&
+		! has_version 'media-gfx/splash-themes-gentoo'; then
+		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+		elog "core splashutils package. To get some themes you might want to emerge:"
+		elog "  media-gfx/splash-themes-livecd"
+		elog "  media-gfx/splash-themes-gentoo"
+	fi
+
+	elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
+	elog "'fbcondecor'.  Accordingly, the old 'splash' initscript is now called"
+	elog "'fbcondecor'.  Make sure you update your system.  See:"
+	elog "    http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
+	elog "for further info about the name changes."
+	elog ""
+	elog "Also note that splash_util has now been split into splash_util, fbsplashd"
+	elog "and fbcondecor_ctl."
+}

File media-gfx/splashutils/splashutils-1.5.4.4.ebuild

+# Copyright 1999-2011 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.4.ebuild,v 1.2 2011/06/14 21:33:32 spock Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.17"
+V_JPEG="8a"
+V_PNG="1.4.3"
+V_ZLIB="1.2.3"
+V_FT="2.3.12"
+
+ZLIBSRC="libs/zlib-${V_ZLIB}"
+LPNGSRC="libs/libpng-${V_PNG}"
+JPEGSRC="libs/jpeg-${V_JPEG}"
+FT2SRC="libs/freetype-${V_FT}"
+
+RESTRICT="test"
+IUSE="hardened +png +truetype +mng gpm fbcondecor"
+
+DESCRIPTION="Framebuffer splash utilities."
+HOMEPAGE="http://fbsplash.berlios.de"
+SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
+	mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2
+	mirror://gentoo/${MISCSPLASH}.tar.bz2
+	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
+	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
+	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
+	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+RDEPEND="gpm? ( sys-libs/gpm )
+	truetype? ( >=media-libs/freetype-2 )
+	png? ( >=media-libs/libpng-1.4.3[static-libs] )
+	mng? (
+		media-libs/lcms:0[static-libs]
+		|| ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 )
+		)
+	virtual/jpeg[static-libs]
+	>=sys-apps/baselayout-1.9.4-r5
+	app-arch/cpio
+	media-gfx/fbgrab
+	!sys-apps/lcdsplash"
+DEPEND="${RDEPEND}
+	>=dev-libs/klibc-1.5
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${P/_/-}"
+SG="${WORKDIR}/${GENTOOSPLASH}"
+SM="${WORKDIR}/${MISCSPLASH}"
+
+pkg_setup() {
+	if use hardened; then
+		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
+		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
+		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
+		ewarn "the splash kernel helper."
+	fi
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
+	# We need to delete the Makefile and let it be rebuilt when splashutils
+	# is being configured. Either that, or we end up with a segfaulting kernel
+	# helper.
+	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
+
+	cd "${SG}"
+	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
+
+	if use truetype ; then
+		if [[ "`freetype-config --ftversion`" > "2.4.4" ]]; then
+			cd "${SM}"
+			epatch "${FILESDIR}/splashutils-1.5.4.4-fbtruetype-bzip2.patch"
+		fi
+	fi
+
+	cd "${S}"
+	ln -sf "${S}/src" "${WORKDIR}/core"
+
+	if ! tc-is-cross-compiler && \
+	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
+		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
+		ewarn "splashutils, you're on your own, as this configuration is not supported."
+	else
+		# This should make splashutils compile on systems with hardened GCC.
+		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
+	fi
+
+	if ! use truetype ; then
+		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
+	fi
+
+	# Latest version of klibc defined its own version of ferror, so there is
+	# not need for the hack in klibc_compat.h
+	if has_version ">=dev-libs/klibc-1.5.20"; then
+		echo > "libs/klibc_compat.h"
+	fi
+
+	rm -f m4/*
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${SM}"
+	emake CC="${CC}" LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
+
+	cd "${S}"
+	econf \
+		$(use_with png) \
+		$(use_with mng) \
+		$(use_with gpm) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttf-kernel) \
+		$(use_enable fbcondecor) \
+		--docdir=/usr/share/doc/${PF} \
+		--with-freetype2-src=${FT2SRC} \
+		--with-jpeg-src=${JPEGSRC} \
+		--with-lpng-src=${LPNGSRC} \
+		--with-zlib-src=${ZLIBSRC} \
+		--with-essential-libdir=/$(get_libdir) || die "failed to configure splashutils"
+}
+
+src_compile() {
+	emake CC="${CC}" STRIP="true" || die "failed to build splashutils"
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		emake LIB=$(get_libdir) || die "failed to build the splash plugin"
+	fi
+}
+
+src_install() {
+	local LIB=$(get_libdir)
+
+	# Sabayon: tweak /etc/conf.d/splash settings
+	sed -i 's/SPLASH_VERBOSE_ON_ERRORS="yes"/SPLASH_VERBOSE_ON_ERRORS="no"/g' "${SG}"/splash.conf || \
+		die "cannot tweak SPLASH_VERBOSE_ON_ERRORS"
+	sed -i 's/SPLASH_AUTOVERBOSE=".*"/SPLASH_AUTOVERBOSE="20"/g' "${SG}"/splash.conf || \
+		die "cannot tweak SPLASH_AUTOVERBOSE"
+
+	cd "${SM}"
+	make DESTDIR="${D}" LIB=${LIB} install || die
+
+	cd "${S}"
+	make DESTDIR="${D}" STRIP="true" install || die
+
+	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
+	gen_usr_ldscript libfbsplash.so
+
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
+	doenvd 99splash
+
+	if use fbcondecor ; then
+		newinitd "${SG}"/init-fbcondecor fbcondecor
+		newconfd "${SG}"/fbcondecor.conf fbcondecor
+	fi
+	newconfd "${SG}"/splash.conf splash
+
+	insinto /usr/share/${PN}
+	doins "${SG}"/initrd.splash
+
+	insinto /etc/splash
+	doins "${SM}"/fbtruetype/luxisri.ttf
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin"
+	else
+		cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/
+	fi
+
+	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
+	keepdir /${LIB}/splash/{tmp,cache,bin,sys}
+	dosym /${LIB}/splash/bin/fbres /sbin/fbres
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
+pkg_postinst() {
+	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+		elog "This package has been designed with udev in mind. Other solutions, such as"
+		elog "devfs or a static /dev tree might work, but are generally discouraged and"
+		elog "not supported. If you decide to switch to udev, you might want to have a"
+		elog "look at 'The Gentoo udev Guide', which can be found at"
+		elog "  http://www.gentoo.org/doc/en/udev-guide.xml"
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
+		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
+		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
+		elog ""
+	fi
+
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
+		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
+		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
+		elog "to use fbcondecor, run:"
+		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
+		elog "and re-emerge splashutils."
+	fi
+
+	if ! test -f /proc/cmdline ||
+		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
+		elog "It is required that you add 'console=tty1' to your kernel"
+		elog "command line parameters."
+		elog ""
+		elog "After these modifications, the relevant part of the kernel command"
+		elog "line might look like:"
+		elog "  splash=silent,fadein,theme:emergence console=tty1"
+		elog ""
+	fi
+
+	if ! has_version 'media-gfx/splash-themes-livecd' &&
+		! has_version 'media-gfx/splash-themes-gentoo'; then
+		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+		elog "core splashutils package. To get some themes you might want to emerge:"
+		elog "  media-gfx/splash-themes-livecd"
+		elog "  media-gfx/splash-themes-gentoo"
+	fi
+
+	elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
+	elog "'fbcondecor'.  Accordingly, the old 'splash' initscript is now called"
+	elog "'fbcondecor'.  Make sure you update your system.  See:"
+	elog "    http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
+	elog "for further info about the name changes."
+	elog ""
+	elog "Also note that splash_util has now been split into splash_util, fbsplashd"
+	elog "and fbcondecor_ctl."
+}