5 files changed, 6 insertions, 443 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index dfd95ac81981..00283a8803c5 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.54 2006/04/16 19:59:38 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.55 2006/04/22 14:51:38 spock Exp $
+
+  22 Apr 2006; Michał Januszewski <spock@gentoo.org>
+  -splashutils-1.1.9.9-r1.ebuild, -splashutils-1.1.9.10.ebuild:
+  Removed old ebuilds without support for the --svcdir option in baselayout's
+  depscan.
 
   16 Apr 2006; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.1.9.10-makefile.patch,
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
deleted file mode 100644
index d3024bebfec2..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
-MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
-MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
-MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
-MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750
-MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094
-MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1
deleted file mode 100644
index bf70d8ddfd23..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 ff5583eac920804ac90671f30422e50f splashutils-lite-1.1.9.9.tar.bz2 55181
-MD5 04ae6c0cb56738ebc9b6da3ebb9d3c7f splashutils-gentoo-0.1.13.tar.bz2 7669
-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 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209
diff --git a/media-gfx/splashutils/splashutils-1.1.9.10.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
deleted file mode 100644
index 22bc6c087cfc..000000000000
--- a/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# 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.1.9.10.ebuild,v 1.4 2006/02/02 15:46:17 spock Exp $
-
-inherit eutils multilib linux-mod
-
-MISCSPLASH="miscsplashutils-0.1.3"
-GENTOOSPLASH="splashutils-gentoo-0.1.14"
-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 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"
-
-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}
-	virtual/linux-sources
-	>=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
-}
-
-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
-}
-
-pkg_setup() {
-	check_kernel_built
-}
-
-src_unpack() {
-	unpack ${A}
-	ln -s ${KV_DIR} ${S}/linux
-
-	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}
-
-	epatch ${FILESDIR}/splashutils-1.1.9.10-ppc-2.6.14.patch
-
-	# Check whether the kernel tree has been patched with fbsplash.
-	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then
-		ewarn "Your kernel in ${KV_DIR} 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
-
-	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
-
-	mkdir ${S}/kernel
-
-	# 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() {
-	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
-
-	cd ${SM}
-	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
-	cd ${S}
-	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
-
-	ewarn "If you're upgrading from a pre-1.0 splashutils version, make sure that you"
-	ewarn "rebuild your initrds. You can use the splash_geninitramfs script to do that."
-	echo ""
-	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 ""
-	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 ""
-}
diff --git a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
deleted file mode 100644
index c0774c08bad4..000000000000
--- a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# 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.1.9.9-r1.ebuild,v 1.8 2006/03/02 17:41:52 uberlord Exp $
-
-inherit eutils multilib linux-mod
-
-MISCSPLASH="miscsplashutils-0.1.3"
-GENTOOSPLASH="splashutils-gentoo-0.1.13"
-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 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"
-
-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}
-	virtual/linux-sources
-	>=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
-}
-
-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
-}
-
-pkg_setup() {
-	check_kernel_built
-}
-
-src_unpack() {
-	unpack ${A}
-	ln -s ${KV_DIR} ${S}/linux
-
-	# Ensure that we call depscan with --svcdir
-	cd "${WORKDIR}/${GENTOOSPLASH}"
-	epatch "${FILESDIR}/splashutils-depscan.patch"
-
-	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}
-	epatch ${FILESDIR}/${P}-external-klibc.patch
-
-	# Check whether the kernel tree has been patched with fbsplash.
-	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then
-		ewarn "Your kernel in ${KV_DIR} 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
-
-	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
-
-	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() {
-	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
-
-	cd ${SM}
-	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
-	cd ${S}
-	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
-	emake -j1 LIB=$(get_libdir) || 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
-
-	ewarn "If you're upgrading from a pre-1.0 splashutils version, make sure that you"
-	ewarn "rebuild your initrds. You can use the splash_geninitramfs script to do that."
-	echo ""
-	ewarn "It is required that you add 'quiet CONSOLE=/dev/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 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 ""
-}