Revbump to add -lbz2 to libfbsplashrender.pc (bug 408283)

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 307 insertions, 15 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 5deb485f36ed..b96c405d026a 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.205 2012/10/28 16:20:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.206 2012/11/30 01:22:46 xmw Exp $
+
+*splashutils-1.5.4.4-r3 (30 Nov 2012)
+
+  30 Nov 2012; Michael Weber <xmw@gentoo.org> +splashutils-1.5.4.4-r3.ebuild,
+  +files/splashutils-1.5.4.4-r3-bzip2.patch:
+  Revbump to add -lbz2 to libfbsplashrender.pc (bug 408283)
 
   28 Oct 2012; Markos Chandras <hwoarang@gentoo.org>
   splashutils-1.5.4.4-r1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index d8f626ff650a..47f1b029604e 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -16,6 +16,7 @@ AUX splashutils-1.5.4.3-splash_util.patch 1335 SHA256 25b64a8bcb49f660a18dbd30bb
 AUX splashutils-1.5.4.4-bzip2.patch 1539 SHA256 9596a410eb5fcadab850ac8f1d54c14d60287333a204212cfcdb1dc2dfa608ac SHA512 c42a967361b4ebe9673eb41cb3d8d120edf95708892422bed0b2a46ea501d852c6c43b9405c90b69469a9b0eb07a5159e1547d168ef04b0de8a6c7bae0651317 WHIRLPOOL 4f28bec7ffac7caa4b5fc8e931ae579bf8041b8fcf6c6b571dc9c59a329285d6a6c5943313bedfc3144a3f0848eecbe0784a27bdaf395715c57909bd5e90447c
 AUX splashutils-1.5.4.4-freetype-bz2.patch 515 SHA256 06a9f6d9d9206d09115abf3d8c86692908530f11168a51d99dd43a465e7092c0 SHA512 880cc0703de76c3c145680f1e85e461473df3dd41817757878bd18dc4c0d10484d1f93f995e6818ddcf3309e6b9febc1447ce7880006df8e08626bac5aae2e5c WHIRLPOOL 50c58afaacfd2594c1bc402c07680d742809e2af694b98acb3656f7dbc50cc85a537bec4b362c443f9dbe1054307c397cdba9613392ef6c508760d2487095265
 AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 SHA256 92ee0727bfd9fe6f9565d09546ea63079467f67c2d57385713a62d0b617bb1bf SHA512 f5d5fd222b5dea9906e5a7541ad2ab1ff161061c6bb5e013929767d3f6aa9fe245092e201b8d42a086938be3320b77384301c22bc307cf7872daac33184127f2 WHIRLPOOL f971453383c1abf28c912a49c426c7da92ba6d44580981e89bedd4ef7df9940236e53842bd31ecb85c44c2ff31230569a33e7233498269aefc8caeacb84b9caa
+AUX splashutils-1.5.4.4-r3-bzip2.patch 1808 SHA256 9622dc7721e0c36538e8a1321ff59e224231578675831909d1c68f3eb9f46434 SHA512 8c1ea0bef43c4c829615db010a958ffa7c4ab8c84786a39e702be677745e47004ee59bdb1d7c80bfc637ff7c0f9a129f225e024251492b45aec7c42e1bd73da0 WHIRLPOOL 2522dcc049d68269764c9254f8884d62aa16d08fe5fa917b7c89db46617c1694c73c79f3af30c361cdd22b4d68c07b0b52c70c3243c15b263c6b5cdb6e2ef457
 AUX splashutils-openrc-0.4-fix.patch 2750 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846 SHA512 df844cdb4c1d418390031a669a0907db9e2833e5a87cebfc822e0e43e9ea43f4aaa8ab594f1c7527e056688fc96b38cefbacb2310ba9c6ee3cb06782137f6a76 WHIRLPOOL 59c9336da412c4aadea1fdb69cdd5fa4332284ce482923d392535e1833aa6e8f21981cb33c5bed3dd65b08e65e835fd7f71ba2dcf14e35575c97208d429235df
 AUX splashutils-openrc-0.4.3-runlevel-fix.patch 3472 SHA256 9e122dc031acee6996375170ae8954a0ea78cc99ba9265ab2e4ba540da25cb94 SHA512 e040fbe69908050aa378b5292d7d66f9dabda2961067a8c0ed644026a8d4677a33a8ddb709fd4b85059d8676c12c5b29379f851f6737addbc3a43eded9f70587 WHIRLPOOL 5468fa781a2932a89661130b2bbc0cfd301facac6daddb8977dbfba51eb9d77bc3dee301c18aeb3c70b8bb473cb29a06654825f2255f7581c7ffc609025a5858
 DIST freetype-2.3.12.tar.bz2 1453034 SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92 SHA512 becb0f138ee13181513d3f03b943f0a474e492cab151992fa78d0c84127819dc91ec6d2bd1528af7e111ab150b3a29104f2f7ab79650cebc35ce4d966b19f34b WHIRLPOOL 1a7363b8e1cc1b4597077e6cdf7e978b80cc76e1428124312d139ee81fe5247eed5ec0243352b721c28a25a179bceb901700d0766c1a5110b19f8fe53c303a89
