Fixed a typo in the ebuild info messages (bug #98375). Removed old ebuild.

Package-Manager: portage-1.589-cvs

5 files changed, 12 insertions, 221 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 5428483d6d4c..2e75cc78e92e 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.36 2005/07/07 19:31:54 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.37 2005/07/08 23:31:33 spock Exp $
+
+  08 Jul 2005; Michał Januszewski <spock@gentoo.org>
+  -splashutils-1.1.9.6.ebuild, splashutils-1.1.9.6-r1.ebuild:
+  Fixed a typo in the ebuild info messages (bug #98375). Removed old ebuild.
 
   07 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
   splashutils-1.1.9.6-r1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 37c15d57910b..444637e40ca4 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d3762bd043d7fe7346416544d4a38fbe splashutils-1.1.9.6.ebuild 6370
-MD5 6ba6155d119a04aca0840541ce694687 splashutils-1.1.9.6-r1.ebuild 6009
+MD5 1409e15605d9e85ecd9e151911beacfd splashutils-1.1.9.6-r1.ebuild 6008
 MD5 13b41917218dff90a78e1d3a582b86f7 splashutils-0.9.1.ebuild 3195
-MD5 28a7461096c678bae0bbccc1beec5a35 ChangeLog 8301
+MD5 87ea96e34b33afae493f66356181a402 ChangeLog 8495
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 MD5 ae39d33c3d0a3a91709b168706326abf files/digest-splashutils-1.1.9.6-r1 547
-MD5 ae39d33c3d0a3a91709b168706326abf files/digest-splashutils-1.1.9.6 547
 MD5 d4d393d10196781338f83d0a795065ae files/digest-splashutils-0.9.1 378
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCzYNg2G5bA0cA/ScRAlyqAKCTLGmmgy7lGmtO2KwFIQHeF4f/6wCgiCRL
-Lub1Atmn5ehGJEZvRnzj8rc=
-=dQlP
+iD8DBQFCzwzxchej4aZK9/cRAjNKAJwMSQYMdb7l9T1A0690js5T1JEaBwCfbJSB
+9kt/PU0OUQskGv8aKPHneCw=
+=f4hB
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.6 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.6
deleted file mode 100644
index 51f51b8bf89a..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.6
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 addcd2ac580c423fb14d4334da26def0 splashutils-lite-1.1.9.6.tar.bz2 54712
-MD5 55438c4f30e5cba29764afcbadde48fc splashutils-gentoo-0.1.10.tar.bz2 7210
-MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
-MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
-MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
-MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
-MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
-MD5 06daaff20aa7d9cc888393e969624907 klibc-1.0.8.tar.bz2 446138
diff --git a/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild
index 61693cf70a2e..6c7208008679 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild,v 1.5 2005/07/07 19:31:54 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.6-r1.ebuild,v 1.6 2005/07/08 23:31:33 spock Exp $
 
 inherit multilib linux-mod
 
@@ -175,7 +175,7 @@ pkg_postinst() {
 	echo ""
 	ewarn "Due to a change in the splash protocol you will have to rebuild"
 	ewarn "all initrds created with splashutils < 1.1.9. This can be done"
-	ewarn "with the splash_geninitramsfs script."
+	ewarn "with the splash_geninitramfs script."
 	echo ""
 	ewarn "It is required that you add 'CONSOLE=/dev/tty1', to make sure all"
 	ewarn "init messages are printed to the first tty, and not the foreground one."
diff --git a/media-gfx/splashutils/splashutils-1.1.9.6.ebuild b/media-gfx/splashutils/splashutils-1.1.9.6.ebuild
deleted file mode 100644
index f73ff74768b3..000000000000
--- a/media-gfx/splashutils/splashutils-1.1.9.6.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.6.ebuild,v 1.6 2005/06/23 14:46:39 spock Exp $
-
-inherit multilib
-
-MISCSPLASH="miscsplashutils-0.1.3"
-GENTOOSPLASH="splashutils-gentoo-0.1.10"
-V_KLIBC="1.0.8"
-V_JPEG="6b"
-V_PNG="1.2.8"
-V_ZLIB="1.2.1"
-V_FT="2.1.9"
-
-IUSE="hardened png truetype kdgraphics"
-
-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
-	 ftp://ftp.kernel.org/pub/linux/libs/klibc/klibc-${V_KLIBC}.tar.bz2
-	 ftp://ftp.kernel.org/pub/linux/libs/klibc/Stable/klibc-${V_KLIBC}.tar.bz2
-	 ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/klibc-${V_KLIBC}.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
-	!media-gfx/bootsplash
-	media-gfx/fbgrab"
-DEPEND="${RDEPEND}
-	virtual/linux-sources"
-
-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 fbsplash kernel helper."
-	fi
-}
-
-spl_conf() {
-	sed -i -re "s/#.* $2([^_].*|$)//g" ${S}/config.h
-
-	if [[ "$1" == "yes" ]]; then
-		echo "#define	$2 1" >> ${S}/config.h
-	else
-		echo "#undef	$2" >> ${S}/config.h
-	fi
-}
-
-spl_conf_use() {
-	if use $1; then
-		spl_conf yes $2
-	else
-		spl_conf no $2
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	ln -s /usr/src/linux ${S}/linux
-
-	mv ${WORKDIR}/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT},klibc-${V_KLIBC}} ${S}/libs
-	ln -s ../../linux ${S}/libs/klibc-${V_KLIBC}/linux
-	# 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
-
-	# Check whether the kernel tree has been patched with fbsplash.
-	if [[ ! -e /usr/src/linux/include/linux/console_splash.h ]]; then
-		ewarn "Your kernel in /usr/src/linux has not been patched with a compatible version"
-		ewarn "of fbsplash. You can download the latest patch from http://dev.gentoo.org/~spock/"
-		echo ""
-		ewarn "Splashutils will be compiled without fbsplash support. Verbose mode will not"
-		ewarn "be supported."
-		spl_conf no CONFIG_FBSPLASH
-	else
-		spl_conf yes CONFIG_FBSPLASH
-	fi
-
-	# Make sure the kernel is configured. This is necessary for klibc to build.
-	if [ ! -e /usr/src/linux/include/asm ]; then
-		if [ -z "${KBUILD_OUTPUT}" ] ||
-		   [ ! -e "${KBUILD_OUTPUT}/include/asm" ]; then
-			eerror "It appears that your kernel has not been configured. Please run at least"
-			eerror "\`make prepare\` before merging splashutils."
-			die "Kernel not configured"
-		else
-			t=$(readlink ${KBUILD_OUTPUT}/include/asm)
-			ln -s /usr/src/linux/include/${t} ${T}/asm
-		fi
-	fi
-
-	# This should make splashutils compile on hardened systems.
-	sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile
-	sed -e 's@CFLAGS  =@CFLAGS  = -fno-stack-protector@' -i ${S}/libs/klibc-${V_KLIBC}/klibc/MCONFIG
-
-	mkdir ${S}/kernel
-
-	# Use tty16 as the default silent tty.
-	sed -i -e 's/#define TTY_SILENT.*/#define TTY_SILENT 16/' ${S}/splash.h
-}
-
-src_compile() {
-	local miscincs
-
-	if [ -n "${KBUILD_OUTPUT}" ]; then
-		miscincs="-I${T} -I${KBUILD_OUTPUT}/include"
-	fi
-
-	spl_conf_use png CONFIG_PNG
-	spl_conf_use truetype CONFIG_TTF
-	spl_conf_use truetype CONFIG_TTF_KERNEL
-	spl_conf_use kdgraphics CONFIG_SILENT_KD_GRAPHICS
-	sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile
-	emake -j1 MISCINCS="${miscincs}" || die "failed to build splashutils"
-
-	cd ${SM}
-	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
-}
-
-src_install() {
-	cd ${SM}
-	make DESTDIR=${D} install || die
-
-	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 /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"
-	else
-		eend 0
-	fi
-	umount ${T}
-
-	echo ""
-	ewarn "Due to a change in the splash protocol you will have to rebuild"
-	ewarn "all initrds created with splashutils < 1.1.9. This can be done"
-	ewarn "with the splash_geninitramsfs script."
-	echo ""
-	ewarn "It is required that you add 'CONSOLE=/dev/tty1', to make sure all"
-	ewarn "init messages are printed to the first tty, and not the foreground one."
-	ewarn "It is advised that you add 'quiet' as an additional, standalone"
-	ewarn "parameter to suppress non-critical kernel messages."
-	echo ""
-	einfo "After these modifications, the relevant part of the kernel command"
-	einfo "line might look like:"
-	einfo "    splash=silent,fadein,theme:emergence quiet CONSOLE=/dev/tty1"
-	echo ""
-	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"
-	echo ""
-}