Version bump.

(Portage version: 1.589-cvs)

3 files changed, 220 insertions, 1 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 2e75cc78e92e..42f8a274ed87 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,15 @@
 # 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.37 2005/07/08 23:31:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.38 2005/07/09 01:46:08 spock Exp $
+
+*splashutils-1.1.9.7 (09 Jul 2005)
+
+  09 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.1.9.7.ebuild:
+  Version bump -- 1.1.9.7 includes many bugfixes and has support for genkernel
+  initrds. Changed all KBUILD_OUTPUT references to KV_OUT_DIR in the ebuild.
+  This should fix compilation problems for people using an external kernel
+  object directory.
 
   08 Jul 2005; Michał Januszewski <spock@gentoo.org>
   -splashutils-1.1.9.6.ebuild, splashutils-1.1.9.6-r1.ebuild:
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.7 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.7
new file mode 100644
index 000000000000..bf52ae45dcb0
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.7
@@ -0,0 +1,8 @@
+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-1.1.9.7.ebuild b/media-gfx/splashutils/splashutils-1.1.9.7.ebuild
new file mode 100644
index 000000000000..08b67059051e
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.1.9.7.ebuild
@@ -0,0 +1,202 @@
+# 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.1 2005/07/09 01:46:08 spock Exp $
+
+inherit multilib linux-mod
+
+MISCSPLASH="miscsplashutils-0.1.3"
+GENTOOSPLASH="splashutils-gentoo-0.1.11"
+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="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
+	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
+
+	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 decice 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 ""
+}