Version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 215 insertions, 5 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 932ad8732baf..c7e3efc4719b 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.129 2008/02/19 22:57:13 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.130 2008/02/25 23:03:56 spock Exp $
+
+*splashutils-1.5.4 (25 Feb 2008)
+
+  25 Feb 2008; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.5.4.ebuild:
+  Version bump.
 
   19 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
   splashutils-1.5.3.4.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 032b1d62cd15..1a2dfbe7efa7 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -15,6 +15,7 @@ DIST miscsplashutils-0.1.7.tar.bz2 91994 RMD160 c3443b677e56f22e5f405f830dedd559
 DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94e44149ab SHA1 d3d0df74b4f613e505d662134a7af5c0cc488108 SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336
 DIST splashutils-gentoo-1.0.10.tar.bz2 17195 RMD160 5471fb283c0c5848776e7c270bbac34001801196 SHA1 6dcdf4d2a196f04339f3c1b5b279652233f092f4 SHA256 079143358383c2e6ecf8c47eb03ffc4d65630d90e58eb1a17877707146a33056
 DIST splashutils-gentoo-1.0.11.tar.bz2 14879 RMD160 3a067329a72e334c68913906b720e80022b025ea SHA1 5c747a35abd2bc59f274501cce797a6e8793ecb5 SHA256 f2f6a82d34f5438a0bcbf2d79181c15c92ab2ed12881d88db6b271067b616613
+DIST splashutils-gentoo-1.0.12.tar.bz2 15110 RMD160 425a85a12db7d94b43f44f0d3ce94eebb82b09ee SHA1 1a3e251e2a3e4dce9ab99f96adb98fb77a3dcf75 SHA256 eeabfce50ace797b124565eccf721ecff4abf04ed1a249364a9a8806be7b4348
 DIST splashutils-gentoo-1.0.2.tar.bz2 14703 RMD160 697e3b3970bf3f38f346e781fc23ad21735219dd SHA1 fda89cc3e27c1d4c348581a596d055f0d7206e5c SHA256 6705146d56a9fc9206bbf6da7d69aaefcdaed29c0771feed495a07534a4cbd00
 DIST splashutils-gentoo-1.0.3.tar.bz2 14962 RMD160 b08698b26b4f4edef2a46d2763e9d1a5df6c44b0 SHA1 3860cfe8a2fadef34e5f79a20829098ad76da23c SHA256 ff65cda5ca4df747efe9724cfab3dd8425ed471e43d7e4f4e01ad66ab666c33f
 DIST splashutils-gentoo-1.0.8.tar.bz2 16001 RMD160 2a0b057f894c72892ed11f1d3fd1273f04f766fc SHA1 903508a7b135c0ea942e08227cfa8c69dc12d338 SHA256 2b9a5f393a83190ad59e26f511ae4215b55870d06bb1eb1a0091eb5cbf2dfd2b
@@ -24,6 +25,7 @@ DIST splashutils-lite-1.5.2.1.tar.bz2 89714 RMD160 acf3605dfe28fafcd3139f82d4fa0
 DIST splashutils-lite-1.5.3.2.tar.bz2 337849 RMD160 d81143d7103df91b363f6f38c368914b1e331577 SHA1 016b647a2c4ec06de6ac3aa534d31572aa209d83 SHA256 e48d8b2d578ee2aeeeb16172ce711f3ba282b7e2a1974bdcca5ecbb0fb03f36a
 DIST splashutils-lite-1.5.3.3.tar.bz2 413745 RMD160 a5bcaf0e08b88b408c32a6f2a872039b1fe10b8e SHA1 433ada58550485b7d8dd134d30462e0ba52bfa5e SHA256 007ee847f5096a625de37b0d2256f6c899602241560b0b86abab53944365ed80
 DIST splashutils-lite-1.5.3.4.tar.bz2 414744 RMD160 a1d655786caa6a7bea84d5a17ea0a8c4bb3aae03 SHA1 c908216dd9549d276c561bb77109332c2c61f213 SHA256 4b2a14ed48cc7e18cbc94570f07e05c80f1eca2319ecaaae04f221463de70d97
+DIST splashutils-lite-1.5.4.tar.bz2 420243 RMD160 b0b62fb780a5645717a40547c98f5c42b7df9015 SHA1 a6162bc76d32f90558340598d7f6ade4c3ee00ed SHA256 f4473aff8e6efb1008fc4471da968cb7d707cd6badabe03422d95c631305bba3
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.4.2.1.ebuild 6678 RMD160 c2e879a65da76f4f6f6a987c5fc6ecba7ecacde4 SHA1 408918c1352c4a0e921f08ebd539efeca17c737f SHA256 34ed66a3f60c205333aeffb7b59b1fe61cd11d5a1c4b3e10f99ef39ab88d9eb1
 EBUILD splashutils-1.4.2.ebuild 6837 RMD160 fc93b9b3d2f3584cf1e98aee5b4f679a160a0922 SHA1 3d906405d4688d86571faf70fd46c07957f41014 SHA256 dc886049220bcd31d8005cff90436e95577b9c86d7b4aa58acb7ccf6b3b6bbc8
