Version bump.

Package-Manager: portage-2.1.4_rc7

4 files changed, 234 insertions, 8 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 708cc4951ea0..6da3d3d132e2 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.118 2007/12/01 20:51:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.119 2007/12/05 20:26:10 spock Exp $
+
+*splashutils-1.5.3.1 (05 Dec 2007)
+
+  05 Dec 2007; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.5.3.1.ebuild:
+  Version bump: minor bugfixes.
 
   01 Dec 2007; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.3.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 6127f602e9b3..1c22cd62284e 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -34,6 +34,7 @@ DIST splashutils-lite-1.4.2.1.tar.bz2 67312 RMD160 a1c97cf1e5739f798ba49d978dcb5
 DIST splashutils-lite-1.4.2.tar.bz2 67282 RMD160 fcd3f2abe265fc2036de07418b5b8e2b3355e8b1 SHA1 630b378c6a84995ea40b6beb50b6926e6d3252cb SHA256 0468617b3264baca4a78466c9fa080a8688c705d3f8104246c8e8f006139023c
 DIST splashutils-lite-1.5.2.1.tar.bz2 89714 RMD160 acf3605dfe28fafcd3139f82d4fa00b0d1049998 SHA1 34e8c87267b418c7cf1fb3a3a5642965a7a547ed SHA256 f5b718d52ecd0d5338eb66fa02aa11a32ba1e052c3ba8d00c3776b8d1d2f6430
 DIST splashutils-lite-1.5.2.tar.bz2 89532 RMD160 354e629577d92d372eb181c22d449d1c2d746ae3 SHA1 8ce15f6b6530a9e1f6e80d27c4cfb5ce18213aba SHA256 d2702fadf122a594e8de3fe751a8f0e8ced518624c1987beea54060c0257baa6
+DIST splashutils-lite-1.5.3.1.tar.bz2 337565 RMD160 690be1a26829c4cbdf3b626a2a526b5c8afbd108 SHA1 481d0ef6ccfb9ee2af2c5f42d6500d2b6c8782ba SHA256 7c7a6073554b063dcd38a57128e62359365c2c7d1beaac2f35cc9ebfc88084ee
 DIST splashutils-lite-1.5.3.tar.bz2 337456 RMD160 7d65c3894cf67624c7e867a5e4c107fff9150928 SHA1 0f8d1f98ea3020a777bccaeb69f20eb14f363b5a SHA256 2b56ac1f88bbb8fa3b6c466ec0f4316ce5e55954347b0d5c18025757e1489b66
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.4.2.1.ebuild 6678 RMD160 c2e879a65da76f4f6f6a987c5fc6ecba7ecacde4 SHA1 408918c1352c4a0e921f08ebd539efeca17c737f SHA256 34ed66a3f60c205333aeffb7b59b1fe61cd11d5a1c4b3e10f99ef39ab88d9eb1
@@ -52,14 +53,18 @@ EBUILD splashutils-1.5.2.ebuild 7236 RMD160 7ec01451f8329e5bd974b7af3c441feeefdc
 MD5 b834ef17b504360a488e75ad504247f8 splashutils-1.5.2.ebuild 7236
 RMD160 7ec01451f8329e5bd974b7af3c441feeefdc61a3 splashutils-1.5.2.ebuild 7236
 SHA256 37340e3c0707a7675790ff5c06cf348c2cb053725bd37bee0ce7b41d324b19da splashutils-1.5.2.ebuild 7236
+EBUILD splashutils-1.5.3.1.ebuild 6187 RMD160 7da6ffac9d86a7ba5201d1535374edda707145d7 SHA1 3ea107b8fa49ebbb4d236e5c98baeb3e1f570d5f SHA256 149db735edaaff8c22cf1960613326758b0494bf4e2d48a4d8488deb03acb0c8
+MD5 086d08b435354cdc6c269627359b9971 splashutils-1.5.3.1.ebuild 6187
+RMD160 7da6ffac9d86a7ba5201d1535374edda707145d7 splashutils-1.5.3.1.ebuild 6187
+SHA256 149db735edaaff8c22cf1960613326758b0494bf4e2d48a4d8488deb03acb0c8 splashutils-1.5.3.1.ebuild 6187
 EBUILD splashutils-1.5.3.ebuild 6165 RMD160 1f93d058e2dd01f9adbabb55785dda6ff912be93 SHA1 b03c09a7fd8d1a8ef354042865fe4484057f2f22 SHA256 01a4ec31eb1b6caf27e046a6383fc4ac0f387f749631eb3cf5aef3872bd26252
 MD5 15dd660d69f6931d77c21479c67ac651 splashutils-1.5.3.ebuild 6165
 RMD160 1f93d058e2dd01f9adbabb55785dda6ff912be93 splashutils-1.5.3.ebuild 6165
 SHA256 01a4ec31eb1b6caf27e046a6383fc4ac0f387f749631eb3cf5aef3872bd26252 splashutils-1.5.3.ebuild 6165
