Version bump (fixes bugs #200217, #200668).

Package-Manager: portage-2.1.4_rc14

4 files changed, 243 insertions, 9 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 9c534f29bf99..9bc5c00c097f 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.123 2007/12/23 12:24:56 spock Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.124 2008/01/06 15:13:11 spock Exp $
+
+*splashutils-1.5.3.3 (06 Jan 2008)
+
+  06 Jan 2008; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.5.3.3.ebuild:
+  Version bump (fixes bugs #200217, #200668).
 
   23 Dec 2007; Michał Januszewski <spock@gentoo.org>
   -splashutils-1.5.2.ebuild, -splashutils-1.5.3.ebuild,
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 0422415e6750..c343ce54eb5a 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -26,6 +26,7 @@ DIST miscsplashutils-0.1.6.tar.bz2 91945 RMD160 4d415db9cf1dd90bf4ceaae930033cf6
 DIST miscsplashutils-0.1.7.tar.bz2 91994 RMD160 c3443b677e56f22e5f405f830dedd5591e0e666b SHA1 b3cb80585f068a8e4028967137074353361376de SHA256 0f0828878a3a284591e6a2ca3a6e07c233ab14c268b36efcb6ac0fa8390fc61f
 DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94e44149ab SHA1 d3d0df74b4f613e505d662134a7af5c0cc488108 SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336
 DIST splashutils-gentoo-1.0.10.tar.bz2 17195 RMD160 5471fb283c0c5848776e7c270bbac34001801196 SHA1 6dcdf4d2a196f04339f3c1b5b279652233f092f4 SHA256 079143358383c2e6ecf8c47eb03ffc4d65630d90e58eb1a17877707146a33056
+DIST splashutils-gentoo-1.0.11.tar.bz2 14879 RMD160 3a067329a72e334c68913906b720e80022b025ea SHA1 5c747a35abd2bc59f274501cce797a6e8793ecb5 SHA256 f2f6a82d34f5438a0bcbf2d79181c15c92ab2ed12881d88db6b271067b616613
 DIST splashutils-gentoo-1.0.2.tar.bz2 14703 RMD160 697e3b3970bf3f38f346e781fc23ad21735219dd SHA1 fda89cc3e27c1d4c348581a596d055f0d7206e5c SHA256 6705146d56a9fc9206bbf6da7d69aaefcdaed29c0771feed495a07534a4cbd00
 DIST splashutils-gentoo-1.0.3.tar.bz2 14962 RMD160 b08698b26b4f4edef2a46d2763e9d1a5df6c44b0 SHA1 3860cfe8a2fadef34e5f79a20829098ad76da23c SHA256 ff65cda5ca4df747efe9724cfab3dd8425ed471e43d7e4f4e01ad66ab666c33f
 DIST splashutils-gentoo-1.0.8.tar.bz2 16001 RMD160 2a0b057f894c72892ed11f1d3fd1273f04f766fc SHA1 903508a7b135c0ea942e08227cfa8c69dc12d338 SHA256 2b9a5f393a83190ad59e26f511ae4215b55870d06bb1eb1a0091eb5cbf2dfd2b
@@ -33,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.3.2.tar.bz2 337849 RMD160 d81143d7103df91b363f6f38c368914b1e331577 SHA1 016b647a2c4ec06de6ac3aa534d31572aa209d83 SHA256 e48d8b2d578ee2aeeeb16172ce711f3ba282b7e2a1974bdcca5ecbb0fb03f36a
+DIST splashutils-lite-1.5.3.3.tar.bz2 413745 RMD160 a5bcaf0e08b88b408c32a6f2a872039b1fe10b8e SHA1 433ada58550485b7d8dd134d30462e0ba52bfa5e SHA256 007ee847f5096a625de37b0d2256f6c899602241560b0b86abab53944365ed80
 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
 MD5 799a290c7f7039500bf7ef0eb46c9b36 splashutils-1.4.2.1.ebuild 6678
@@ -50,10 +52,14 @@ EBUILD splashutils-1.5.3.2.ebuild 6581 RMD160 6fa6c4a00b79ff55f13e13ec6121e14cfa
 MD5 3148ef2a2b9f7046490a4142d2a6f312 splashutils-1.5.3.2.ebuild 6581
 RMD160 6fa6c4a00b79ff55f13e13ec6121e14cfa231249 splashutils-1.5.3.2.ebuild 6581
 SHA256 ba092f168f1dc4c12d712dfd4562203316e7f42bef87a2bce5925fdfc4ebd9c9 splashutils-1.5.3.2.ebuild 6581
-MISC ChangeLog 23624 RMD160 87857194429cdd67c96e77d7971a0579f451fcfd SHA1 b88e724726fa6437eb93fa1168fa76ad61fe44b9 SHA256 db2df6c551abdabbe1532784d71bcdbd0941090e1b9402e0d898d8f3fdac1b44
-MD5 01d9fe146cdbc3a80b349282084c3123 ChangeLog 23624
-RMD160 87857194429cdd67c96e77d7971a0579f451fcfd ChangeLog 23624
-SHA256 db2df6c551abdabbe1532784d71bcdbd0941090e1b9402e0d898d8f3fdac1b44 ChangeLog 23624
+EBUILD splashutils-1.5.3.3.ebuild 6519 RMD160 2cd45970a81ed98a6a47aac0262250f779b13b74 SHA1 da397b06c57de703bc79d4a45173e7e4c7464d32 SHA256 0fc7e6b616a82b5740c6cdb2de84b6c7712aa8c60e878d3927104789577c3665
+MD5 e35f5b04c1dcd8d11f242f7b21a43087 splashutils-1.5.3.3.ebuild 6519
+RMD160 2cd45970a81ed98a6a47aac0262250f779b13b74 splashutils-1.5.3.3.ebuild 6519
+SHA256 0fc7e6b616a82b5740c6cdb2de84b6c7712aa8c60e878d3927104789577c3665 splashutils-1.5.3.3.ebuild 6519
+MISC ChangeLog 23792 RMD160 14d38c8c09af9e5ed69ab50ff4689485e5435150 SHA1 2bf8ed6b09c7b3a8a645912a2944945f0a6adbb3 SHA256 076e52c7a7a20ddf8774365de1835488ea6f5578d5d65a0f38cdcd9ce3b3359f
+MD5 5fda18a61ce3375118b7c3ba7657bf45 ChangeLog 23792
+RMD160 14d38c8c09af9e5ed69ab50ff4689485e5435150 ChangeLog 23792
+SHA256 076e52c7a7a20ddf8774365de1835488ea6f5578d5d65a0f38cdcd9ce3b3359f ChangeLog 23792
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -70,10 +76,13 @@ SHA256 8a141571d01168378118e8f3a47a55c29350a7e6969ddecde05d3910ca6427e1 files/di
 MD5 afa8f5d4d4ae191fbce697497ff7994b files/digest-splashutils-1.5.3.2 1783
 RMD160 c7f85eed0a74911690eed00df8da6a81aeae0fab files/digest-splashutils-1.5.3.2 1783
 SHA256 7c3c4226b3a74d42871c36d4cfddaadcd4eb03c2fd5dc5f0219a542d7a5f780c files/digest-splashutils-1.5.3.2 1783
+MD5 6c640e65bda7ec34a47bdf455ad79ac8 files/digest-splashutils-1.5.3.3 1783
+RMD160 449d0e09e497380bd07beffcb8b49b8c5514091e files/digest-splashutils-1.5.3.3 1783
+SHA256 1e8730b2b5295371ca3dc10ce0670262bc38be9ab017e34d06acd839caeef6e0 files/digest-splashutils-1.5.3.3 1783
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkduU5sACgkQchej4aZK9/cMdQCZAcJwDEfFgxiHi5iPQSjhCNso
-OHYAnR/su63CjX7DswgSMt0U6xFNoKWp
-=jYD6
+iEYEARECAAYFAkeA8AkACgkQchej4aZK9/ePvACggFMOMBcai4TVti1/My95P1W/
+kWoAn2HtLFdSkroFEUrg3IxHpMYApJah
+=YyVV
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.5.3.3 b/media-gfx/splashutils/files/digest-splashutils-1.5.3.3
new file mode 100644
index 000000000000..bb25392b4731
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-1.5.3.3
@@ -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 34b607da44b350bc16085261041ca080 splashutils-gentoo-1.0.11.tar.bz2 14879
+RMD160 3a067329a72e334c68913906b720e80022b025ea splashutils-gentoo-1.0.11.tar.bz2 14879
+SHA256 f2f6a82d34f5438a0bcbf2d79181c15c92ab2ed12881d88db6b271067b616613 splashutils-gentoo-1.0.11.tar.bz2 14879
+MD5 e7d023f964677bcbfb71dfecd3c3e9c4 splashutils-lite-1.5.3.3.tar.bz2 413745
+RMD160 a5bcaf0e08b88b408c32a6f2a872039b1fe10b8e splashutils-lite-1.5.3.3.tar.bz2 413745
+SHA256 007ee847f5096a625de37b0d2256f6c899602241560b0b86abab53944365ed80 splashutils-lite-1.5.3.3.tar.bz2 413745
+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.3.ebuild b/media-gfx/splashutils/splashutils-1.5.3.3.ebuild
new file mode 100644
index 000000000000..80446d44ff92
--- /dev/null
+++ b/media-gfx/splashutils/splashutils-1.5.3.3.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2008 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.3.ebuild,v 1.1 2008/01/06 15:13:11 spock Exp $
+
+inherit eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.11"
+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}
+
+	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/
+	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 has_version '<media-gfx/splashutils-1.5.3' && ! 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|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."
+}