Version bump (bug #154388).

(Portage version: 2.1.2_rc2-r1)

3 files changed, 243 insertions, 1 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 6f52418a06d1..488e19076516 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.68 2006/09/27 15:06:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.69 2006/11/21 18:57:44 spock Exp $
+
+*splashutils-1.3-r3 (21 Nov 2006)
+
+  21 Nov 2006; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.3-r3.ebuild:
+  Add support for new features present in sys-apps/baselayout-1.13.*.
 
   27 Sep 2006; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.1.9.10-2.6.18-vt-fix.patch,
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.3-r3 b/media-gfx/splashutils/files/digest-splashutils-1.3-r3
new file mode 100644
index 000000000000..a17a62938273
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.3-r3
@@ -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 20fc3ed2407edc8cd97623bf7f1c5c7b miscsplashutils-0.1.5.tar.bz2 91898
+RMD160 1930081408fd6bad6f60db883127f22ff727f83e miscsplashutils-0.1.5.tar.bz2 91898
+SHA256 906163c75d487a00ba7d6b287e20e4ce195febcd4fdb8592d53827c2f8a28142 miscsplashutils-0.1.5.tar.bz2 91898
+MD5 5c7d09c99631a44f58143881649abda7 splashutils-gentoo-0.5.3.tar.bz2 6796
+RMD160 19952bd63cf6a4e512d3c604e4e015e79d0c2187 splashutils-gentoo-0.5.3.tar.bz2 6796
+SHA256 f784704b11c8d6e884a652cc0084117ccb4e28392ba3acfabd060fc7358aa100 splashutils-gentoo-0.5.3.tar.bz2 6796
+MD5 4ccfe3fcfba17e44c19df6d8b6a4a2e6 splashutils-lite-1.3.tar.bz2 61079
+RMD160 4d5296ed0b2a7a7783cfe5f9f25b53fa56307bc7 splashutils-lite-1.3.tar.bz2 61079
+SHA256 4f94e91ee81acea4d6ef8d481b32cf15cd7987030e048e0e249eec995ef8a5d0 splashutils-lite-1.3.tar.bz2 61079
+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/splashutils-1.3-r3.ebuild b/media-gfx/splashutils/splashutils-1.3-r3.ebuild
new file mode 100644
index 000000000000..5c597746f525
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.3-r3.ebuild
@@ -0,0 +1,215 @@
+# 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.3-r3.ebuild,v 1.1 2006/11/21 18:57:44 spock Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.5"
+GENTOOSPLASH="splashutils-gentoo-0.5.3"
+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 mng"
+
+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 )
+	mng? ( media-libs/lcms media-libs/libmng )
+	>=media-libs/jpeg-6b
+	>=sys-apps/baselayout-1.13.0_alpha7-r1
+	app-arch/cpio
+	!media-gfx/bootsplash
+	media-gfx/fbgrab"
+DEPEND="${RDEPEND}
+	>=dev-libs/klibc-1.4.13"
+
+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
+}
+
+src_unpack() {
+	unpack ${A}
+
+	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.3-r2.patch
+	epatch ${FILESDIR}/splashutils-1.3-r2-fbsplash.patch
+
+	# Make sure the static version of splash_util is linked against the nptl
+	# libraries and not the linuxthreads ones.
+	sed -i -e 's#$(LDLIBS) -static#$(LDLIBS) -L/usr/lib/nptl -static#' Makefile
+
+	# Check whether the kernel tree has been patched with fbsplash.
+	if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
+		ewarn "The kernel tree against which dev-libs/klibc was built was not patched"
+		ewarn "with a compatible version of fbsplash. Splashutils will be compiled"
+		ewarn "without fbsplash support (ie. verbose mode will not work)."
+	fi
+
+	if has_version sys-libs/glibc && ! built_with_use sys-libs/glibc nptl ; then
+		eerror "Your sys-libs/glibc has been built with support for linuxthreads only."
+		eerror "This package requires nptl to work correctly. Please recompile glibc"
+		eerror "with the 'nptl' USE flag enabled."
+		die "nptl not available"
+	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
+
+	# 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
+
+	# Fix path to klibc headers on multilib systems
+	sed -i -e "s:/lib/klibc:/$(get_libdir)/klibc:" ${S}/Makefile
+}
+
+src_compile() {
+	local myconf=""
+	if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
+		myconf="--without-fbsplash"
+	else
+		myconf="--with-fbsplash"
+	fi
+
+	sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile
+	cd ${SM}
+	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
+	cd ${S}
+
+	./configure \
+		$(use_with png) \
+		$(use_with mng) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttfkern) \
+		${myconf} || die "failed to configure splashutils"
+
+	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 /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
+
+	if has_version '<media-gfx/splashutils-1.0' ; then
+		ewarn "Since you are upgrading from a pre-1.0 version, please make sure that you"
+		ewarn "rebuild your initrds. You can use the splash_geninitramfs script to do that."
+		echo ""
+	fi
+
+	if ! test -f /proc/cmdline ||
+		! egrep -q '(console|CONSOLE)=(tty1|/dev/tty1)' /proc/cmdline ; then
+		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 ""
+	fi
+
+	if ! has_version 'media-gfx/splash-themes-livecd' &&
+		! has_version 'media-gfx/splash-themes-gentoo'; then
+		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"
+	fi
+}