Version bump.

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 245 insertions, 8 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index f41861f46de4..a189f4a4f098 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.57 2006/07/12 10:17:24 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.58 2006/07/15 00:10:37 spock Exp $
+
+*splashutils-1.3 (15 Jul 2006)
+
+  15 Jul 2006; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.3.ebuild:
+  Version bump.
 
   12 Jul 2006; Michał Januszewski <spock@gentoo.org>
   splashutils-1.1.9.8-r1.ebuild, splashutils-1.1.9.10-r1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index e51c786a4a1d..387c3f99c3d7 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -18,10 +18,13 @@ DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 S
 DIST klibc-1.0.8.tar.bz2 446138 RMD160 006511b5178fc32cebd801ee399cc792b545418c SHA1 74d51df90912e5997adb17e7169222d358dbc837 SHA256 3d39bb503e2fc0ac9782edd235e06015bd4f14fe8bd4318042b208f3a9ce529a
 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.4.tar.bz2 93298 RMD160 4916038efc966219cc7780c6d53a4f937e4c9c83 SHA1 f074fc989cf13d2a7297d4b4218133099097a49d SHA256 51a39795eadd8bf5f0dcd75bf8f041cda71a02cabe399831a5b739efe024843f
 DIST splashutils-gentoo-0.1.12.tar.bz2 7563 RMD160 5c8518b24bc1bbfaea9bf81f1b71eb7745eb8684 SHA1 8fd8f770d359c0d094f4b3e2cb535f35a37d2b5d SHA256 9118fb36f2352bf65ba69d4b9eebe916b25be028c0b7b1878d5d23cb675cd3e3
 DIST splashutils-gentoo-0.1.14.tar.bz2 7750 RMD160 680efa24119dcf699f37a9f295e3f81faebbdc18 SHA1 55285679ca778c82a5e8363526901689dc7b6cba SHA256 2515416c98bcf8e4e0d217cafc74b507295cb03d915d78b224683577159ae9dc
+DIST splashutils-gentoo-0.5.0.tar.bz2 7461 RMD160 47c599b5f144255c767c6befc87b64fab93a13b8 SHA1 5d83a0653c2b51001ca837a0d78fad6b38545563 SHA256 9c6c3275f9eb0edc232a0d178734f3f812a19d4566baaf9ed38a7506aa0968fe
 DIST splashutils-lite-1.1.9.10.tar.bz2 55094 RMD160 274cfc9a79b69091b0feba8f6d64e3eb965dfb9a SHA1 c4bc383f40bd4f3cf45bd251fa133b59c6bd1d49 SHA256 de38e284103ed569360caf5d555d784309afea7625bad7acd689399d26c3955c
 DIST splashutils-lite-1.1.9.8.tar.bz2 55013 RMD160 377396b94562f4cde5e298170f762bb6518545ef SHA1 7d90c9b56d4d54083d21b618811eb225d456df0c SHA256 4f7ce63a2ec11884b4d624c334a93ddd5806f8b0acd5f80fc1e9edf369384f54
+DIST splashutils-lite-1.3.tar.bz2 61079 RMD160 4d5296ed0b2a7a7783cfe5f9f25b53fa56307bc7 SHA1 22349164fc0512a698ae2f387bfd7845d3f8063e SHA256 4f94e91ee81acea4d6ef8d481b32cf15cd7987030e048e0e249eec995ef8a5d0
 DIST zlib-1.2.1.tar.bz2 284152 RMD160 aca88eb02d90b91c732f351e1b7efd4ce409ee25 SHA1 13bd164df955911c25342adfad805c1cad5e398e SHA256 9ea4bd04487e05254d05cebde539b3855af2899658e2da84487e86f7f400e0e1
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.1.9.10-r1.ebuild 6815 RMD160 f3476acc67ca6abb545f20d765d831b89e5250a8 SHA1 15f41ff735bb5f81e02b667bad090edeb54e0b2e SHA256 8c5c5634e46ff57177139c40223e373f23d4947afc6798c84995feb731696658
@@ -32,10 +35,14 @@ EBUILD splashutils-1.1.9.8-r1.ebuild 6450 RMD160 ee8219564a3b039de20831eb52cb44d
 MD5 e79713db9ac0cc2a97fcabab4fe83275 splashutils-1.1.9.8-r1.ebuild 6450
 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 splashutils-1.1.9.8-r1.ebuild 6450
 SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b splashutils-1.1.9.8-r1.ebuild 6450
