Support baselayout's depscan --svcdir option instead of nasty variable hacking.

(Portage version: 2.1_pre5-r1)

9 files changed, 566 insertions, 23 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 9e45d2ced314..6ba4bc27e115 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.50 2006/02/02 15:46:17 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.51 2006/03/02 17:41:52 uberlord Exp $
+
+*splashutils-1.1.9.10-r1 (02 Mar 2006)
+*splashutils-1.1.9.8-r1 (02 Mar 2006)
+
+  02 Mar 2006; Roy Marples <uberlord@gentoo.org>
+  +files/splashutils-depscan.patch, +splashutils-1.1.9.8-r1.ebuild,
+  splashutils-1.1.9.9.ebuild, splashutils-1.1.9.9-r1.ebuild,
+  +splashutils-1.1.9.10-r1.ebuild:
+  Support baselayout's depscan --svcdir option instead of nasty variable
+  hacking.
 
   02 Feb 2006; Michał Januszewski <spock@gentoo.org>
   splashutils-1.1.9.8.ebuild, splashutils-1.1.9.9.ebuild,
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 702c2965890b..d1865fc02893 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,15 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 95a1d34e3bb69f09c9d43965bfee6b5c ChangeLog 11079
-RMD160 0569810453033ca1c5d98a693035b6983fc5eff6 ChangeLog 11079
-SHA256 9c6d2f365ece670c5a95aaa0a7779d17b7c3b7758072fd2ec9adb2ead0d1f685 ChangeLog 11079
+MD5 5e73de267688a6652416b85e968d545f ChangeLog 11455
+RMD160 9458c4d4a51d4c6f754bd59719fe23524eceef6c ChangeLog 11455
+SHA256 f8f072ac49de92ca2737755c002328e2dbf1d2e7ba8322f879e0abe00723b1a2 ChangeLog 11455
 MD5 c518e5f1875064cb0c5784f53f9db7f5 files/digest-splashutils-1.1.9.10 484
 RMD160 8f176907761f9183c88f84d66eaced9754414921 files/digest-splashutils-1.1.9.10 484
 SHA256 157839d129c211ed4bb6d781f6d2fd585022be56c4dc4881780451abdf3516ee files/digest-splashutils-1.1.9.10 484
+MD5 35cc14c0e9021cf2b900e89588015f07 files/digest-splashutils-1.1.9.10-r1 1774
+RMD160 12af3f46f7d493c35d5411de6ef76478b4d34145 files/digest-splashutils-1.1.9.10-r1 1774
+SHA256 ae313288aa756133eb20f3c3f738003bcdf7176636cabd47918916dae8fbd036 files/digest-splashutils-1.1.9.10-r1 1774
 MD5 c55d25b2df1c791c0fa802c0de31af73 files/digest-splashutils-1.1.9.8 547
 RMD160 2eab4c0639cc78d9872a96df48705851a24ffc95 files/digest-splashutils-1.1.9.8 547
 SHA256 202e391793bc706615453d2ef21a8daaff6436ea1a3570411fc9ee9c6aa0b36e files/digest-splashutils-1.1.9.8 547
+MD5 f94a2c7d921f0fb8a93e7870384730a7 files/digest-splashutils-1.1.9.8-r1 2009
+RMD160 98e1467215be8e850a1164aa7d86833e67680991 files/digest-splashutils-1.1.9.8-r1 2009
+SHA256 791d499355b791860bab3f2fc5b30e3a946536395d503bfa7bc4af4ddf2b19f7 files/digest-splashutils-1.1.9.8-r1 2009
 MD5 227086af2d5e8360c3e2f23cdbfb97eb files/digest-splashutils-1.1.9.9 548
 RMD160 22a1e90c3b171b2f9edd05e4a78977d14695516e files/digest-splashutils-1.1.9.9 548
 SHA256 9d65e4a533fb35cb85c24f389ecf58fd2600b8b9034fbd90e114aaceb8f18b70 files/digest-splashutils-1.1.9.9 548
