Version bump.

Package-Manager: portage-1.589-cvs

9 files changed, 59 insertions, 364 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index b69cab830d7f..751754e4ec26 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.46 2005/09/09 11:33:50 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.47 2005/09/29 08:47:37 spock Exp $
+
+*splashutils-1.1.9.10 (29 Sep 2005)
+
+  29 Sep 2005; Michał Januszewski <spock@gentoo.org>
+  -splashutils-0.9.1.ebuild, -splashutils-1.1.9.6-r1.ebuild,
+  -splashutils-1.1.9.7.ebuild, +splashutils-1.1.9.10.ebuild:
+  Version bump.
 
   09 Sep 2005; Michał Januszewski <spock@gentoo.org>
   splashutils-1.1.9.9-r1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 94f7750f6597..7a549c8d43c3 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -3,23 +3,19 @@ Hash: SHA1
 
 MD5 98fd11c248eba6f1f945bc2d7e530664 splashutils-1.1.9.9.ebuild 6323
 MD5 4180e756570d9f26db82b36b42c8cbc3 splashutils-1.1.9.8.ebuild 6287
-MD5 1409e15605d9e85ecd9e151911beacfd splashutils-1.1.9.6-r1.ebuild 6008
-MD5 13b41917218dff90a78e1d3a582b86f7 splashutils-0.9.1.ebuild 3195
-MD5 648a7028f9de26e875716c4d5d60fa5a ChangeLog 10186
-MD5 d2366bbd1460487cfbd09faa5df47e68 splashutils-1.1.9.7.ebuild 6271
+MD5 75ff271de4f54f2216844b1985739b93 splashutils-1.1.9.10.ebuild 6245
+MD5 ca9fde5b643138d691df691a5225d772 ChangeLog 10416
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 MD5 1b03f7bbbe2db156b7b1a54d51d76ea0 splashutils-1.1.9.9-r1.ebuild 6234
-MD5 ae39d33c3d0a3a91709b168706326abf files/digest-splashutils-1.1.9.6-r1 547
 MD5 887e148191dfd124be52f9682e391c78 files/digest-splashutils-1.1.9.9-r1 483
-MD5 742f8fdebf8589f4a4c6af91fffc7fae files/digest-splashutils-1.1.9.7 547
 MD5 c55d25b2df1c791c0fa802c0de31af73 files/digest-splashutils-1.1.9.8 547
 MD5 227086af2d5e8360c3e2f23cdbfb97eb files/digest-splashutils-1.1.9.9 548
-MD5 d4d393d10196781338f83d0a795065ae files/digest-splashutils-0.9.1 378
+MD5 e7021220db09b50d71298675110c4c40 files/digest-splashutils-1.1.9.10 484
 MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIiA6chej4aZK9/cRAue8AJ9zbHgH1M7vHyQB56T/7hvyJ+UTlgCfRmH/
