Revision bump (fixes bugs #211643, #211598).

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 de2961117464..5450f84ce8f5 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.131 2008/02/25 23:16:00 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.132 2008/03/02 12:23:20 spock Exp $
+
+*splashutils-1.5.4-r1 (02 Mar 2008)
+
+  02 Mar 2008; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.5.4-r1.ebuild:
+  Revision bump (fixes bugs #211643, #211598).
 
   25 Feb 2008; Michał Januszewski <spock@gentoo.org>
   -files/splashutils-1.4.2-getcfg.patch,
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index cd29fd81852a..ad2dc554c407 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -8,6 +8,7 @@ DIST libpng-1.2.18.tar.bz2 623690 RMD160 ea81056a896eb038fa5d7fde2b7fa626c1a2e31
 DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94e44149ab SHA1 d3d0df74b4f613e505d662134a7af5c0cc488108 SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336
 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.13.tar.bz2 15165 RMD160 e012fb9f582df7671d074372d4ee8919b3371605 SHA1 207a62820425f0a213e621ef2a757956e2e17f94 SHA256 146bed86ce978e173ce97da4e6365c721abc5de66067a0945e8446b27bd3eef1
 DIST splashutils-gentoo-1.0.8.tar.bz2 16001 RMD160 2a0b057f894c72892ed11f1d3fd1273f04f766fc SHA1 903508a7b135c0ea942e08227cfa8c69dc12d338 SHA256 2b9a5f393a83190ad59e26f511ae4215b55870d06bb1eb1a0091eb5cbf2dfd2b
 DIST splashutils-lite-1.5.2.1.tar.bz2 89714 RMD160 acf3605dfe28fafcd3139f82d4fa00b0d1049998 SHA1 34e8c87267b418c7cf1fb3a3a5642965a7a547ed SHA256 f5b718d52ecd0d5338eb66fa02aa11a32ba1e052c3ba8d00c3776b8d1d2f6430
 DIST splashutils-lite-1.5.3.4.tar.bz2 414744 RMD160 a1d655786caa6a7bea84d5a17ea0a8c4bb3aae03 SHA1 c908216dd9549d276c561bb77109332c2c61f213 SHA256 4b2a14ed48cc7e18cbc94570f07e05c80f1eca2319ecaaae04f221463de70d97
@@ -15,13 +16,14 @@ DIST splashutils-lite-1.5.4.tar.bz2 420243 RMD160 b0b62fb780a5645717a40547c98f5c
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.5.2.1.ebuild 7420 RMD160 aa0ced0d43d564d522dadf55a823c9bffcfb80b5 SHA1 1eddc1f44ed7b9384d8860cf84fe08c595a08095 SHA256 15c9cc4266f4ccb6beca3f105bf72fb8bb49b4f4ba9220aadd14fecaf7c99c1e
 EBUILD splashutils-1.5.3.4.ebuild 6557 RMD160 46e38e6c0da2b89fb583ae22a1d87e2910a5434e SHA1 8b56dff02823f3d4c81300cac53a1c9ef4fcde4b SHA256 e0ba7278545dec84045b4b7e2c8fa1f15b6f251ba6536a491e75b22370171666
+EBUILD splashutils-1.5.4-r1.ebuild 6576 RMD160 63ab02a3b030d56a445544e7eec5e78628e3a4fa SHA1 313718d5b14bca7846c5f227da57cdbd7848a032 SHA256 668cd50d485ca87c0639ce6ebd01b2670dce17b7dd8cdd3a47931b127ece8740
 EBUILD splashutils-1.5.4.ebuild 6557 RMD160 28d6c778553f0d3d6908707e8b5f1a3eb48391a3 SHA1 24df3a832244e5f83624752a81b9ae930cc8fcda SHA256 2baf5c45e31c72cd77936decba70d46c15ef35aaa793cbf45ab30f1196563a96
-MISC ChangeLog 24898 RMD160 e8f656db9d876d9f5c1b397bc1172b45dae7b2cb SHA1 bb7a2dd56fe11f49f2f0a6a5480662a5e1b6157f SHA256 96e12f2fa71dfb9454e34242c2eac71e80408e7490991d55e2615201a9533a82
+MISC ChangeLog 25069 RMD160 024e74711dca3394555de2e852e8e35f5f7401fc SHA1 012048e513e3358f2e3f0a1c3225016b122ebb97 SHA256 828e66312a8f53a3443167f129771bedf47907dd91e303e67f200ac4cee56edd
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHw0w6chej4aZK9/cRArbrAJ0ZJsDYcRZvS+amgXxfy1lrKnVyYwCaAt9+
-/wm5lh5oT3PgzB7SQ2WsekQ=
-=kCx1
+iD8DBQFHypwzchej4aZK9/cRAsFdAJ46CfciTAAZkMS4AFgdO2tYEGPqVQCfdKZa
+A56BOT0BMk08WHN3Cp4+Jis=
+=qnFu
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-1.5.4-r1.ebuild b/media-gfx/splashutils/splashutils-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..d138a1589244
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.4-r1.ebuild
@@ -0,0 +1,202 @@
+# 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-r1.ebuild,v 1.1 2008/03/02 12:23:20 spock Exp $
+
+EAPI="1"
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.13"
+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}"
+
+RESTRICT="test"
+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."
+}