@@ -30,23 +31,14 @@ DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac2
 EBUILD splashutils-1.5.4.3-r3.ebuild 8408 SHA256 7e4f26ce0cbc681135d0fade2659a1e6ef5cc6f6c6bc601accd9587edec68a76 SHA512 6ed511aa03d752346645fbcb6142360b09a84f912ac62496d9ceeb80a23b6ebca8649da88356e84e8b18b63ab5504fcf76c5023faa9ba1b0f32845d9f2b4248d WHIRLPOOL ff9172f05acad4e2748a2a93b8b62d538e5ab9f9329ad308abcb683e258159034478bc7a07665fc6093005715834b36b43b8293125da96e2158977fc87bedcb7
 EBUILD splashutils-1.5.4.4-r1.ebuild 7613 SHA256 785795236300b4ff0cb04e163dd40a50b66168c49d25cd5cb9432c2d87884144 SHA512 651771c100c3746e416292a5d7c4feb1deab4068ef7350f6ea6c05cd272bb6939001897ba91331e1be7c8b42391a65967b34d2fd9f05a4db38387c6362aec6ed WHIRLPOOL b66cdefc08462a8b9c5821708e6d2fb5989b51211e6fd901de377e9f4f61a76449c49e49a6633325fdd143ba376448b6506fa1ef0311e82b519688c63b61e799
 EBUILD splashutils-1.5.4.4-r2.ebuild 7319 SHA256 46a31670287748b2c4f99777025f37b1f98a3e17e7e36b6691008458aa82020f SHA512 3b2fd5f172da44bbf32be20518ff2802e2ab53a9c75936ce2db00fffc1cd6f3f836e9825515ea0c1c39a2fcb0abda0246f914ce0eabca54da9ac82c06c549f85 WHIRLPOOL ef8c2867ca6f10b2acd2cb99979eda0a5d5999fa9b6dbd88a5d927e6ef0505edd9942023361f7d2792fe8fec96a82e1cbe6e5b8b95965c499ae803253bc89577
+EBUILD splashutils-1.5.4.4-r3.ebuild 7316 SHA256 d2e3e55366781d6fb3d6866123b4e6595a4f3cb64bcb5018630c3efa835df948 SHA512 6b124c0aebeca61da269b451ec44ce546dbfc24e8a2dc9212f9956c1cf77e7b3a227f7192e5b543f978c84c92676b4e968d9266c05a384cad825b397962d8a76 WHIRLPOOL 5cb1153a8886d5f018ccd2394da69a6951b38bddca8317491d34d622ab9661043071a037a60bf2cf78897e691ce439ec67beca67bf34ed8c900336cd1992a38e
 EBUILD splashutils-1.5.4.4.ebuild 7567 SHA256 172e7b2cd261d50976a6678c9858010ca9ff981d6874f054dcc0a9a9a0a15412 SHA512 38a0f7a241131430de834e0d8d7398229b392b3464109f4d4ceca41927affc2683b30bbbc1841fbba6790d208e4198f12c248a86bcc9045b0ddcdc1d9db38b51 WHIRLPOOL 27dff20526cf32e85296d365047b800962b77c3fff83548629689e3351bf3300d07cf450967f193f811a681499a50c2501f30e19d8d6781d1c60d734405443ce
