Version bump.

(Portage version: 2.0.51.19)

3 files changed, 187 insertions, 1 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 526854dd5fb5..c22c10a97972 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,18 @@
 # 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.22 2005/03/28 20:52:45 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.23 2005/04/24 20:19:59 spock Exp $
+
+*splashutils-1.1.9.4 (24 Apr 2005)
+
+  24 Apr 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.4.ebuild:
+  A bugfix release (fixes bugs: #88461, #87113, #85531). It also introduces
+  support for new USE flags: png, truetype and kdgraphics. The first two of
+  them should probably be enabled to make sure all themes work correctly.
+  kdgraphics is a local USE flag which changes the way the silent splash image
+  is displayed. Please read the description in use.local.desc before enabling
+  it, as it has the potential to break things and it should probably be kept
+  disabled in all common situations.
 
 *splashutils-1.1.9.3 (28 Mar 2005)
 
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.4 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.4
new file mode 100644
index 000000000000..0acf958600b5
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.4
@@ -0,0 +1,5 @@
+MD5 035ea765762509ea692b6c526a97c4d4 splashutils-1.1.9.4.tar.bz2 2652835
+MD5 be7abc95836d0ae8a2cbcc0a8fa8a040 splashutils-gentoo-0.1.8.tar.bz2 7068
+MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
+MD5 53437014b3e4ddd2d72de7f6e88e1486 fbsplash-theme-emergence-r2.tar.bz2 4794297
+MD5 76e9266c8d1dc20afeb443b664f5eb8c fbsplash-theme-gentoo-r2.tar.bz2 5605891
diff --git a/media-gfx/splashutils/splashutils-1.1.9.4.ebuild b/media-gfx/splashutils/splashutils-1.1.9.4.ebuild
new file mode 100644
index 000000000000..b285ebe54531
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.1.9.4.ebuild
@@ -0,0 +1,169 @@
+# 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.4.ebuild,v 1.1 2005/04/24 20:19:59 spock Exp $
+
+MISCSPLASH="miscsplashutils-0.1.3"
+GENTOOSPLASH="splashutils-gentoo-0.1.8"
+KLIBC_VERSION="0.199"
+
+IUSE="hardened png truetype kdgraphics"
+
+DESCRIPTION="Framebuffer splash utilities."
+HOMEPAGE="http://dev.gentoo.org/~spock/"
+SRC_URI="mirror://gentoo/${P/_/-}.tar.bz2
+	 mirror://gentoo/${GENTOOSPLASH}.tar.bz2
+	 mirror://gentoo/${MISCSPLASH}.tar.bz2
+	 mirror://gentoo/fbsplash-theme-emergence-r2.tar.bz2
+	 mirror://gentoo/fbsplash-theme-gentoo-r2.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
+	!media-gfx/bootsplash"
+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 /usr/src/linux ${S}/linux
+
+	# Check whether the kernel tree has been patched with fbsplash.
+	if [[ ! -e /usr/src/linux/include/linux/console_splash.h ]]; then
+		ewarn "Your kernel in /usr/src/linux 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
+
+	# Make sure the kernel is configured. This is necessary for klibc to build.
+	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
+		fi
+	fi
+
+	# This should make splashutils compile on hardened systems.
+	if use hardened; then
+		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
+	fi
+
+	mkdir ${S}/kernel
+}
+
+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
+	emake -j1 MISCINCS="${miscincs}" || die "failed to build splashutils"
+
+	cd ${SM}
+	emake || 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
+
+	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
+
+	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
+}
+
+pkg_postinst() {
+	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_geninitramsfs script."
+	echo ""
+	einfo "For best effects, this new version of splashutils requires some"
+	einfo "slight modifications to the kernel command line arguments in"
+	einfo "GRUB/LILO/whatever bootloader you use."
+	echo ""
+	einfo "It is required that you add 'CONSOLE=/dev/tty1', to make sure all"
+	einfo "init messages are printed to the first tty, and not the foreground one."
+	einfo "It is advised that you add 'quiet' as an additional, standalone"
+	einfo "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"
+}