Version bump (bugfix release).

Package-Manager: portage-2.1.3.7

4 files changed, 259 insertions, 8 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index bb224faf6503..3a129045dad1 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.105 2007/08/19 21:22:30 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.106 2007/08/26 19:37:07 spock Exp $
+
+*splashutils-1.5.1 (26 Aug 2007)
+
+  26 Aug 2007; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.5.1.ebuild:
+  Version bump (bugfix release).
 
   19 Aug 2007; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.5-baselayout-1.patch, splashutils-1.5.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 6c6d4a196ec3..17ae9fb48cc6 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -39,10 +39,12 @@ DIST splashutils-gentoo-1.0.2.tar.bz2 14703 RMD160 697e3b3970bf3f38f346e781fc23a
 DIST splashutils-gentoo-1.0.3.tar.bz2 14962 RMD160 b08698b26b4f4edef2a46d2763e9d1a5df6c44b0 SHA1 3860cfe8a2fadef34e5f79a20829098ad76da23c SHA256 ff65cda5ca4df747efe9724cfab3dd8425ed471e43d7e4f4e01ad66ab666c33f
 DIST splashutils-gentoo-1.0.4.tar.bz2 15212 RMD160 178a3c370ebbf12755bfaa78d42e6ca7b189e8bb SHA1 b3775cd35fba0f8b2094afac753501923ce9cda9 SHA256 594a468009d5fc45c2e7b94dab9746ed134939d083017017c99af8cb947039ca
 DIST splashutils-gentoo-1.0.5.tar.bz2 15642 RMD160 897c8b4f89288ba9a7c900db25ff1ce724cd4834 SHA1 0da0c734795e9c4ef297eef19053b9c309b383f7 SHA256 73fed0336ebf42a27f997643ecdc772bd539e4775cb193921a0dfecbf948493b
+DIST splashutils-gentoo-1.0.6.tar.bz2 15661 RMD160 4c75b4a619cf01c5dbef628d6cedd192c4632991 SHA1 30e45303fe0bcbe55423e243ef4c903920413699 SHA256 2b672d09a524a2c5cfec1ed6c9e3e86e7e4bef15e724b36f7bd8530f00db091a
 DIST splashutils-lite-1.4.1.tar.bz2 67038 RMD160 5dafedd1815bccd3584a7e0bbb83ec0cd383fab8 SHA1 e6fec8acd7f4801b23a49ef64ac678d62f1d05c4 SHA256 40bda12d7ac89c5e661840e5cab8c7fa33549cf95199a9d0f5d8ac989a1ec834
 DIST splashutils-lite-1.4.2.1.tar.bz2 67312 RMD160 a1c97cf1e5739f798ba49d978dcb583ca8229fdf SHA1 24ee316a6f1ab76e6c12280335e8cbabf0d9815c SHA256 6469049067a292f5bd5293b41227b1ca16803ec988d01704d9445a3abd4dbaa6
 DIST splashutils-lite-1.4.2.tar.bz2 67282 RMD160 fcd3f2abe265fc2036de07418b5b8e2b3355e8b1 SHA1 630b378c6a84995ea40b6beb50b6926e6d3252cb SHA256 0468617b3264baca4a78466c9fa080a8688c705d3f8104246c8e8f006139023c
 DIST splashutils-lite-1.4.3.tar.bz2 67879 RMD160 2a2f2fa2d74eb39b5c1cfa48d5ee2cb5491dc779 SHA1 4df983e8cc1c1de1d9aeff55cf47293a267046cf SHA256 5a93b640bc10cfda49e809f215d43111410dd0f4c57b1e4f105e4e35a34c5712
+DIST splashutils-lite-1.5.1.tar.bz2 86599 RMD160 cb3c13b671d8f7e8db36905b7ba9c27e6de77220 SHA1 36a3e7f631944879a5840b28ce066aca1d25da40 SHA256 ed4afb216d44e154e071775f33e7ff77bb2d1e38f6155d1618e496b195682e7d
 DIST splashutils-lite-1.5.tar.bz2 86201 RMD160 64bfeb5bd2fbadee23ee820647ceb79e37e39e56 SHA1 286f40f40448879d2f845399fcb5d8dd995d9e61 SHA256 db62059a7bc197127e08e2044fc149f117183abae2a5fad700b958431f3500d3
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.4.1.ebuild 6741 RMD160 ad101372da917925abd5c6ef4f53f11c772bd8ac SHA1 03b0e1596d38fdbbef4a8dd48c1c2ceb0a481276 SHA256 c8ea1264f4072957787a8a735b0acbe277d405f4e50eeac2d96b844d72570f55
@@ -61,14 +63,18 @@ EBUILD splashutils-1.4.3.ebuild 6676 RMD160 ea3c5ec87444dffddef9559818e999ba6137
 MD5 153527a3ea76997fa2d80bc5863264c4 splashutils-1.4.3.ebuild 6676
 RMD160 ea3c5ec87444dffddef9559818e999ba61371b7e splashutils-1.4.3.ebuild 6676
 SHA256 a22fa0d10e67329189b7b6c8ddf5bf2f7340db1e61f57068fc701d36539b731c splashutils-1.4.3.ebuild 6676
