Version bump.

Package-Manager: portage-2.1.2.6

4 files changed, 252 insertions, 8 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 394281a5ee34..db152b33c0b7 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.88 2007/04/30 22:45:13 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.89 2007/05/06 22:17:42 spock Exp $
+
+*splashutils-1.4.2 (06 May 2007)
+
+  06 May 2007; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.4.2.ebuild:
+  Version bump.
 
   30 Apr 2007; Marius Mauch <genone@gentoo.org>
   splashutils-1.1.9.10-r1.ebuild, splashutils-1.3.1.ebuild,
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index c0f7a68a0c78..16ceea649937 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -50,12 +50,15 @@ DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 S
 DIST libpng-1.2.8.tar.bz2 384970 RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c SHA1 b6d73493eea4095166118b298efecb54a8e3d2f5 SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
 DIST miscsplashutils-0.1.3.tar.bz2 91825 RMD160 47516ec50225ef18fd42e36d58e90e57bfc0dbac SHA1 844da6370e2a15da842bed109cc2574318bc25a0 SHA256 16fcb4d199e071a822d744bbd9238609a2175d512fc1c019018c05501cb23bdb
 DIST miscsplashutils-0.1.5.tar.bz2 91898 RMD160 1930081408fd6bad6f60db883127f22ff727f83e SHA1 ac35d4a09c3d84f0fd704c0296c1ee13172036a0 SHA256 906163c75d487a00ba7d6b287e20e4ce195febcd4fdb8592d53827c2f8a28142
+DIST miscsplashutils-0.1.6.tar.bz2 91945 RMD160 4d415db9cf1dd90bf4ceaae930033cf65e93b908 SHA1 dd7a1766be0b604b35ffadd0a9f7d9cd18b68632 SHA256 fd08a56ba801fb6e55e90558f66cb839ac10a361a2a7ae2ab711d8a77f124332
 DIST splashutils-gentoo-0.1.14.tar.bz2 7750 RMD160 680efa24119dcf699f37a9f295e3f81faebbdc18 SHA1 55285679ca778c82a5e8363526901689dc7b6cba SHA256 2515416c98bcf8e4e0d217cafc74b507295cb03d915d78b224683577159ae9dc
 DIST splashutils-gentoo-0.5.4.tar.bz2 6631 RMD160 dde17340439121f6d2da021c2f8ac84d35411645 SHA1 9e24af43ac491ea8c1f715d447950a455c031f70 SHA256 401cbc912d26be430b827203d6a94c2bab5aa0b6eead2010c0397f52643e6f74
 DIST splashutils-gentoo-1.0.1.tar.bz2 14498 RMD160 cd5f1cc1f04b4fe2e118decd50eae6526f37fc3b SHA1 e4325961cc0246ac229cb1fff005d8f4ed482cf3 SHA256 61928247d43e4d7ba47f472003af847fec8ec2a62609089361f7c5424ba93e66
+DIST splashutils-gentoo-1.0.2.tar.bz2 14703 RMD160 697e3b3970bf3f38f346e781fc23ad21735219dd SHA1 fda89cc3e27c1d4c348581a596d055f0d7206e5c SHA256 6705146d56a9fc9206bbf6da7d69aaefcdaed29c0771feed495a07534a4cbd00
 DIST splashutils-lite-1.1.9.10.tar.bz2 55094 RMD160 274cfc9a79b69091b0feba8f6d64e3eb965dfb9a SHA1 c4bc383f40bd4f3cf45bd251fa133b59c6bd1d49 SHA256 de38e284103ed569360caf5d555d784309afea7625bad7acd689399d26c3955c
 DIST splashutils-lite-1.3.1.tar.bz2 61506 RMD160 14f47119523c5eca24482429c37d393e32562c3c SHA1 5a98b452009a0366ac006a1fcd1662855a181af7 SHA256 45ab13d25ff941e9920ec2f941bc450794b869658fdcee13d72595708d569e39
 DIST splashutils-lite-1.4.1.tar.bz2 67038 RMD160 5dafedd1815bccd3584a7e0bbb83ec0cd383fab8 SHA1 e6fec8acd7f4801b23a49ef64ac678d62f1d05c4 SHA256 40bda12d7ac89c5e661840e5cab8c7fa33549cf95199a9d0f5d8ac989a1ec834
+DIST splashutils-lite-1.4.2.tar.bz2 67282 RMD160 fcd3f2abe265fc2036de07418b5b8e2b3355e8b1 SHA1 630b378c6a84995ea40b6beb50b6926e6d3252cb SHA256 0468617b3264baca4a78466c9fa080a8688c705d3f8104246c8e8f006139023c
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.1.9.10-r1.ebuild 6886 RMD160 0cd0fbd5b6edafafe0cc29be8d7962cc8c492031 SHA1 98cead168723f1175068f00f42360c65ba4168ab SHA256 b3575ca28d8849a1b5ab3549338156b6d9ee00a2aacbbe3934f2db206adea864
 MD5 c4c6a5d73e814e9d0e53ea48b4f6a62b splashutils-1.1.9.10-r1.ebuild 6886
@@ -69,10 +72,14 @@ EBUILD splashutils-1.4.1.ebuild 6753 RMD160 b1f000d37cf7b9b1fa66782a3510b50f460c
 MD5 8a855b615165c86441a5873d3417d9c8 splashutils-1.4.1.ebuild 6753
 RMD160 b1f000d37cf7b9b1fa66782a3510b50f460c8e88 splashutils-1.4.1.ebuild 6753
 SHA256 b982bc5541f94aadd1909bde649d23ecd96fa745679a822208dfbd6615167188 splashutils-1.4.1.ebuild 6753