-MISC ChangeLog 12458 RMD160 002d8cf682e1c16e471d9f86c4b403e492ba7433 SHA1 e5f9101666b7533622f5bac74c909e5b35b7eb9c SHA256 21bf0005045a0ae8bb4f2b98df28a0d187461df4d612240c1895776df3b4a3b6
-MD5 7ddd61fdf8a0d1f9149b6c83d4aac8ea ChangeLog 12458
-RMD160 002d8cf682e1c16e471d9f86c4b403e492ba7433 ChangeLog 12458
-SHA256 21bf0005045a0ae8bb4f2b98df28a0d187461df4d612240c1895776df3b4a3b6 ChangeLog 12458
+EBUILD splashutils-1.3.ebuild 6232 RMD160 2bb897ce8ca07660cc675e35f6cf0ecde88d367a SHA1 9ca8459dc324a9f7b2eb1b68b62b74fe1f74327a SHA256 fb5fe33548cb34c6d7add5c797b63c9ace91232191c46b53d6968f3fbe3a4035
+MD5 076fabc86beb7f0810de0054afa509ef splashutils-1.3.ebuild 6232
+RMD160 2bb897ce8ca07660cc675e35f6cf0ecde88d367a splashutils-1.3.ebuild 6232
+SHA256 fb5fe33548cb34c6d7add5c797b63c9ace91232191c46b53d6968f3fbe3a4035 splashutils-1.3.ebuild 6232
+MISC ChangeLog 12588 RMD160 07304f7baba159d49ab5a6d09acb160f0d80bed3 SHA1 effe810c9726ec489326dce509f36175bedc870c SHA256 ed1ebaeb0333fc18bcb9fc1e0afa98fa63a9769a4a73d306c8ae5f407cefbfd3
+MD5 d5f2ab0b950585e98ec9f81aaa9e1fbb ChangeLog 12588
+RMD160 07304f7baba159d49ab5a6d09acb160f0d80bed3 ChangeLog 12588
+SHA256 ed1ebaeb0333fc18bcb9fc1e0afa98fa63a9769a4a73d306c8ae5f407cefbfd3 ChangeLog 12588
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -46,10 +53,13 @@ SHA256 ae313288aa756133eb20f3c3f738003bcdf7176636cabd47918916dae8fbd036 files/di
 MD5 f94a2c7d921f0fb8a93e7870384730a7 files/digest-splashutils-1.1.9.8-r1 2009
 RMD160 98e1467215be8e850a1164aa7d86833e67680991 files/digest-splashutils-1.1.9.8-r1 2009
 SHA256 791d499355b791860bab3f2fc5b30e3a946536395d503bfa7bc4af4ddf2b19f7 files/digest-splashutils-1.1.9.8-r1 2009