@@ -22,25 +25,27 @@ SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000 files/sp
 MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294
 RMD160 5fc49641fddfd9fae387c7b7d994110f506f71cf files/splashutils-1.1.9.9-external-klibc.patch 10294
 SHA256 112dab3f2d432949d3110ebb9475b1405171ab196062be6f7dd244815e64f75b files/splashutils-1.1.9.9-external-klibc.patch 10294
+MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
+RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
+SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9 files/splashutils-depscan.patch 2197
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 metadata.xml 221
 SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e metadata.xml 221
+MD5 317f79e8bc0fe88ce38e03732c8070d7 splashutils-1.1.9.10-r1.ebuild 6469
+RMD160 67e8198266561c120de77a0f3dcff17fde42213c splashutils-1.1.9.10-r1.ebuild 6469
+SHA256 384d90658b7056914ff0e4a7cb4fcdd7296b23ba417903d09599c4a49cf194da splashutils-1.1.9.10-r1.ebuild 6469
 MD5 45b9cbcf05a0792fde52c7eb0d413196 splashutils-1.1.9.10.ebuild 6342
 RMD160 a1139b705c17e5507aa6badb519f34afe3d711ec splashutils-1.1.9.10.ebuild 6342
 SHA256 34a5ca5b2130847da5aad36b18cd7fed4f0d7f8e234331fc053f186234c9aa51 splashutils-1.1.9.10.ebuild 6342
+MD5 607e5fc22265c393111a86ca07ec27b8 splashutils-1.1.9.8-r1.ebuild 6436
+RMD160 8b1761bc1bb49c6bba44463e982e43bf9795538e splashutils-1.1.9.8-r1.ebuild 6436
+SHA256 8318f0f91718a8b479b32e8901ef81dcf452fab6c77788ec3bfccb117467a726 splashutils-1.1.9.8-r1.ebuild 6436
 MD5 f16c519c22db8e8b2800f68256b66d9a splashutils-1.1.9.8.ebuild 6301
 RMD160 3aa1b2a15b7cc67fabcb8c18eb303a1ef5be3049 splashutils-1.1.9.8.ebuild 6301
 SHA256 fbe7e5a43b6038c814fb2acacf3b833112585b39ec9b0921ffbaf90a5078bfbb splashutils-1.1.9.8.ebuild 6301