-MISC ChangeLog 17822 RMD160 f4e5ddaf51ec74b5aa111e70b4bebc3f311dfc3c SHA1 4586d3b53d7cbf6cc8ce03e92b23ceaba3dcb600 SHA256 d9e8955a0588c87d84c93002b0713e8b22fb6cdce3c6b4c661772a44fc657815
-MD5 2fb2f6ba73bc47e1ad3342239c4bf715 ChangeLog 17822
-RMD160 f4e5ddaf51ec74b5aa111e70b4bebc3f311dfc3c ChangeLog 17822
-SHA256 d9e8955a0588c87d84c93002b0713e8b22fb6cdce3c6b4c661772a44fc657815 ChangeLog 17822
+EBUILD splashutils-1.4.2.ebuild 6696 RMD160 77798575405fb66345bcde6ba577d60ac223d292 SHA1 e6748152fc3c722478cc01c048a6e0d5eea02f4b SHA256 74dce78dd6c28a6ec732ded202ca9ab35e125f4146bf710dcddbc623074b1094
+MD5 e28eff083e20c80cc03234d510245926 splashutils-1.4.2.ebuild 6696
+RMD160 77798575405fb66345bcde6ba577d60ac223d292 splashutils-1.4.2.ebuild 6696
+SHA256 74dce78dd6c28a6ec732ded202ca9ab35e125f4146bf710dcddbc623074b1094 splashutils-1.4.2.ebuild 6696
+MISC ChangeLog 17955 RMD160 d7f3e47f54a5d74b02bb00d28e81bd9e4d55ea5c SHA1 b497d9dfbd39ebacc64ecb2b6129ceb299b156ee SHA256 7e2759065af31070ee6f3a5258acef05596bf7db1cac3cea808a8c0b7104d52e
+MD5 26db9e3bd1a6bf7c69d5c0c07f30daf6 ChangeLog 17955
+RMD160 d7f3e47f54a5d74b02bb00d28e81bd9e4d55ea5c ChangeLog 17955
+SHA256 7e2759065af31070ee6f3a5258acef05596bf7db1cac3cea808a8c0b7104d52e ChangeLog 17955
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -86,10 +93,13 @@ SHA256 20dc274189e8c25ee3bf459573da4a263e9ada3eedbe816283c53c28f200e0c7 files/di
 MD5 31bff022b8f40e48a067c261c94af062 files/digest-splashutils-1.4.1 1765
 RMD160 123d6142c06368c26e75288060be80dc822063d5 files/digest-splashutils-1.4.1 1765
 SHA256 3bb29d22480ef58fa2008c08841b09b89d235eaa9905b5d068e0f530080c0db5 files/digest-splashutils-1.4.1 1765
+MD5 b65e977caceefe1adb7bc923f6caf11a files/digest-splashutils-1.4.2 1765
+RMD160 c22b71d9966b63c8005a1fa2a73526ef7b236363 files/digest-splashutils-1.4.2 1765
+SHA256 52f060e45eb1d3c37758360c39958a020af17fe0b4b176d52d4c7223c0f3132e files/digest-splashutils-1.4.2 1765
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGNnHB6J2i8a8J4okRAnj1AJ44V+kFYPzrU/Rt3tZDCXZ5fLjY6QCghJMm
-SISuxPXsGHFbS0MGIaOGzb0=
-=5Ya+
+iD8DBQFGPlQSchej4aZK9/cRAtOzAJ9BGfN7cr5BDGYT0pXwEoyQyiHMYwCdGk6H
+MT4aC6hoZMDoPVWAen7YcVE=
+=dQm6
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.4.2 b/media-gfx/splashutils/files/digest-splashutils-1.4.2
new file mode 100644
index 000000000000..b27d95d49171
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.4.2
@@ -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 6b5a6fc8b943d1d43e367a3560ccbde2 miscsplashutils-0.1.6.tar.bz2 91945
+RMD160 4d415db9cf1dd90bf4ceaae930033cf65e93b908 miscsplashutils-0.1.6.tar.bz2 91945
+SHA256 fd08a56ba801fb6e55e90558f66cb839ac10a361a2a7ae2ab711d8a77f124332 miscsplashutils-0.1.6.tar.bz2 91945
+MD5 2c88bdc14860f25b1f510c84e2f26fee splashutils-gentoo-1.0.2.tar.bz2 14703
+RMD160 697e3b3970bf3f38f346e781fc23ad21735219dd splashutils-gentoo-1.0.2.tar.bz2 14703
+SHA256 6705146d56a9fc9206bbf6da7d69aaefcdaed29c0771feed495a07534a4cbd00 splashutils-gentoo-1.0.2.tar.bz2 14703
+MD5 ce388743d3352bbbbc5ef069979db579 splashutils-lite-1.4.2.tar.bz2 67282
+RMD160 fcd3f2abe265fc2036de07418b5b8e2b3355e8b1 splashutils-lite-1.4.2.tar.bz2 67282
+SHA256 0468617b3264baca4a78466c9fa080a8688c705d3f8104246c8e8f006139023c splashutils-lite-1.4.2.tar.bz2 67282
+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.ebuild b/media-gfx/splashutils/splashutils-1.4.2.ebuild
new file mode 100644
index 000000000000..0f16790b8451
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.4.2.ebuild
@@ -0,0 +1,207 @@
+# 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.ebuild,v 1.1 2007/05/06 22:17:42 spock Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.6"
+GENTOOSPLASH="splashutils-gentoo-1.0.2"
+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="~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.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) || 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) CFLAGS="${CFLAGS}" \
+		|| 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
+}