-ModMF5QjwcCAx8AIb4eBP6E=
-=dRrC
+iD8DBQFDO6pgchej4aZK9/cRAjDJAJ9XEslfNJmhMqc3uypsv91bhVB2iwCeLTMy
+7PMoYtbBHGAHnHvGh+iMiWk=
+=o9O6
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-0.9.1 b/media-gfx/splashutils/files/digest-splashutils-0.9.1
deleted file mode 100644
index e2a9c9a6f553..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-0.9.1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 a153dae7e3c73c972a3b7ff96490649a splashutils-0.9.1.tar.bz2 1631483
-MD5 71f85c661c144665ff5d4a8bbef1936e miscsplashutils-0.1.2.tar.bz2 91301
-MD5 0d32d8c574f0b2f03f8d389ec17f49fe splashutils-gentoo-0.1.4.tar.bz2 4528
-MD5 53437014b3e4ddd2d72de7f6e88e1486 fbsplash-theme-emergence-r2.tar.bz2 4794297
-MD5 a63484ca6ce645cfbacc30c91bbf746c fbsplash-theme-gentoo-r1.tar.bz2 5266047
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
new file mode 100644
index 000000000000..623c3f264ac8
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
@@ -0,0 +1,7 @@
+MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094
+MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750
+MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
+MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
+MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
+MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
+MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.6-r1 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.6-r1
deleted file mode 100644
index 51f51b8bf89a..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.6-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 addcd2ac580c423fb14d4334da26def0 splashutils-lite-1.1.9.6.tar.bz2 54712
-MD5 55438c4f30e5cba29764afcbadde48fc splashutils-gentoo-0.1.10.tar.bz2 7210
-MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
-MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
-MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
-MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
-MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
-MD5 06daaff20aa7d9cc888393e969624907 klibc-1.0.8.tar.bz2 446138
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.7 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.7
deleted file mode 100644
index bf52ae45dcb0..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.7
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 3ff96210c2843415cbe5c0ad9c0eb28a splashutils-lite-1.1.9.7.tar.bz2 54961
-MD5 a9747de301e323459149298627f5b60a splashutils-gentoo-0.1.11.tar.bz2 7521
-MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
-MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
-MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
-MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
-MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
-MD5 06daaff20aa7d9cc888393e969624907 klibc-1.0.8.tar.bz2 446138
diff --git a/media-gfx/splashutils/splashutils-0.9.1.ebuild b/media-gfx/splashutils/splashutils-0.9.1.ebuild
deleted file mode 100644
index e1323284ca0e..000000000000
--- a/media-gfx/splashutils/splashutils-0.9.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-0.9.1.ebuild,v 1.7 2005/06/12 13:40:40 spock Exp $
-
-MISCSPLASH="miscsplashutils-0.1.2"
-GENTOOSPLASH="splashutils-gentoo-0.1.4"
-KLIBC_VERSION="0.179"
-
-DESCRIPTION="Framebuffer splash utilities."
-HOMEPAGE="http://dev.gentoo.org/~spock/"
-SRC_URI="mirror://gentoo/${P/_/-}.tar.bz2
-	 mirror://gentoo/${MISCSPLASH}.tar.bz2
-	 mirror://gentoo/${GENTOOSPLASH}.tar.bz2
-	 mirror://gentoo/fbsplash-theme-emergence-r2.tar.bz2
-	 mirror://gentoo/fbsplash-theme-gentoo-r1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="hardened"
-RDEPEND=">=media-libs/freetype-2
-	>=media-libs/libpng-1.2.7
-	>=media-libs/jpeg-6b
-	>=sys-apps/baselayout-1.9.4-r5
-	!media-gfx/bootsplash"
-DEPEND="${RDEPEND}
-	virtual/linux-sources"
-
-S="${WORKDIR}/${P/_/-}"
-SM="${WORKDIR}/${MISCSPLASH}"
-SG="${WORKDIR}/${GENTOOSPLASH}"
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	ln -s /usr/src/linux ${S}/linux
-	if [ ! -e /usr/src/linux/include/linux/console_splash.h ]; then
-		eerror "Your kernel in /usr/src/linux has not been patched with a compatible version"
-		eerror "of fbsplash. Please download the latest patch from http://dev.gentoo.org/~spock/"
-		eerror "and patch your kernel."
-		die "Fbsplash not found"
-	fi
-
-	if [ ! -e /usr/src/linux/include/asm ]; then
-		if [ -z "${KBUILD_OUTPUT}" ] ||
-		   [ ! -e "${KBUILD_OUTPUT}/include/asm" ]; then
-			eerror "It appears that your kernel has not been configured. Please run at least"
-			eerror "\`make prepare\` before merging splashutils."
-			die "Kernel not configured"
-		else
-			t=$(readlink ${KBUILD_OUTPUT}/include/asm)
-			ln -s /usr/src/linux/include/${t} ${T}/asm
-			sed -e "s@#CHANGEME#@${T}/@" -i ${S}/libs/klibc-${KLIBC_VERSION}/klibc/makeerrlist.pl
-		fi
-	fi
-
-	# this should make this version of splashutils compile with hardened systems
-	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-${KLIBC_VERSION}/klibc/MCONFIG
-}
-
-src_compile() {
-
-	local miscincs
-
-	if [ -n "${KBUILD_OUTPUT}" ]; then
-		miscincs="-I${T} -I${KBUILD_OUTPUT}/include"
-	fi
-
-	emake -j1 MISCINCS="${miscincs}"
-
-	cd ${SM}
-	emake
-}
-
-src_install() {
-	cd ${SM}
-	make DESTDIR=${D} install || die
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-
-	exeinto /sbin
-	doexe ${SG}/splash
-
-	exeinto /etc/init.d
-	newexe ${SG}/init-splash splash
-
-	insinto /sbin
-	doins ${SG}/splash-functions.sh
-
-	insinto /etc/conf.d
-	newins ${SG}/splash.conf splash
-
-	dodir /etc/splash/{emergence,gentoo}
-	cp -pR ${WORKDIR}/{emergence,gentoo} ${D}/etc/splash
-	ln -s emergence ${D}/etc/splash/default
-	dodoc docs/* README AUTHORS
-
-	if [ ! -e ${ROOT}/etc/splash/default ]; then
-		dosym /etc/splash/emergence /etc/splash/default
-	fi
-}
diff --git a/media-gfx/splashutils/splashutils-1.1.9.7.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
index 776a783e1824..b1bf8e25f288 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.7.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2005 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.7.ebuild,v 1.4 2005/07/21 02:27:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10.ebuild,v 1.1 2005/09/29 08:47:37 spock Exp $
 
-inherit multilib linux-mod
+inherit eutils multilib linux-mod
 
 MISCSPLASH="miscsplashutils-0.1.3"
-GENTOOSPLASH="splashutils-gentoo-0.1.11"
-V_KLIBC="1.0.8"
+GENTOOSPLASH="splashutils-gentoo-0.1.14"
 V_JPEG="6b"
 V_PNG="1.2.8"
-V_ZLIB="1.2.1"
+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."
@@ -22,14 +26,11 @@ SRC_URI="mirror://gentoo/${PN}-lite-${PV}.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"
+	 http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 RDEPEND="truetype? ( >=media-libs/freetype-2 )
 	png? ( >=media-libs/libpng-1.2.7 )
 	>=media-libs/jpeg-6b
@@ -37,20 +38,19 @@ RDEPEND="truetype? ( >=media-libs/freetype-2 )
 	!media-gfx/bootsplash
 	media-gfx/fbgrab"
 DEPEND="${RDEPEND}
-	virtual/linux-sources"
+	virtual/linux-sources
+	>=dev-libs/klibc-1.0.14-r1"
 
 S="${WORKDIR}/${P/_/-}"
 SG="${WORKDIR}/${GENTOOSPLASH}"
 SM="${WORKDIR}/${MISCSPLASH}"
 
 pkg_setup() {
-	check_kernel_built
-
 	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."
+		ewarn "the splash kernel helper."
 	fi
 }
 
@@ -72,16 +72,20 @@ spl_conf_use() {
 	fi
 }
 
+pkg_setup() {
+	check_kernel_built
+}
+
 src_unpack() {
 	unpack ${A}
 	ln -s ${KV_DIR} ${S}/linux
 
-	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
+	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}
 
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then
@@ -95,17 +99,22 @@ src_unpack() {
 		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
+	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
 
-	# Setup the kernel object directory
-	echo "KRNLOBJ = ${KV_OUT_DIR}" >> ${S}/libs/klibc-${V_KLIBC}/MCONFIG
+	if ! use truetype ; then
+		sed -i -e 's/fbtruetype kbd/kbd/' ${SM}/Makefile
+	fi
 }
 
 src_compile() {
@@ -114,16 +123,19 @@ src_compile() {
 	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"
+	cd ${S}
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
+	emake -j1 LIB=$(get_libdir) || 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
 
@@ -181,16 +193,15 @@ pkg_postinst() {
 		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."
+	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 'quiet CONSOLE=/dev/tty1' to your kernel"
+	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 quiet CONSOLE=/dev/tty1"
+	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:"
diff --git a/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild
deleted file mode 100644
index 6c7208008679..000000000000
--- a/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2005 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.6-r1.ebuild,v 1.6 2005/07/08 23:31:33 spock Exp $
-
-inherit multilib linux-mod
-
-MISCSPLASH="miscsplashutils-0.1.3"
-GENTOOSPLASH="splashutils-gentoo-0.1.10"
-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
-	!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
-}
-
-src_unpack() {
-	unpack ${A}
-	ln -s ${KERNEL_DIR} ${S}/linux
-
-	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_kernel_built
-
-	# 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
-
-	sed -i -e 's#/usr/bin/openvt -fc ${TTY}#/usr/bin/openvt -c ${TTY} echo -n ""#' ${SG}/init-splash
-}
-
-src_compile() {
-	local miscincs
-
-	if [ -n "${KBUILD_OUTPUT}" ]; then
-		miscincs="-I${T} -I${KBUILD_OUTPUT}/include"
-	fi
-
-	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="${miscincs}" || 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 /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"
-	else
-		eend 0
-	fi
-	umount ${T}
-
-	echo ""
-	ewarn "Due to a change in the splash protocol you will have to rebuild"
-	ewarn "all initrds created with splashutils < 1.1.9. This can be done"
-	ewarn "with the splash_geninitramfs script."
-	echo ""
-	ewarn "It is required that you add 'CONSOLE=/dev/tty1', to make sure all"
-	ewarn "init messages are printed to the first tty, and not the foreground one."
-	ewarn "It is advised that you add 'quiet' as an additional, standalone"
-	ewarn "parameter to suppress non-critical kernel messages."
-	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 ""
-}