-MISC ChangeLog 36515 SHA256 2a62b0c0920e37c2a8a165861232ad63b80d0975816ee7c58b4c904e073d937e SHA512 3a8436ba48cb82699190c08a296cfd3cf459e5a1c08add89442278df2c01285f2ce9c09f3f2934caad23c9a59c43255dd97b98b52e76002e2b84d1e18f1f0763 WHIRLPOOL 40ace95ef783f6a1e16bdff9f8dca2351c7077a24789e703632043f4446d9daae9f4eaaa7dccdfd3be8bd3a37a6b3a3449170b7b04b6c0d4309b5f9cb034ed02
+MISC ChangeLog 36733 SHA256 319bcbf3e7d638586c18d039e56c91d7fca4bfc1e58ca1c1f49e04e07b8fd7f6 SHA512 f3370c24073acdbde5c20fe68252bd4ae3b8346757b80fe2a8ff48abb1027c9a9cf2275621e67f23e55d7a6d89a618d7ece8c32d3e344feafe31e6363c731459 WHIRLPOOL 0787cb302bf5f18d65c38e318004be7c78341d48b23a58be682b3795003343a8fbfeafa2304d51d8bb8b81aee55ead035f1d28c5ce36cd25d4b5de16a24b6bbd
 MISC metadata.xml 290 SHA256 8cafd30cdb9d1d0db9dbf9780adaec8c687052bc8759d4b61c637c24d6e0bee7 SHA512 f83b143903b051d232f2bebc622e7525c8d740cd9f0b4dfd68e611ab091341776574b4a913859253841f6eb603e5a4456fbb2706bc9996c4499ab08bc480294f WHIRLPOOL 8806c60d15ecfdec99c12efddb9cf3236cb80db1994406fac31ea53ac0e6ceaa25d9983d66cabb6811356f52ceec10264c9024afb6a4cb7835bcabc8ade8d8dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQjVtiAAoJEPqDWhW0r/LCI1cP/RJAioUQ4RzyrWXgdzsXuxyo