@@ -31,12 +33,13 @@ EBUILD splashutils-1.5.2.1.ebuild 7420 RMD160 aa0ced0d43d564d522dadf55a823c9bffc
 EBUILD splashutils-1.5.3.2.ebuild 6581 RMD160 6fa6c4a00b79ff55f13e13ec6121e14cfa231249 SHA1 91df7d3f62af00ce1d8bca7c5e3a5daf3ea0b243 SHA256 ba092f168f1dc4c12d712dfd4562203316e7f42bef87a2bce5925fdfc4ebd9c9
 EBUILD splashutils-1.5.3.3.ebuild 6523 RMD160 ddaf5a8e08e0cf4e7608e574abe08856800824e9 SHA1 d1151952bdec4aea315ff92898a2a2373d1ec84c SHA256 831dc9720bd7377010c0d789d3963608f7c0bfe5b0f85461de81e249c8a11243
 EBUILD splashutils-1.5.3.4.ebuild 6557 RMD160 46e38e6c0da2b89fb583ae22a1d87e2910a5434e SHA1 8b56dff02823f3d4c81300cac53a1c9ef4fcde4b SHA256 e0ba7278545dec84045b4b7e2c8fa1f15b6f251ba6536a491e75b22370171666
-MISC ChangeLog 24441 RMD160 4549c798351d1ca1873b3cad8174618a664863d7 SHA1 aa5e2e61cb1ee4c6ff9edb872c55959b8b203df9 SHA256 0a028a39aee400fa96adb2e027a83d85ad4021c40663296c1dbf1e75e8f1aa39
+EBUILD splashutils-1.5.4.ebuild 6557 RMD160 28d6c778553f0d3d6908707e8b5f1a3eb48391a3 SHA1 24df3a832244e5f83624752a81b9ae930cc8fcda SHA256 2baf5c45e31c72cd77936decba70d46c15ef35aaa793cbf45ab30f1196563a96
+MISC ChangeLog 24575 RMD160 6dce42c54b2eafd1e506d3f91981c86233f36fec SHA1 89fc068ecf868b7888b7777517902bc0b787f5c5 SHA256 a463757b706490247e49ce0a3a8697cc144472982c8632a86e1125ecc754d46d
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHu18rNQqtfCuFneMRAj9fAJwNSbADwvY36ZsZFFk3T/kAjC8QaQCeJhnL
-h9uNsorZipzTNSKdZyvk0bU=
-=1+3+
+iD8DBQFHw0lnchej4aZK9/cRAl4aAJsE7CezadNfvWhsj20WOCPebgf+mwCggTp9
+Nr5hvSuNQKad2J+YOjCR5Zw=
+=eI1T
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-1.5.4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.ebuild
new file mode 100644
index 000000000000..991497bb6f63
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.4.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.ebuild,v 1.1 2008/02/25 23:03:56 spock Exp $
+
+EAPI="1"
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.12"
+V_JPEG="6b"
+V_PNG="1.2.18"
+V_ZLIB="1.2.3"
+V_FT="2.3.5"
+
+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 fbcondecor"
+
+DESCRIPTION="Framebuffer splash utilities."
+HOMEPAGE="http://fbsplash.berlios.de"
+SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
+	mirror://berlios/fbsplash/${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="gpm? ( sys-libs/gpm )
+	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/fbgrab"
+DEPEND="${RDEPEND}
+	>=dev-libs/klibc-1.5
+	dev-util/pkgconfig"
+
+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}/src" "${WORKDIR}/core"
+
+	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.in"
+	fi
+
+	if ! use truetype ; then
+		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
+	fi
+}
+
+src_compile() {
+	cd "${SM}"
+	emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
+
+	cd "${S}"
+	econf \
+		$(use_with png) \
+		$(use_with mng) \
+		$(use_with gpm) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttf-kernel) \
+		$(use_enable fbcondecor) \
+		--with-freetype2-src=${FT2SRC} \
+		--with-jpeg-src=${JPEGSRC} \
+		--with-lpng-src=${LPNGSRC} \
+		--with-zlib-src=${ZLIBSRC} || die "failed to configure splashutils"
+
+	emake -j1 || 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
+
+	cd "${S}"
+	make DESTDIR="${D}" install || die
+
+	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
+	gen_usr_ldscript libfbsplash.so
+
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
+	doenvd 99splash
+
+	if use fbcondecor ; then
+		newinitd "${SG}"/init-fbcondecor fbcondecor
+		newconfd "${SG}"/fbcondecor.conf fbcondecor
+	fi
+	newconfd "${SG}"/splash.conf splash
+
+	insinto /usr/share/${PN}
+	doins "${SG}"/initrd.splash
+
+	insinto /etc/splash
+	doins "${SM}"/fbtruetype/luxisri.ttf
+
+	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/
+	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
+		elog "This package has been designed with udev in mind. Other solutions, such as"
+		elog "devfs or a static /dev tree might work, but are generally discouraged and"
+		elog "not supported. If you decide to switch to udev, you might want to have a"
+		elog "look at 'The Gentoo udev Guide', which can be found at"
+		elog "  http://www.gentoo.org/doc/en/udev-guide.xml"
+		elog ""
+	fi
+
+	if has_version '<media-gfx/splashutils-1.0' ; then
+		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
+		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
+		elog ""
+	fi
+
+	if has_version '<media-gfx/splashutils-1.5.3' && ! use fbcondecor ; then
+		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
+		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
+		elog "to use fbcondecor, run:"
+		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
+		elog "and re-emerge splashutils."
+	fi
+
+	if ! test -f /proc/cmdline ||
+		! egrep -q '(console|CONSOLE)=(tty1|/dev/tty1)' /proc/cmdline ; then
+		elog "It is required that you add 'console=tty1' to your kernel"
+		elog "command line parameters."
+		elog ""
+		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
+
+	elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
+	elog "'fbcondecor'.  Accordingly, the old 'splash' initscript is now called"
+	elog "'fbcondecor'.  Make sure you update your system.  See:"
+	elog "    http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
+	elog "for further info about the name changes."
+	elog ""
+	elog "Also note that splash_util has now been split into splash_util, fbsplashd"
+	elog "and fbcondecor_ctl."
+}