Version bump.

(Portage version: 2.1.2.9)

3 files changed, 234 insertions, 1 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index e0f5c237169c..4a25ce5cb2ba 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.95 2007/05/14 19:26:05 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.96 2007/06/09 18:40:12 spock Exp $
+
+*splashutils-1.4.2.1 (09 Jun 2007)
+
+  09 Jun 2007; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.4.2.1.ebuild:
+  Version bump.
 
   14 May 2007; Markus Ullmann <jokey@gentoo.org> splashutils-1.4.2.ebuild:
   Stable on x86 wrt bug #178161
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.4.2.1 b/media-gfx/splashutils/files/digest-splashutils-1.4.2.1
new file mode 100644
index 000000000000..66ff71f61bf3
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.4.2.1
@@ -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 a85ce1460c421e0001445ddf33e80dd1 miscsplashutils-0.1.7.tar.bz2 91994
+RMD160 c3443b677e56f22e5f405f830dedd5591e0e666b miscsplashutils-0.1.7.tar.bz2 91994
+SHA256 0f0828878a3a284591e6a2ca3a6e07c233ab14c268b36efcb6ac0fa8390fc61f miscsplashutils-0.1.7.tar.bz2 91994
+MD5 0d83656ff1fe1cc4d3fabf530df5c8f9 splashutils-gentoo-1.0.3.tar.bz2 14962
+RMD160 b08698b26b4f4edef2a46d2763e9d1a5df6c44b0 splashutils-gentoo-1.0.3.tar.bz2 14962
+SHA256 ff65cda5ca4df747efe9724cfab3dd8425ed471e43d7e4f4e01ad66ab666c33f splashutils-gentoo-1.0.3.tar.bz2 14962
+MD5 45d8bfd27b19ca6be60fce43c66b066d splashutils-lite-1.4.2.1.tar.bz2 67312
+RMD160 a1c97cf1e5739f798ba49d978dcb583ca8229fdf splashutils-lite-1.4.2.1.tar.bz2 67312
+SHA256 6469049067a292f5bd5293b41227b1ca16803ec988d01704d9445a3abd4dbaa6 splashutils-lite-1.4.2.1.tar.bz2 67312
+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.4.2.1.ebuild b/media-gfx/splashutils/splashutils-1.4.2.1.ebuild
new file mode 100644
index 000000000000..5a0d6a3c8c0d
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.4.2.1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.4.2.1.ebuild,v 1.1 2007/06/09 18:40:12 spock Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.7"
+GENTOOSPLASH="splashutils-gentoo-1.0.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 gpm"
+
+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="~amd64 ~ppc ~x86"
+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.9.4-r5
+	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}
+	ln -sf ${S} ${WORKDIR}/core
+
+	# Check whether the kernel tree has been patched with fbsplash.
+	if [[ ! -e /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
+
+	sed -i -e "s#/lib/splash#/$(get_libdir)/splash#" ${S}/scripts/{splash_manager,splash_geninitramfs}
+}
+
+src_compile() {
+	local myconf=""
+	if [[ ! -e /usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
+		myconf="--without-fbsplash"
+	else
+		myconf="--with-fbsplash"
+	fi
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		myconf="${myconf} --with-gentoo"
+	fi
+
+	cd ${SM}
+	emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
+
+	cd ${S}
+	./configure \
+		--with-fifo="/$(get_libdir)/splash/cache/.splash" \
+		$(use_with png) \
+		$(use_with mng) \
+		$(use_with gpm) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttfkern) \
+		${myconf} || die "failed to configure splashutils"
+
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
+	emake -j1 LIB=$(get_libdir) || die "failed to build splashutils"
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd ${SG}
+		emake LIB=$(get_libdir) || die "failed to build the splash plugin"
+	fi
+}
+
+src_install() {
+	local LIB=$(get_libdir)
+
+	cd ${SM}
+	make DESTDIR=${D} LIB=${LIB} install || die
+
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
+	cd ${S}
+	make DESTDIR=${D} LIB=${LIB} install || die
+
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
+	doenvd 99splash
+
+	newinitd ${SG}/init-splash splash
+	newconfd ${SG}/splash.conf splash
+
+	insinto /usr/share/${PN}
+	doins ${SG}/initrd.splash
+
+	insinto /etc/splash
+	doins ${SM}/fbtruetype/luxisri.ttf
+
+	dodoc docs/* README AUTHORS
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd ${SG}
+		make DESTDIR=${D} LIB=${LIB} install || die "failed to install the splash plugin"
+	else
+		cp ${SG}/splash-functions-bl1.sh ${D}/sbin/splash-functions.sh
+	fi
+
+	sed -i -e "s#/lib/splash#/${LIB}/splash#" ${D}/sbin/splash-functions.sh
+	keepdir /${LIB}/splash/{tmp,cache,bin}
+	dosym /${LIB}/splash/bin/fbres /sbin/fbres
+}
+
+pkg_postinst() {
+	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"
+		ewarn ""
+	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."
+		ewarn ""
+	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."
+		ewarn ""
+		elog "After these modifications, the relevant part of the kernel command"
+		elog "line might look like:"
+		elog "  splash=silent,fadein,theme:emergence console=tty1"
+		elog ""
+	fi
+
+	if ! has_version 'media-gfx/splash-themes-livecd' &&
+		! has_version 'media-gfx/splash-themes-gentoo'; then
+		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+		elog "core splashutils package. To get some themes you might want to emerge:"
+		elog "  media-gfx/splash-themes-livecd"
+		elog "  media-gfx/splash-themes-gentoo"
+	fi
+}