-iBcQdRv/IduYk+iue18gKSpVxU/0LaMo/7iVhbilXJUI4+VtaJrSOgu+YJnhX7EE
-rdHD4n/CuduBl/Q8HJtUaGJWVIJDgCZ89W1Um9+sj3SDhNSEkX7HZKH5BuUXLuJZ
-H7AzA3K31bW5Hz7YV2otxl1vfI/H3getFABdhv5PTQC//MSrPX5gyceGW3P/ZJQk
-PE54xaK0aTNb0TZpP3tZ8eRileGbw57pB7GFJt7+/mt9COfhbtYi9MeKm011g2pa
-2S4mPLdyOMwCVUsY5a3E0FOhpW3GSznrRohcz27GNWw7V9x12zL0/UQ3rK/ZdivF
-zj2b65S2EGpBMCP7Wt6hZZ1/gfde4zX7+qJYbc4vmXlft6kVj5aqUevr+lW6uZyn
-KR2W2shZBuLrMWxfB5IKYfeNv3QXytHgiDzd8UeJPbHFWbOsRHqYyY7KvVaVFbg+
-cDHh0+H3khMTenJ8xMqoKaKCmlfmL8m+bG0drh7Dk2J7PGXsKfYHi/iXRcLGjXrK
-OrClL6oZvCp6z4jFF1lmgqKdOol6E71+4eC6tg/kkJc45BlUkit1o+mug6gnnB7L
-nYRm1A+i7u01KXZb+qtSraV3LzDwJ//0VDSsyANOfWTEESGnKfrCHRGR9uv8dRWo
-PZj80lvK5i8fuY9Bzb6C
-=pRi5
+iF4EAREIAAYFAlC4CmEACgkQknrdDGLu8JD89wD+I+eiSQhsil5lsbYk25VgD/nv
+p+IilAsUnWmu19qXZYgA/2W4Zvgirv/pCkALOpMFNgMdw0FDub8ZOURDNG/6hO0D
+=jLp0
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch
new file mode 100644
index 000000000000..13626df802df
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch
@@ -0,0 +1,53 @@
+ core/configure.ac    |    6 ++++++
+ core/src/Makefile.am |    2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/core/configure.ac b/core/configure.ac
+index c5fbb84..ae9e235 100644
+--- a/core/configure.ac
++++ b/core/configure.ac
+@@ -616,6 +616,7 @@ AS_IF(
+ AC_SUBST([PNG_CFLAGS])
+ AC_SUBST([PNG_LIBS])
+ 
++BZ2_LIBS=
+ AS_IF(
+   [test "x${config_ttf}" = "xyes"],
+   [
+@@ -625,8 +626,13 @@ AS_IF(
+       ,
+       [AC_MSG_ERROR([freetype was not found.])]
+     )
++    AC_CHECK_LIB([bz2], [BZ2_bzDecompress],
++      [BZ2_LIBS="${BZ2_LIBS} -lbz2"],
++      [AC_MSG_ERROR(['libbz2' library was not found.])]
++    )
+   ]
+ )
++AC_SUBST([BZ2_LIBS])
+ 
+ AH_TOP([#ifndef __SPLASH_CONFIG_H
+ #define __SPLASH_CONFIG_H])
+diff --git a/core/src/Makefile.am b/core/src/Makefile.am
+index d6ce315..349b5e7 100644
+--- a/core/src/Makefile.am
++++ b/core/src/Makefile.am
+@@ -121,6 +121,9 @@
+ libfbsplashrender_la_LDFLAGS  = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version)
+ libfbsplashrender_la_LIBADD   = libfbsplash.la
+ 
++libfbsplashrender_la_CFLAGS  += $(BZ2_CFLAGS)
++libfbsplashrender_la_LIBADD  += $(BZ2_LIBS)
++
+ libfbsplashrender_la_CFLAGS  += $(JPEG_CFLAGS)
+ libfbsplashrender_la_LIBADD  += $(JPEG_LIBS)
+ 
+@@ -190,7 +193,7 @@
+ fbsplashctl_CFLAGS          = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD
+ fbsplashctl_CPPFLAGS        = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS)
+ fbsplashctl_LDFLAGS         = $(AM_LDFLAGS) -all-static
+-fbsplashctl_LDADD           = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
++fbsplashctl_LDADD           = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) $(BZ2_LIBS)
+ 
+ if CONFIG_FBCON_DECOR
+ fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES)
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild
new file mode 100644
index 000000000000..249b8a6f1358
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2012 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.4-r3.ebuild,v 1.1 2012/11/30 01:22:46 xmw Exp $
+
+EAPI=4
+
+inherit autotools eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.17"
+V_JPEG="8a"
+V_PNG="1.4.3"
+V_ZLIB="1.2.3"
+V_FT="2.3.12"
+
+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[static-libs(+)] )
+	truetype? (
+		>=media-libs/freetype-2[static-libs]
+		app-arch/bzip2[static-libs(+)]
+		sys-libs/zlib[static-libs(+)]
+	)
+	png? ( >=media-libs/libpng-1.4.3[static-libs] )
+	mng? (
+		media-libs/lcms:0[static-libs]
+		media-libs/libmng[static-libs(+)]
+	)
+	virtual/jpeg[static-libs]
+	>=sys-apps/baselayout-1.9.4-r5
+	app-arch/cpio
+	media-gfx/fbgrab
+	!sys-apps/lcdsplash"
+DEPEND="${RDEPEND}
+	>=dev-libs/klibc-1.5
+	virtual/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_prepare() {
+	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 "${SG}"
+	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
+
+	if use truetype ; then
+		cd "${SM}"
+		epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
+	fi
+
+	cd "${S}"
+	ln -sf "${S}/src" "${WORKDIR}/core"
+
+	epatch "${FILESDIR}/${P}-r3-bzip2.patch"
+
+	if ! tc-is-cross-compiler && \
+	   has_version "sys-devel/gcc:$(gcc-version)[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
+
+	# Latest version of klibc defined its own version of ferror, so there is
+	# not need for the hack in klibc_compat.h
+	if has_version ">=dev-libs/klibc-1.5.20"; then
+		echo > "libs/klibc_compat.h"
+	fi
+
+	rm -f m4/*
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${SM}"
+	emake CC="${CC}" LIB=$(get_libdir) STRIP=true
+
+	cd "${S}"
+	econf \
+		$(use_with png) \
+		$(use_with mng) \
+		$(use_with gpm) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttf-kernel) \
+		$(use_enable fbcondecor) \
+		--docdir=/usr/share/doc/${PF} \
+		--with-freetype2-src=${FT2SRC} \
+		--with-jpeg-src=${JPEGSRC} \
+		--with-lpng-src=${LPNGSRC} \
+		--with-zlib-src=${ZLIBSRC} \
+		--with-essential-libdir=/$(get_libdir)
+}
+
+src_compile() {
+	emake CC="${CC}" STRIP="true"
+
+	if has_version ">=sys-apps/baselayout-1.13.99"; then
+		cd "${SG}"
+		emake LIB=$(get_libdir)
+	fi
+}
+
+src_install() {
+	local LIB=$(get_libdir)
+
+	cd "${SM}"
+	make DESTDIR="${D}" LIB=${LIB} install
+
+	cd "${S}"
+	make DESTDIR="${D}" STRIP="true" install
+
+	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
+	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,sys}
+	dosym /${LIB}/splash/bin/fbres /sbin/fbres
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
+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 [[ $previous_less_than_1_0 = 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 [[ $previous_less_than_1_5_3 = 0 ]] && ! 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=tty1|CONSOLE=/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."
+}