Version bump.

(Portage version: 2.0.51.21-r1)

6 files changed, 91 insertions, 178 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 896d8e3bc562..a47c229cb163 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,21 @@
 # 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.26 2005/04/29 23:09:05 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.27 2005/05/16 16:11:36 spock Exp $
+
+*splashutils-1.1.9.6 (16 May 2005)
+
+  16 May 2005; Michał Januszewski <spock@gentoo.org>
+  -splashutils-1.1.9.3.ebuild, -splashutils-1.1.9.4.ebuild,
+  +splashutils-1.1.9.6.ebuild:
+  And another bugfix release, which includes fixes for some remaining issues 
+  spotted in the 1.1.9.x series (bug #90483 comes to mind). The default silent 
+  tty has now been set to tty16 to avoid conflicts with consolefont and 
+  syslog-ng. If you have a 'tty:' setting on your kernel command line, try 
+  removing it in case of any problems. A new utility script, called 
+  splash_manager, is included in this release. The script can be used for 
+  switching, setting, testing and listing themes. It's somewhat experimental
+  at this stage, so please test it. If you are not sure how the kernel command 
+  line should be set, try using 'splash_manager -c switch -t <theme>'.
 
   29 Apr 2005; Michał Januszewski <spock@gentoo.org>
   -splashutils-0.9_rc1.ebuild, -splashutils-1.1.9.1.ebuild,
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.3 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.3
deleted file mode 100644
index 9d427bd13144..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.3
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 06badfb8e4a27b146b8ed8a094088494 splashutils-1.1.9.3.tar.bz2 2652020
-MD5 748e59d94250eba7bbfd33fd37c80e2f splashutils-gentoo-0.1.7.tar.bz2 6960
-MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
-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.4 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.4
deleted file mode 100644
index 0acf958600b5..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.4
+++ /dev/null
@@ -1,5 +0,0 @@
-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/files/digest-splashutils-1.1.9.6 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.6
new file mode 100644
index 000000000000..51f51b8bf89a
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.6
@@ -0,0 +1,8 @@
+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/splashutils-1.1.9.3.ebuild b/media-gfx/splashutils/splashutils-1.1.9.3.ebuild
deleted file mode 100644
index 7cff974915ef..000000000000
--- a/media-gfx/splashutils/splashutils-1.1.9.3.ebuild
+++ /dev/null
@@ -1,143 +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.3.ebuild,v 1.1 2005/03/28 20:52:45 spock Exp $
-
-MISCSPLASH="miscsplashutils-0.1.3"
-GENTOOSPLASH="splashutils-gentoo-0.1.7"
-KLIBC_VERSION="0.199"
-
-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-r1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-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/_/-}"
-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
-}
-
-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
-		fi
-	fi
-
-	# this should make this version of 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
-
-	emake -j1 MISCINCS="${miscincs}" || die "failed to build splashutils"
-
-	cd ${SM}
-	emake || die "failed to build miscsplashutils"
-}
-
-src_install() {
-	cd ${S}
-	make DESTDIR=${D} install || die
-
-	keepdir /lib/splash/{tmp,cache,bin}
-
-	cd ${SM}
-	make DESTDIR=${D} install || die
-
-	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 previous versions of splashutils. This"
-	ewarn "can be done 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,tty:8,theme:emergence quiet CONSOLE=/dev/tty1"
-	echo ""
-	einfo "'tty:x' is used to specify the silent tty number. Use it to adjust"
-	einfo "the silent splash so that there are no conflicts with services such"
-	einfo "as consolefont."
-}
diff --git a/media-gfx/splashutils/splashutils-1.1.9.4.ebuild b/media-gfx/splashutils/splashutils-1.1.9.6.ebuild
index c152b353450d..ea746a6329c9 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.4.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.6.ebuild
@@ -1,20 +1,29 @@
 # 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.2 2005/04/26 12:26:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.6.ebuild,v 1.1 2005/05/16 16:11:36 spock Exp $
 
 MISCSPLASH="miscsplashutils-0.1.3"
-GENTOOSPLASH="splashutils-gentoo-0.1.8"
-KLIBC_VERSION="0.199"
+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/"
-SRC_URI="mirror://gentoo/${P/_/-}.tar.bz2
+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://gentoo/fbsplash-theme-emergence-r2.tar.bz2
-	 mirror://gentoo/fbsplash-theme-gentoo-r2.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"
@@ -23,7 +32,8 @@ 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/bootsplash
+	media-gfx/fbgrab"
 DEPEND="${RDEPEND}
 	virtual/linux-sources"
 
@@ -37,6 +47,14 @@ pkg_setup() {
 		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."
+	else
+		if [[ -n "`echo ${GCC_SPECS} | grep hardened`" ]]; then
+			ewarn "It appears that you're using a hardened gcc, even though the 'hardened'"
+			ewarn "USE flag is not set. This is a common source of compilation problems with"
+			ewarn "splashutils. Please use 'gcc-config' to set a non-hardened profile and"
+			ewarn "make sure the environment is up-to-date (especially, that the GCC_SPECS"
+			ewarn "env. variable is set correctly)."
+		fi
 	fi
 }
 
@@ -62,6 +80,13 @@ src_unpack() {
 	unpack ${A}
 	ln -s /usr/src/linux ${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 /usr/src/linux/include/linux/console_splash.h ]]; then
 		ewarn "Your kernel in /usr/src/linux has not been patched with a compatible version"
@@ -90,10 +115,13 @@ src_unpack() {
 	# 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
+		sed -e 's@CFLAGS  =@CFLAGS  = -fno-stack-protector@' -i ${S}/libs/klibc-${V_KLIBC}/klibc/MCONFIG
 	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
 }
 
 src_compile() {
@@ -107,6 +135,7 @@ src_compile() {
 	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}
@@ -121,9 +150,11 @@ src_install() {
 	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
 
@@ -139,30 +170,42 @@ src_install() {
 	insinto /etc/splash
 	doins ${SM}/fbtruetype/luxisri.ttf
 
-	dodir /etc/splash/{emergence,gentoo}
-	cp -pR ${WORKDIR}/{emergence,gentoo} ${D}/etc/splash
 	dodoc docs/* README AUTHORS
-
-	if [ ! -e ${ROOT}/etc/splash/default ]; then
-		dosym /etc/splash/emergence /etc/splash/default
-	fi
 }
 
 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 "  mkdev /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_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."
+	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 ""
 }