+EBUILD splashutils-1.5.1.ebuild 7238 RMD160 565f0f54c8d2ebdffb499090d9887c3b8fcb750b SHA1 2b6ae95e00775445bb8b4ac84fd5c2cdf2e390c9 SHA256 0067991de26c29980cc02b7d05ee936c02dcb24c27a3487d9b8213c0f7df1065
+MD5 8937defed1b571a7d790e3c09b0b7950 splashutils-1.5.1.ebuild 7238
+RMD160 565f0f54c8d2ebdffb499090d9887c3b8fcb750b splashutils-1.5.1.ebuild 7238
+SHA256 0067991de26c29980cc02b7d05ee936c02dcb24c27a3487d9b8213c0f7df1065 splashutils-1.5.1.ebuild 7238
 EBUILD splashutils-1.5.ebuild 7331 RMD160 831ca090533f85118e925dc0056e3d66fe48dec2 SHA1 5a5fff0b9998d2e90dc5600fce73e6b1e29f5617 SHA256 9116de71a12f06bc0e1e13abae6d9f4c77872a9c8886be4ba0f84dbacb97411d
 MD5 ccdbd2c2444e1735cccb5897446b0e9d splashutils-1.5.ebuild 7331
 RMD160 831ca090533f85118e925dc0056e3d66fe48dec2 splashutils-1.5.ebuild 7331
 SHA256 9116de71a12f06bc0e1e13abae6d9f4c77872a9c8886be4ba0f84dbacb97411d splashutils-1.5.ebuild 7331
-MISC ChangeLog 20777 RMD160 6c946760a195fd48ef961961190f3255d015b6dd SHA1 6236e17423929c6158fe298cc0a17ec78b28fd75 SHA256 2a95dd6c04b67b0d506cc1adfa479f91b39f7e6907180ce3f9410f815251cee0
-MD5 5c700a36c41d536bfa296f5481bf4df5 ChangeLog 20777
-RMD160 6c946760a195fd48ef961961190f3255d015b6dd ChangeLog 20777
-SHA256 2a95dd6c04b67b0d506cc1adfa479f91b39f7e6907180ce3f9410f815251cee0 ChangeLog 20777
+MISC ChangeLog 20928 RMD160 c4c59bae9c918d0a75e5389e62f1a14f94fdad6f SHA1 74058877b9c17a9f5df2750861296e639809664e SHA256 e1cc026d48aee0443fd82356c0e213f002e0ca02434f6e5562f5e6256186e114
+MD5 102f4ecaf6439b1c8e035d87139ce29a ChangeLog 20928
+RMD160 c4c59bae9c918d0a75e5389e62f1a14f94fdad6f ChangeLog 20928
+SHA256 e1cc026d48aee0443fd82356c0e213f002e0ca02434f6e5562f5e6256186e114 ChangeLog 20928
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -88,10 +94,13 @@ SHA256 864735da810f8d44fff3fcd117a27002c0a61cfb3b61373ad9087530507d3ebd files/di
 MD5 50f989f5efc645aa9661401389b099b5 files/digest-splashutils-1.5 1765
 RMD160 36524be28fdef67a1056c3404596c309865203d2 files/digest-splashutils-1.5 1765
 SHA256 f4805d6e2225fe90fcfcb13e8c5baf06d8cc9421bb69e6c65f3729245d465cfd files/digest-splashutils-1.5 1765