+MD5 c6147d044c2f7815a3b45795cbd2db24 files/digest-splashutils-1.3 1756
+RMD160 3d46c82bd1b741b80c85c7a9e5f2234447c38ac2 files/digest-splashutils-1.3 1756
+SHA256 29735f36d5e48f1c66ec4c5afcf4fd36423cd7b13c7895a0938348665a052c94 files/digest-splashutils-1.3 1756
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEtMxGchej4aZK9/cRArWoAJ0U8178MzTxbuH0hq/ye2qCVwQpPwCfb+01
-/5XUdG5Y5G/MptuKJA0kcRA=
-=03Di
+iD8DBQFEuDKNchej4aZK9/cRAipfAJ9CX6tats3PpYg8aSi2pYOe2/GjyQCbBQlu
+tO5OoKeiAEiHM4uJHdzMybw=
+=Auc2
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.3 b/media-gfx/splashutils/files/digest-splashutils-1.3
new file mode 100644
index 000000000000..9a3af396e592
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.3
@@ -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 bece4af3463d38a0e0c9f8fd5d6e2c03 miscsplashutils-0.1.4.tar.bz2 93298
+RMD160 4916038efc966219cc7780c6d53a4f937e4c9c83 miscsplashutils-0.1.4.tar.bz2 93298
+SHA256 51a39795eadd8bf5f0dcd75bf8f041cda71a02cabe399831a5b739efe024843f miscsplashutils-0.1.4.tar.bz2 93298
+MD5 45823956f790dd4d236b02f370b72e62 splashutils-gentoo-0.5.0.tar.bz2 7461
+RMD160 47c599b5f144255c767c6befc87b64fab93a13b8 splashutils-gentoo-0.5.0.tar.bz2 7461
+SHA256 9c6c3275f9eb0edc232a0d178734f3f812a19d4566baaf9ed38a7506aa0968fe splashutils-gentoo-0.5.0.tar.bz2 7461
+MD5 4ccfe3fcfba17e44c19df6d8b6a4a2e6 splashutils-lite-1.3.tar.bz2 61079
+RMD160 4d5296ed0b2a7a7783cfe5f9f25b53fa56307bc7 splashutils-lite-1.3.tar.bz2 61079
+SHA256 4f94e91ee81acea4d6ef8d481b32cf15cd7987030e048e0e249eec995ef8a5d0 splashutils-lite-1.3.tar.bz2 61079
+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.3.ebuild b/media-gfx/splashutils/splashutils-1.3.ebuild
new file mode 100644
index 000000000000..8bf6ba275fb7
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3.ebuild,v 1.1 2006/07/15 00:10:37 spock Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.4"
+GENTOOSPLASH="splashutils-gentoo-0.5.0"
+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"
+
+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 )
+	>=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.0.14-r1"
+
+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}
+
+	# Check whether the kernel tree has been patched with fbsplash.
+	if [[ ! -e ${ROOT}/usr/lib/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 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
+}
+
+src_compile() {
+	local myconf=""
+	if [[ ! -e ${ROOT}/usr/lib/klibc/include/linux/console_splash.h ]]; then
+		myconf="--without-fbsplash"
+	else
+		myconf="--with-fbsplash"
+	fi
+
+	sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile
+	cd ${SM}
+	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
+	cd ${S}
+
+	./configure \
+		$(use_with png) \
+		$(use_with mng) \
+		$(use_with truetype ttf) \
+		$(use_with truetype ttfkern) \
+		${myconf} || die "failed to configure splashutils"
+
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
+	emake -j1 LIB=$(get_libdir) ARCH=$(tc-arch-kernel) || die "failed to build splashutils"
+}
+
+src_install() {
+	cd ${SM}
+	make DESTDIR=${D} install || die
+
+	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
+	cd ${S}
+	make DESTDIR=${D} install || die
+
+	keepdir /lib/splash/{tmp,cache,bin}
+	dosym /lib/splash/bin/fbres /sbin/fbres
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > ${D}/etc/env.d/99splash
+
+	exeinto /sbin
+	doexe ${SG}/splash
+
+	exeinto /etc/init.d
+	newexe ${SG}/init-splash splash
+
+	insinto /usr/share/${PN}
+	doins ${SG}/initrd.splash
+
+	insinto /sbin
+	doins ${SG}/splash-functions.sh
+
+	insinto /etc/conf.d
+	newins ${SG}/splash.conf splash
+
+	insinto /etc/splash
+	doins ${SM}/fbtruetype/luxisri.ttf
+
+	dodoc docs/* README AUTHORS
+}
+
+pkg_postinst() {
+	ebegin "Checking whether /dev/tty1 is in place"
+	mount --bind / ${T}
+
+	if [[ ! -c ${T}/dev/tty1 ]]; then
+		eend 1
+		ewarn "It appears that the /dev/tty1 character device doesn't exist on"
+		ewarn "the root filesystem. This will prevent the silent mode from working"
+		ewarn "properly. You can fix the problem by doing:"
+		ewarn "  mount --bind / /lib/splash/tmp"
+		ewarn "  mknod /lib/splash/tmp/dev/tty1 c 4 1"
+		ewarn "  umount /lib/splash/tmp"
+		echo ""
+	else
+		eend 0
+	fi
+	umount ${T}
+
+	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"
+		echo ""
+	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."
+		echo ""
+	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."
+		echo ""
+		einfo "After these modifications, the relevant part of the kernel command"
+		einfo "line might look like:"
+		einfo "  splash=silent,fadein,theme:emergence console=tty1"
+		echo ""
+	fi
+
+	if ! has_version 'media-gfx/splash-themes-livecd' &&
+		! has_version 'media-gfx/splash-themes-gentoo'; then
+		einfo "The sample Gentoo themes (emergence, gentoo) have been removed from the"
+		einfo "core splashutils package. To get some themes you might want to emerge:"
+		einfo "  media-gfx/splash-themes-livecd"
+		einfo "  media-gfx/splash-themes-gentoo"
+	fi
+}