-MD5 225c46bb9e951623f38038a0ccb9b54e splashutils-1.1.9.9-r1.ebuild 6249
-RMD160 d5959fcda49e3d26d690aaccdda7127a31bbab18 splashutils-1.1.9.9-r1.ebuild 6249
-SHA256 1e913943595cff912069c570d351cf653a9e12d5a39a7c99e7ff5d773a2224df splashutils-1.1.9.9-r1.ebuild 6249
-MD5 274c80cbc78efef79db0c7d43c1690d4 splashutils-1.1.9.9.ebuild 6338
-RMD160 04cb67c8a42f58e4181a08f4e26cd6a47e62952a splashutils-1.1.9.9.ebuild 6338
-SHA256 2c526fa7a25ed54b0deb006b238200f6e109d559ce6c11e437161a1bd765efde splashutils-1.1.9.9.ebuild 6338
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD4ilVchej4aZK9/cRAt6dAJ0e+VDjInXbKX4oAwDGEI3/GaEaRwCeMQyi
-VP8lcjOuMbjkAZ8UFHeGGJU=
-=Yht4
------END PGP SIGNATURE-----
+MD5 fcf517889c26395c8e69a882420d3127 splashutils-1.1.9.9-r1.ebuild 6376
+RMD160 6880083174d7fc1e63a3e1947a992ae2d4da98b7 splashutils-1.1.9.9-r1.ebuild 6376
+SHA256 aefa4b27c2727fab8fccad2d1e5226e2b70bcbc5d56d9eace2a92fde29e47403 splashutils-1.1.9.9-r1.ebuild 6376
+MD5 542b32295ab63cee765f6d8a92af6d63 splashutils-1.1.9.9.ebuild 6473
+RMD160 4d1de53979efc6679b725dbf18757690194545fd splashutils-1.1.9.9.ebuild 6473
+SHA256 c2c677557a7a18dbe9bbb842b9b2866c19f3376e24d7e7c4c3f6cc161a2c96fe splashutils-1.1.9.9.ebuild 6473
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r1 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r1
new file mode 100644
index 000000000000..32c19a6065f5
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r1
@@ -0,0 +1,21 @@
+MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
+RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc72 freetype-2.1.9.tar.bz2 992394
+SHA256 4dabc3b38405f5c5f03b8f14d8902a9d506713182baf2baec9dea509515d4b6f freetype-2.1.9.tar.bz2 992394
+MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
+RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 jpegsrc.v6b.tar.gz 613261
+SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d jpegsrc.v6b.tar.gz 613261
+MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
+RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c libpng-1.2.8.tar.bz2 384970
+SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b libpng-1.2.8.tar.bz2 384970
+MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
+RMD160 47516ec50225ef18fd42e36d58e90e57bfc0dbac miscsplashutils-0.1.3.tar.bz2 91825
+SHA256 16fcb4d199e071a822d744bbd9238609a2175d512fc1c019018c05501cb23bdb miscsplashutils-0.1.3.tar.bz2 91825
+MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750
+RMD160 680efa24119dcf699f37a9f295e3f81faebbdc18 splashutils-gentoo-0.1.14.tar.bz2 7750
+SHA256 2515416c98bcf8e4e0d217cafc74b507295cb03d915d78b224683577159ae9dc splashutils-gentoo-0.1.14.tar.bz2 7750
+MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094
+RMD160 274cfc9a79b69091b0feba8f6d64e3eb965dfb9a splashutils-lite-1.1.9.10.tar.bz2 55094
+SHA256 de38e284103ed569360caf5d555d784309afea7625bad7acd689399d26c3955c splashutils-lite-1.1.9.10.tar.bz2 55094
+MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209
+RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 zlib-1.2.3.tar.bz2 425209
+SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca zlib-1.2.3.tar.bz2 425209
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.8-r1 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.8-r1
new file mode 100644
index 000000000000..0f4d16e98651
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.8-r1
@@ -0,0 +1,24 @@
+MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
+RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc72 freetype-2.1.9.tar.bz2 992394
+SHA256 4dabc3b38405f5c5f03b8f14d8902a9d506713182baf2baec9dea509515d4b6f freetype-2.1.9.tar.bz2 992394
+MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
+RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 jpegsrc.v6b.tar.gz 613261
+SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d jpegsrc.v6b.tar.gz 613261
+MD5 06daaff20aa7d9cc888393e969624907 klibc-1.0.8.tar.bz2 446138
+RMD160 006511b5178fc32cebd801ee399cc792b545418c klibc-1.0.8.tar.bz2 446138
+SHA256 3d39bb503e2fc0ac9782edd235e06015bd4f14fe8bd4318042b208f3a9ce529a klibc-1.0.8.tar.bz2 446138
+MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
+RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c libpng-1.2.8.tar.bz2 384970
+SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b libpng-1.2.8.tar.bz2 384970
+MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
+RMD160 47516ec50225ef18fd42e36d58e90e57bfc0dbac miscsplashutils-0.1.3.tar.bz2 91825
+SHA256 16fcb4d199e071a822d744bbd9238609a2175d512fc1c019018c05501cb23bdb miscsplashutils-0.1.3.tar.bz2 91825
+MD5 4890c980560ea5e80fe9610e88bf44c3 splashutils-gentoo-0.1.12.tar.bz2 7563
+RMD160 5c8518b24bc1bbfaea9bf81f1b71eb7745eb8684 splashutils-gentoo-0.1.12.tar.bz2 7563
+SHA256 9118fb36f2352bf65ba69d4b9eebe916b25be028c0b7b1878d5d23cb675cd3e3 splashutils-gentoo-0.1.12.tar.bz2 7563
+MD5 a4846a67d9c8ccf146a6fd210fb19823 splashutils-lite-1.1.9.8.tar.bz2 55013
+RMD160 377396b94562f4cde5e298170f762bb6518545ef splashutils-lite-1.1.9.8.tar.bz2 55013
+SHA256 4f7ce63a2ec11884b4d624c334a93ddd5806f8b0acd5f80fc1e9edf369384f54 splashutils-lite-1.1.9.8.tar.bz2 55013
+MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
+RMD160 aca88eb02d90b91c732f351e1b7efd4ce409ee25 zlib-1.2.1.tar.bz2 284152
+SHA256 9ea4bd04487e05254d05cebde539b3855af2899658e2da84487e86f7f400e0e1 zlib-1.2.1.tar.bz2 284152
diff --git a/media-gfx/splashutils/files/splashutils-depscan.patch b/media-gfx/splashutils/files/splashutils-depscan.patch
new file mode 100644
index 000000000000..49e81f5e4c82
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-depscan.patch
@@ -0,0 +1,50 @@
+--- splash	2005-07-08 20:14:29.000000000 +0100
++++ splash	2005-07-08 20:14:29.000000000 +0100
+@@ -15,9 +15,9 @@
+ [[ -z ${SPLASH_SHUTDOWN_MESSAGE} ]] && SPLASH_SHUTDOWN_MESSAGE="Shutting down the system (\$progress%)... Press F2 for verbose mode"
+ [[ -z ${SPLASH_REBOOT_MESSAGE} ]] 	&& SPLASH_REBOOT_MESSAGE="Rebooting the system (\$progress%)... Press F2 for verbose mode"
+ 
+-[[ RC_GOT_FUNCTIONS != "yes" ]] && . /sbin/functions.sh
+-[[ -f /etc/conf.d/splash ]] 	&& . /etc/conf.d/splash
+-[[ -f /etc/conf.d/rc ]] 		&& . /etc/conf.d/rc
++[[ ${RC_GOT_FUNCTIONS} != "yes" ]] && source /sbin/functions.sh
++[[ -f $(add_suffix /etc/conf.d/splash) ]] \
++	&& source "$(add_suffix /etc/conf.d/splash)"
+ [[ ${RUNLEVEL} == "6" || ${RUNLEVEL} == "0" ]] && SHUTDOWN="yes"
+ 
+ SPLUTIL="/sbin/splash_util.static"
+--- splash-functions.sh	2005-07-18 13:48:05.000000000 +0100
++++ splash-functions.sh	2005-07-18 13:48:05.000000000 +0100
+@@ -26,23 +26,6 @@
+ spl_fifo="${spl_cachedir}/.splash"
+ spl_pidfile="${spl_cachedir}/daemon.pid"
+ 
+-# This is a little tricky. We need depscan.sh to create an updated cache for
+-# us, and we need it in our place ($spl_cachedir), and not in $svcdir, since the
+-# latter might not be writable at this moment. In order to get what we need, 
+-# we trick depscan.sh into thinking $svcdir is $spl_cachedir. 
+-#
+-# Here is how it works:
+-# - $svcdir is defined in /sbin/functions.sh
+-# - /sbin/splash-functions.sh is sourced from /sbin/function.sh, after $svcdir
+-#   is defined
+-# - /sbin/functions.sh is sourced from /sbin/depscan.sh
+-#
+-# $spl_cache_depscan is used to prevent breaking things when /sbin/depscan.sh
+-# is not run by us.
+-if [[ "$0" == "/sbin/depscan.sh" && "${spl_cache_depscan}" == "yes" ]]; then
+-	svcdir="${spl_cachedir}"
+-fi 
+-	
+ # This is the main function that handles all events.
+ # Accepted parameters:
+ #  svc_start <name>
+@@ -203,7 +193,7 @@
+ 	h=$(stat -c '%y' ${spl_cachedir}/deptree 2>/dev/null)
+ 
+ 	# Point depscan.sh to our cachedir
+-	spl_cache_depscan="yes" /sbin/depscan.sh -u
++	spl_cache_depscan="yes" /sbin/depscan.sh --svcdir "${spl_cachedir}"
+ 
+ 	if [[ "$1" == "start" ]]; then
+ 		# Check whether the list of services that will be started during boot
diff --git a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
new file mode 100644
index 000000000000..107befa1f3a9
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild,v 1.1 2006/03/02 17:41:52 uberlord Exp $
+
+inherit eutils multilib linux-mod
+
+MISCSPLASH="miscsplashutils-0.1.3"
+GENTOOSPLASH="splashutils-gentoo-0.1.14"
+V_JPEG="6b"
+V_PNG="1.2.8"
+V_ZLIB="1.2.3"
+V_FT="2.1.9"
+
+ZLIBSRC="libs/zlib-${V_ZLIB}"
+LPNGSRC="libs/libpng-${V_PNG}"
+JPEGSRC="libs/jpeg-${V_JPEG}"
+FT2SRC="libs/freetype-${V_FT}"
+
+IUSE="hardened png truetype kdgraphics"
+
+DESCRIPTION="Framebuffer splash utilities."
+HOMEPAGE="http://dev.gentoo.org/~spock/projects/gensplash/"
+SRC_URI="mirror://gentoo/${PN}-lite-${PV}.tar.bz2
+	 mirror://gentoo/${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="~x86 ~amd64 ~ppc"
+RDEPEND="truetype? ( >=media-libs/freetype-2 )
+	png? ( >=media-libs/libpng-1.2.7 )
+	>=media-libs/jpeg-6b
+	>=sys-apps/baselayout-1.9.4-r5
+	app-arch/cpio
+	!media-gfx/bootsplash
+	media-gfx/fbgrab"
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	>=dev-libs/klibc-1.0.14-r1"
+
+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
+}
+
+spl_conf() {
+	sed -i -re "s/#.* $2([^_].*|$)//g" ${S}/config.h
+
+	if [[ "$1" == "yes" ]]; then
+		echo "#define	$2 1" >> ${S}/config.h
+	else
+		echo "#undef	$2" >> ${S}/config.h
+	fi
+}
+
+spl_conf_use() {
+	if use $1; then
+		spl_conf yes $2
+	else
+		spl_conf no $2
+	fi
+}
+
+pkg_setup() {
+	check_kernel_built
+}
+
+src_unpack() {
+	unpack ${A}
+	ln -s ${KV_DIR} ${S}/linux
+
+	# Ensure that we call depscan with --svcdir
+	cd "${WORKDIR}/${GENTOOSPLASH}"
+	epatch "${FILESDIR}/splashutils-depscan.patch"
+
+	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}
+
+	epatch ${FILESDIR}/splashutils-1.1.9.10-ppc-2.6.14.patch
+
+	# Check whether the kernel tree has been patched with fbsplash.
+	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then
+		ewarn "Your kernel in ${KV_DIR} has not been patched with a compatible version"
+		ewarn "of fbsplash. You can download the latest patch from http://dev.gentoo.org/~spock/"
+		echo ""
+		ewarn "Splashutils will be compiled without fbsplash support. Verbose mode will not"
+		ewarn "be supported."
+		spl_conf no CONFIG_FBSPLASH
+	else
+		spl_conf yes CONFIG_FBSPLASH
+	fi
+
+	if built_with_use sys-devel/gcc 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
+	fi
+
+	mkdir ${S}/kernel
+
+	# Use tty16 as the default silent tty.
+	sed -i -e 's/#define TTY_SILENT.*/#define TTY_SILENT 16/' ${S}/splash.h
+
+	if ! use truetype ; then
+		sed -i -e 's/fbtruetype kbd/kbd/' ${SM}/Makefile
+	fi
+}
+
+src_compile() {
+	spl_conf_use png CONFIG_PNG
+	spl_conf_use truetype CONFIG_TTF
+	spl_conf_use truetype CONFIG_TTF_KERNEL
+	spl_conf_use kdgraphics CONFIG_SILENT_KD_GRAPHICS
+	sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile
+
+	cd ${SM}
+	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
+	cd ${S}
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
+	emake -j1 LIB=$(get_libdir) ARCH=$(tc-arch-kernel) || die "failed to build splashutils"
+}
+
+src_install() {
+	cd ${SM}
+	make DESTDIR=${D} install || die
+
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
+	cd ${S}
+	make DESTDIR=${D} install || die
+
+	keepdir /lib/splash/{tmp,cache,bin}
+	dosym /lib/splash/bin/fbres /sbin/fbres
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > ${D}/etc/env.d/99splash
+
+	exeinto /sbin
+	doexe ${SG}/splash
+
+	exeinto /etc/init.d
+	newexe ${SG}/init-splash splash
+
+	insinto /usr/share/${PN}
+	doins ${SG}/initrd.splash
+
+	insinto /sbin
+	doins ${SG}/splash-functions.sh
+
+	insinto /etc/conf.d
+	newins ${SG}/splash.conf splash
+
+	insinto /etc/splash
+	doins ${SM}/fbtruetype/luxisri.ttf
+
+	dodoc docs/* README AUTHORS
+}
+
+pkg_postinst() {
+	ebegin "Checking whether /dev/tty1 is in place"
+	mount --bind / ${T}
+
+	if [[ ! -c ${T}/dev/tty1 ]]; then
+		eend 1
+		ewarn "It appears that the /dev/tty1 character device doesn't exist on"
+		ewarn "the root filesystem. This will prevent the silent mode from working"
+		ewarn "properly. You can fix the problem by doing:"
+		ewarn "  mount --bind / /lib/splash/tmp"
+		ewarn "  mknod /lib/splash/tmp/dev/tty1 c 4 1"
+		ewarn "  umount /lib/splash/tmp"
+		echo ""
+	else
+		eend 0
+	fi
+	umount ${T}
+
+	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+		ewarn "This package has been designed with udev in mind. Other solutions, such as"
+		ewarn "devfs or a static /dev tree might work, but are generally discouraged and"
+		ewarn "not supported. If you decide to switch to udev, you might want to have a"
+		ewarn "look at 'The Gentoo udev Guide', which can be found at"
+		ewarn "  http://www.gentoo.org/doc/en/udev-guide.xml"
+		echo ""
+	fi
+
+	ewarn "If you're upgrading from a pre-1.0 splashutils version, make sure that you"
+	ewarn "rebuild your initrds. You can use the splash_geninitramfs script to do that."
+	echo ""
+	ewarn "It is required that you add 'console=tty1' to your kernel"
+	ewarn "command line parameters."
+	echo ""
+	einfo "After these modifications, the relevant part of the kernel command"
+	einfo "line might look like:"
+	einfo "  splash=silent,fadein,theme:emergence console=tty1"
+	echo ""
+	einfo "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+	einfo "core splashutils package. To get some themes you might want to emerge:"
+	einfo "  media-gfx/splash-themes-livecd"
+	einfo "  media-gfx/splash-themes-gentoo"
+	echo ""
+}
diff --git a/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild
new file mode 100644
index 000000000000..a26715b5adc3
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.8-r1.ebuild,v 1.1 2006/03/02 17:41:52 uberlord Exp $
+
+inherit eutils multilib linux-mod
+
+MISCSPLASH="miscsplashutils-0.1.3"
+GENTOOSPLASH="splashutils-gentoo-0.1.12"
+V_KLIBC="1.0.8"
+V_JPEG="6b"
+V_PNG="1.2.8"
+V_ZLIB="1.2.1"
+V_FT="2.1.9"
+
+IUSE="hardened png truetype kdgraphics"
+
+DESCRIPTION="Framebuffer splash utilities."
+HOMEPAGE="http://dev.gentoo.org/~spock/projects/gensplash/"
+SRC_URI="mirror://gentoo/${PN}-lite-${PV}.tar.bz2
+	 mirror://gentoo/${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
+	 ftp://ftp.kernel.org/pub/linux/libs/klibc/klibc-${V_KLIBC}.tar.bz2
+	 ftp://ftp.kernel.org/pub/linux/libs/klibc/Stable/klibc-${V_KLIBC}.tar.bz2
+	 ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/klibc-${V_KLIBC}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+RDEPEND="truetype? ( >=media-libs/freetype-2 )
+	png? ( >=media-libs/libpng-1.2.7 )
+	>=media-libs/jpeg-6b
+	>=sys-apps/baselayout-1.9.4-r5
+	app-arch/cpio
+	!media-gfx/bootsplash
+	media-gfx/fbgrab"
+DEPEND="${RDEPEND}
+	virtual/linux-sources"
+
+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 fbsplash kernel helper."
+	fi
+}
+
+spl_conf() {
+	sed -i -re "s/#.* $2([^_].*|$)//g" ${S}/config.h
+
+	if [[ "$1" == "yes" ]]; then
+		echo "#define	$2 1" >> ${S}/config.h
+	else
+		echo "#undef	$2" >> ${S}/config.h
+	fi
+}
+
+spl_conf_use() {
+	if use $1; then
+		spl_conf yes $2
+	else
+		spl_conf no $2
+	fi
+}
+
+pkg_setup() {
+	check_kernel_built
+}
+
+src_unpack() {
+	unpack ${A}
+	ln -s ${KV_DIR} ${S}/linux
+
+	# Ensure that we call depscan with --svcdir
+	cd "${WORKDIR}/${GENTOOSPLASH}"
+	epatch "${FILESDIR}/splashutils-depscan.patch"
+	
+	mv ${WORKDIR}/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT},klibc-${V_KLIBC}} ${S}/libs
+	ln -s ../../linux ${S}/libs/klibc-${V_KLIBC}/linux
+	# 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
+
+	# Check whether the kernel tree has been patched with fbsplash.
+	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then
+		ewarn "Your kernel in ${KV_DIR} has not been patched with a compatible version"
+		ewarn "of fbsplash. You can download the latest patch from http://dev.gentoo.org/~spock/"
+		echo ""
+		ewarn "Splashutils will be compiled without fbsplash support. Verbose mode will not"
+		ewarn "be supported."
+		spl_conf no CONFIG_FBSPLASH
+	else
+		spl_conf yes CONFIG_FBSPLASH
+	fi
+
+	# This should make splashutils compile on systems with hardened GCC.
+	sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile
+	sed -e 's@CFLAGS  =@CFLAGS  = -fno-stack-protector@' -i ${S}/libs/klibc-${V_KLIBC}/klibc/MCONFIG
+
+	mkdir ${S}/kernel
+
+	# Use tty16 as the default silent tty.
+	sed -i -e 's/#define TTY_SILENT.*/#define TTY_SILENT 16/' ${S}/splash.h
+
+	# Setup the kernel object directory
+	echo "KRNLOBJ = ${KV_OUT_DIR}" >> ${S}/libs/klibc-${V_KLIBC}/MCONFIG
+}
+
+src_compile() {
+	spl_conf_use png CONFIG_PNG
+	spl_conf_use truetype CONFIG_TTF
+	spl_conf_use truetype CONFIG_TTF_KERNEL
+	spl_conf_use kdgraphics CONFIG_SILENT_KD_GRAPHICS
+	sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile
+	emake -j1 MISCINCS="-I${KV_OUT_DIR}/include" || die "failed to build splashutils"
+
+	cd ${SM}
+	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
+}
+
+src_install() {
+	cd ${SM}
+	make DESTDIR=${D} install || die
+
+	cd ${S}
+	make DESTDIR=${D} install || die
+
+	keepdir /lib/splash/{tmp,cache,bin}
+	dosym /lib/splash/bin/fbres /sbin/fbres
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > ${D}/etc/env.d/99splash
+
+	exeinto /sbin
+	doexe ${SG}/splash
+
+	exeinto /etc/init.d
+	newexe ${SG}/init-splash splash
+
+	insinto /usr/share/${PN}
+	doins ${SG}/initrd.splash
+
+	insinto /sbin
+	doins ${SG}/splash-functions.sh
+
+	insinto /etc/conf.d
+	newins ${SG}/splash.conf splash
+
+	insinto /etc/splash
+	doins ${SM}/fbtruetype/luxisri.ttf
+
+	dodoc docs/* README AUTHORS
+}
+
+pkg_postinst() {
+	ebegin "Checking whether /dev/tty1 is in place"
+	mount --bind / ${T}
+
+	if [[ ! -c ${T}/dev/tty1 ]]; then
+		eend 1
+		ewarn "It appears that the /dev/tty1 character device doesn't exist on"
+		ewarn "the root filesystem. This will prevent the silent mode from working"
+		ewarn "properly. You can fix the problem by doing:"
+		ewarn "  mount --bind / /lib/splash/tmp"
+		ewarn "  mknod /lib/splash/tmp/dev/tty1 c 4 1"
+		ewarn "  umount /lib/splash/tmp"
+		echo ""
+	else
+		eend 0
+	fi
+	umount ${T}
+
+	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
+		ewarn "This package has been designed with udev in mind. Other solutions, such as"
+		ewarn "devfs or a static /dev tree might work, but are generally discouraged and"
+		ewarn "not supported. If you decide to switch to udev, you might want to have a"
+		ewarn "look at 'The Gentoo udev Guide', which can be found at"
+		ewarn "  http://www.gentoo.org/doc/en/udev-guide.xml"
+		echo ""
+	fi
+
+	ewarn "If you upgrade your kernel from pre-2.6.12 to 2.6.12 or higher, please"
+	ewarn "make sure that you remerge this package and rebuild your initrds. You"
+	ewarn "can use the splash_geninitramfs script to do that."
+	echo ""
+	ewarn "It is required that you add 'quiet CONSOLE=/dev/tty1' to your kernel"
+	ewarn "command line parameters."
+	echo ""
+	einfo "After these modifications, the relevant part of the kernel command"
+	einfo "line might look like:"
+	einfo "  splash=silent,fadein,theme:emergence quiet CONSOLE=/dev/tty1"
+	echo ""
+	einfo "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+	einfo "core splashutils package. To get some themes you might want to emerge:"
+	einfo "  media-gfx/splash-themes-livecd"
+	einfo "  media-gfx/splash-themes-gentoo"
+	echo ""
+}
diff --git a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
index 8feeedc137e4..c0774c08bad4 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.7 2006/02/02 15:46:17 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.8 2006/03/02 17:41:52 uberlord Exp $
 
 inherit eutils multilib linux-mod
 
@@ -81,6 +81,10 @@ src_unpack() {
 	unpack ${A}
 	ln -s ${KV_DIR} ${S}/linux
 
+	# Ensure that we call depscan with --svcdir
+	cd "${WORKDIR}/${GENTOOSPLASH}"
+	epatch "${FILESDIR}/splashutils-depscan.patch"
+
 	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
diff --git a/media-gfx/splashutils/splashutils-1.1.9.9.ebuild b/media-gfx/splashutils/splashutils-1.1.9.9.ebuild
index 511f1be3e57a..a8aa9804c911 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.9.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9.ebuild,v 1.3 2006/02/02 15:46:17 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9.ebuild,v 1.4 2006/03/02 17:41:52 uberlord Exp $
 
-inherit multilib linux-mod
+inherit eutils multilib linux-mod
 
 MISCSPLASH="miscsplashutils-0.1.3"
 GENTOOSPLASH="splashutils-gentoo-0.1.13"
@@ -79,6 +79,10 @@ src_unpack() {
 	unpack ${A}
 	ln -s ${KV_DIR} ${S}/linux
 
+	# Ensure that we call depscan with --svcdir
+	cd "${WORKDIR}/${GENTOOSPLASH}"
+	epatch "${FILESDIR}/splashutils-depscan.patch"
+	
 	mv ${WORKDIR}/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT},klibc-${V_KLIBC}} ${S}/libs
 	ln -s ../../linux ${S}/libs/klibc-${V_KLIBC}/linux
 	# We need to delete the Makefile and let it be rebuilt when splashutils