+MD5 3ecb03fb0b0510ad6d71eedfa449adaf files/digest-splashutils-1.5.1 1771
+RMD160 3b7c1b6db0754fd2ceacebed9c5b3931b6b4b50e files/digest-splashutils-1.5.1 1771
+SHA256 6341a8885fb0e021684ab8dbf6c6d7fe126ca4c36be1ef9669eb9cc5ce375d5f files/digest-splashutils-1.5.1 1771
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGyLSdchej4aZK9/cRAnIUAJ4z/cQKYhQ1QD4cKagbzTvxL5tScQCfaL6J
-ul494KrIz8Uh9XioEz1Eg7I=
-=vKDV
+iD8DBQFG0dZochej4aZK9/cRAqeaAJ4pElnd4TfLgpSgupphpLv7Q16SJACeN6cl
+LMNt3+921gw0s1MParr6Tmc=
+=7uiz
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.5.1 b/media-gfx/splashutils/files/digest-splashutils-1.5.1
new file mode 100644
index 000000000000..d5ec9eaffb56
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.5.1
@@ -0,0 +1,21 @@
+MD5 65234327c5ac46ee00ebda15995d4c1c freetype-2.3.5.tar.bz2 1279861
+RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 freetype-2.3.5.tar.bz2 1279861
+SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e freetype-2.3.5.tar.bz2 1279861
+MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
+RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 jpegsrc.v6b.tar.gz 613261
+SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d jpegsrc.v6b.tar.gz 613261
+MD5 25a7f2f101eaaf2eb18c4987e0fbe39d libpng-1.2.18.tar.bz2 623690
+RMD160 ea81056a896eb038fa5d7fde2b7fa626c1a2e31e libpng-1.2.18.tar.bz2 623690
+SHA256 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62 libpng-1.2.18.tar.bz2 623690
+MD5 0a9505c5c5ed169e6158d2c1b06ff40b miscsplashutils-0.1.8.tar.bz2 91997
+RMD160 5efe2bfb8ae409d3e59e82b473454d94e44149ab miscsplashutils-0.1.8.tar.bz2 91997
+SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336 miscsplashutils-0.1.8.tar.bz2 91997
+MD5 2c5242a385ac3ee32fb0dac846ef37cb splashutils-gentoo-1.0.6.tar.bz2 15661
+RMD160 4c75b4a619cf01c5dbef628d6cedd192c4632991 splashutils-gentoo-1.0.6.tar.bz2 15661
+SHA256 2b672d09a524a2c5cfec1ed6c9e3e86e7e4bef15e724b36f7bd8530f00db091a splashutils-gentoo-1.0.6.tar.bz2 15661
+MD5 4a9b0e73e004f97bd07baf0cb80139a1 splashutils-lite-1.5.1.tar.bz2 86599
+RMD160 cb3c13b671d8f7e8db36905b7ba9c27e6de77220 splashutils-lite-1.5.1.tar.bz2 86599
+SHA256 ed4afb216d44e154e071775f33e7ff77bb2d1e38f6155d1618e496b195682e7d splashutils-lite-1.5.1.tar.bz2 86599
+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.5.1.ebuild b/media-gfx/splashutils/splashutils-1.5.1.ebuild
new file mode 100644
index 000000000000..e2d1eecb3f1f
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.1.ebuild
@@ -0,0 +1,215 @@
+# 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.5.1.ebuild,v 1.1 2007/08/26 19:37:07 spock Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.6"
+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"
+
+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/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}
+
+	[ ! -d ${S}/libs ] && mkdir ${S}/libs
+	[ ! -d ${S}/objs ] && mkdir ${S}/objs
+	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 fbcondecor.
+	if [[ ! -e /usr/$(get_libdir)/klibc/include/linux/console_splash.h && \
+		  ! -e /usr/$(get_libdir)/klibc/include/linux/console_decor.h ]]; then
+		ewarn "The kernel tree against which dev-libs/klibc was built was not patched"
+		ewarn "with a compatible version of fbcondecor. Splashutils will be compiled"
+		ewarn "without fbcondecor support (i.e. verbose mode will not work)."
+	fi
+
+	if has_version sys-libs/glibc && ! built_with_use --missing true 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
+
+	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 && \
+		  ! -e /usr/$(get_libdir)/klibc/include/linux/console_decor.h ]]; then
+		myconf="--without-fbcondecor"
+	else
+		myconf="--with-fbcondecor"
+	fi
+
+	cd ${SM}
+	emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
+
+	cd ${S}
+	./configure \
+		--with-libdir="/$(get_libdir)" \
+		$(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 || 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
+
+	mv ${D}/usr/${LIB}/libfbsplash.so* ${D}/${LIB}/
+	gen_usr_ldscript libfbsplash.so
+
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
+	doenvd 99splash
+
+	newinitd ${SG}/init-fbcondecor fbcondecor
+	newconfd ${SG}/splash.conf splash
+	newconfd ${SG}/fbcondecor.conf fbcondecor
+
+	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
+		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 ! 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."
+}