-MISC ChangeLog 22879 RMD160 8773ffd4a3df6f4c0846f401b1bc038043710eb1 SHA1 976b9d5d4a156054b0b8ba5c6a5a49c9cd8b08ee SHA256 f448434c2dbb0b4e015269b1695c06ba68996046c37975ef1f17c4be33abe848
-MD5 e550ac136548389559b7cda521b8f2de ChangeLog 22879
-RMD160 8773ffd4a3df6f4c0846f401b1bc038043710eb1 ChangeLog 22879
-SHA256 f448434c2dbb0b4e015269b1695c06ba68996046c37975ef1f17c4be33abe848 ChangeLog 22879
+MISC ChangeLog 23033 RMD160 f1f8e8d9b4bfacf028f1991877e67440a874a3ea SHA1 0e6e8f3999c9a35bc473b1251efcdd2694b20476 SHA256 73fd259c130ab6c835cedc75c06c0cd3c48da7a0dfddae219d9ef2f703ab3e7d
+MD5 3627ac4f7eccfa4f1993f226f3e10d21 ChangeLog 23033
+RMD160 f1f8e8d9b4bfacf028f1991877e67440a874a3ea ChangeLog 23033
+SHA256 73fd259c130ab6c835cedc75c06c0cd3c48da7a0dfddae219d9ef2f703ab3e7d ChangeLog 23033
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -79,10 +84,13 @@ SHA256 8a141571d01168378118e8f3a47a55c29350a7e6969ddecde05d3910ca6427e1 files/di
 MD5 afee5963aaabcf96a6e490bd1c5da346 files/digest-splashutils-1.5.3 1774
 RMD160 dc6379783400461b3ccc07e0c11856244921dd2a files/digest-splashutils-1.5.3 1774
 SHA256 0fb7f7f3b11ea49f1fd2020c21de541c2d21d3d9f581b2c28b16ac528de7a9e5 files/digest-splashutils-1.5.3 1774
+MD5 11d55259ec6a72bd080d5748fa67ddea files/digest-splashutils-1.5.3.1 1780
+RMD160 0416bcba41f6a534fd2a0a9fe7ef91eee0661dd3 files/digest-splashutils-1.5.3.1 1780
+SHA256 93cd2fff0e7160f8bb8730c07546b67e3a61353f4d31ebe957c0f51e32c3c1d1 files/digest-splashutils-1.5.3.1 1780
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHUcllchej4aZK9/cRAsUUAJ9XMSKKQ2/YUe2aKa6ihDFO33WNeACff0gH
-9CqK2e1OSAfA+afyUW5kFpM=
-=nRGY
+iD8DBQFHVwlVchej4aZK9/cRAjLmAJ0fEbI7UsbNdSWSJfG2NMmQaLTfKwCeKzfE
+WKDCoMQ/moxiuJHUG41ldI4=
+=31cy
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.5.3.1 b/media-gfx/splashutils/files/digest-splashutils-1.5.3.1
new file mode 100644
index 000000000000..0020c047113d
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.5.3.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 17489ca97b1e6ee1c1e1190dc671f6bf splashutils-gentoo-1.0.9.tar.bz2 17003
+RMD160 b395e40913a1924fb4a7ed07e4ae40b80b3a22d0 splashutils-gentoo-1.0.9.tar.bz2 17003
+SHA256 e3350f1f33e72bb7946eabf364903ab72b2ed858fc42c15bfb647eda5774392a splashutils-gentoo-1.0.9.tar.bz2 17003
+MD5 eef57acc122304deaec55949963c07db splashutils-lite-1.5.3.1.tar.bz2 337565
+RMD160 690be1a26829c4cbdf3b626a2a526b5c8afbd108 splashutils-lite-1.5.3.1.tar.bz2 337565
+SHA256 7c7a6073554b063dcd38a57128e62359365c2c7d1beaac2f35cc9ebfc88084ee splashutils-lite-1.5.3.1.tar.bz2 337565
+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.3.1.ebuild b/media-gfx/splashutils/splashutils-1.5.3.1.ebuild
new file mode 100644
index 000000000000..1525e153c5be
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.3.1.ebuild
@@ -0,0 +1,191 @@
+# 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.3.1.ebuild,v 1.1 2007/12/05 20:26:10 spock Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.9"
+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 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="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}
+
+	[ ! -d "${S}/libs" ] && mkdir "${S}/libs"
+	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"
+
+	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/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."
+}