Removed old ebuilds. Updated the remaining ebuilds to work with KBUILD_OUTPUT.

(Portage version: 2.0.51.19)

7 files changed, 20 insertions, 246 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 4777ef7626cb..61933ed703f8 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2005/03/07 21:19:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.19 2005/03/08 17:34:22 spock Exp $
+
+  08 Mar 2005; Michael Januszewski <spock@gentoo.org>
+  splashutils-0.9.1.ebuild, -splashutils-0.9_pre09.ebuild,
+  -splashutils-0.9_pre10.ebuild, splashutils-0.9_rc1.ebuild:
+  Removed old ebuilds. Updated the remaining ebuilds to work with KBUILD_OUTPUT.
 
   07 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   splashutils-0.9.1.ebuild:
diff --git a/media-gfx/splashutils/files/digest-splashutils-0.9_pre09 b/media-gfx/splashutils/files/digest-splashutils-0.9_pre09
deleted file mode 100644
index d6548677fe54..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-0.9_pre09
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 53dd4d6dab28ab2b2362d2859be6c43d splashutils-0.9-pre09.tar.bz2 1930574
-MD5 71f85c661c144665ff5d4a8bbef1936e miscsplashutils-0.1.2.tar.bz2 91301
-MD5 87dae255b315fc4eb60197d9ac1387f4 splashutils-gentoo-0.1.1.tar.bz2 3677
-MD5 c6afab93416bc4c8fe8bc328d4e432a0 fbsplash-theme-emergence-r1.tar.bz2 4842542
-MD5 ea206196d3cee32007ae1e8eab5a0b10 fbsplash-theme-gentoo.tar.bz2 5878006
diff --git a/media-gfx/splashutils/files/digest-splashutils-0.9_pre10 b/media-gfx/splashutils/files/digest-splashutils-0.9_pre10
deleted file mode 100644
index 9bc2ada75b45..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-0.9_pre10
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 20ab27ea8e02dc2efb6789cf53663ec8 splashutils-0.9-pre10.tar.bz2 1615345
-MD5 71f85c661c144665ff5d4a8bbef1936e miscsplashutils-0.1.2.tar.bz2 91301
-MD5 8da257da2faf6b4b4cd695bc752b4c8e splashutils-gentoo-0.1.2.tar.bz2 3672
-MD5 c6afab93416bc4c8fe8bc328d4e432a0 fbsplash-theme-emergence-r1.tar.bz2 4842542
-MD5 ea206196d3cee32007ae1e8eab5a0b10 fbsplash-theme-gentoo.tar.bz2 5878006
diff --git a/media-gfx/splashutils/splashutils-0.9.1.ebuild b/media-gfx/splashutils/splashutils-0.9.1.ebuild
index ed43183ae785..229a63616f4e 100644
--- a/media-gfx/splashutils/splashutils-0.9.1.ebuild
+++ b/media-gfx/splashutils/splashutils-0.9.1.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-0.9.1.ebuild,v 1.4 2005/03/07 21:19:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-0.9.1.ebuild,v 1.5 2005/03/08 17:34:22 spock Exp $
 
 MISCSPLASH="miscsplashutils-0.1.2"
 GENTOOSPLASH="splashutils-gentoo-0.1.4"
@@ -50,18 +50,14 @@ src_unpack() {
 	fi
 
 	if [ ! -e /usr/src/linux/include/asm ]; then
-
-		t=$(readlink /usr/src/linux)
-		t=${t#/usr/src/}
-
-		if [ -z "${KBUILD_OUTPUT_PREFIX}" ] ||
-		   [ ! -e "${KBUILD_OUTPUT_PREFIX}/${t/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
-			t2=$(readlink ${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include/asm)
-			ln -s /usr/src/linux/include/${t2} ${T}/asm
+			t=$(readlink ${KBUILD_OUTPUT}/include/asm)
+			ln -s /usr/src/linux/include/${t} ${T}/asm
 			sed -e "s@#CHANGEME#@${T}/@" -i ${S}/libs/klibc-${KLIBC_VERSION}/klibc/makeerrlist.pl
 		fi
 	fi
@@ -77,10 +73,8 @@ src_compile() {
 
 	local miscincs
 
-	if [ -n "${KBUILD_OUTPUT_PREFIX}" ]; then
-		t=$(readlink /usr/src/linux)
-		t=${t#/usr/src/}
-		miscincs="-I${T} -I${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include"
+	if [ -n "${KBUILD_OUTPUT}" ]; then
+		miscincs="-I${T} -I${KBUILD_OUTPUT}/include"
 	fi
 
 	emake -j1 MISCINCS="${miscincs}"
diff --git a/media-gfx/splashutils/splashutils-0.9_pre09.ebuild b/media-gfx/splashutils/splashutils-0.9_pre09.ebuild
deleted file mode 100644
index 7f57a9cf6aa8..000000000000
--- a/media-gfx/splashutils/splashutils-0.9_pre09.ebuild
+++ /dev/null
@@ -1,103 +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-0.9_pre09.ebuild,v 1.6 2005/02/11 18:40:34 spock Exp $
-
-MISCSPLASH="miscsplashutils-0.1.2"
-GENTOOSPLASH="splashutils-gentoo-0.1.1"
-
-DESCRIPTION="Framebuffer splash utilities."
-HOMEPAGE="http://dev.gentoo.org/~spock/"
-SRC_URI="mirror://gentoo/${P/_/-}.tar.bz2
-	 mirror://gentoo/${MISCSPLASH}.tar.bz2
-	 mirror://gentoo/${GENTOOSPLASH}.tar.bz2
-	 mirror://gentoo/fbsplash-theme-emergence-r1.tar.bz2
-	 mirror://gentoo/fbsplash-theme-gentoo.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-RDEPEND=">=media-libs/freetype-2
-	>=media-libs/libpng-1.2.7
-	>=media-libs/jpeg-6b
-	>=sys-apps/baselayout-1.10.4
-	!media-gfx/bootsplash"
-DEPEND="${RDEPEND}
-	virtual/linux-sources"
-
-S="${WORKDIR}/${P/_/-}"
-SM="${WORKDIR}/${MISCSPLASH}"
-SG="${WORKDIR}/${GENTOOSPLASH}"
-
-src_unpack() {
-	unpack ${A}
-	ln -s /usr/src/linux ${S}/linux
-	if [ ! -e /usr/src/linux/include/linux/console_splash.h ]; then
-		eerror "Your kernel in /usr/src/linux has not been patched with a compatible version"
-		eerror "of fbsplash. Please download the latest patch from http://dev.gentoo.org/~spock/"
-		eerror "and patch your kernel."
-		die "Fbsplash not found"
-	fi
-
-	if [ ! -e /usr/src/linux/include/asm ]; then
-
-		t=$(readlink /usr/src/linux)
-		t=${t#/usr/src/}
-
-		if [ -z "${KBUILD_OUTPUT_PREFIX}" ] ||
-		   [ ! -e "${KBUILD_OUTPUT_PREFIX}/${t/linux-}/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
-			t2=$(readlink ${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include/asm)
-			ln -s /usr/src/linux/include/${t2} ${T}/asm
-			sed -e "s@#CHANGEME#@${T}/@" -i ${S}/libs/klibc-0.172/klibc/makeerrlist.pl
-		fi
-	fi
-}
-
-src_compile() {
-
-	local miscincs
-
-	if [ -n "${KBUILD_OUTPUT_PREFIX}" ]; then
-		t=$(readlink /usr/src/linux)
-		t=${t#/usr/src/}
-		miscincs="-I${T} -I${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include"
-	fi
-
-	emake -j1 MISCINCS="${miscincs}"
-
-	cd ${SM}
-	emake
-}
-
-src_install() {
-	cd ${SM}
-	make DESTDIR=${D} install || die
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-
-	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
-
-	dodir /etc/splash/{emergence,gentoo}
-	cp -pR ${WORKDIR}/{emergence,gentoo} ${D}/etc/splash
-	ln -s emergence ${D}/etc/splash/default
-	dodoc docs/* README AUTHORS
-
-	if [ ! -e ${ROOT}/etc/splash/default ]; then
-		dosym /etc/splash/emergence /etc/splash/default
-	fi
-}
diff --git a/media-gfx/splashutils/splashutils-0.9_pre10.ebuild b/media-gfx/splashutils/splashutils-0.9_pre10.ebuild
deleted file mode 100644
index 305e1c9d279c..000000000000
--- a/media-gfx/splashutils/splashutils-0.9_pre10.ebuild
+++ /dev/null
@@ -1,106 +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-0.9_pre10.ebuild,v 1.6 2005/02/11 18:40:34 spock Exp $
-
-MISCSPLASH="miscsplashutils-0.1.2"
-GENTOOSPLASH="splashutils-gentoo-0.1.2"
-
-DESCRIPTION="Framebuffer splash utilities."
-HOMEPAGE="http://dev.gentoo.org/~spock/"
-SRC_URI="mirror://gentoo/${P/_/-}.tar.bz2
-	 mirror://gentoo/${MISCSPLASH}.tar.bz2
-	 mirror://gentoo/${GENTOOSPLASH}.tar.bz2
-	 mirror://gentoo/fbsplash-theme-emergence-r1.tar.bz2
-	 mirror://gentoo/fbsplash-theme-gentoo.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE=""
-RDEPEND=">=media-libs/freetype-2
-	>=media-libs/libpng-1.2.7
-	>=media-libs/jpeg-6b
-	>=sys-apps/baselayout-1.9.4-r5
-	!media-gfx/bootsplash"
-DEPEND="${RDEPEND}
-	virtual/linux-sources"
-
-S="${WORKDIR}/${P/_/-}"
-SM="${WORKDIR}/${MISCSPLASH}"
-SG="${WORKDIR}/${GENTOOSPLASH}"
-
-src_unpack() {
-	unpack ${A}
-	ln -s /usr/src/linux ${S}/linux
-	if [ ! -e /usr/src/linux/include/linux/console_splash.h ]; then
-		eerror "Your kernel in /usr/src/linux has not been patched with a compatible version"
-		eerror "of fbsplash. Please download the latest patch from http://dev.gentoo.org/~spock/"
-		eerror "and patch your kernel."
-		die "Fbsplash not found"
-	fi
-
-	if [ ! -e /usr/src/linux/include/asm ]; then
-
-		t=$(readlink /usr/src/linux)
-		t=${t#/usr/src/}
-
-		if [ -z "${KBUILD_OUTPUT_PREFIX}" ] ||
-		   [ ! -e "${KBUILD_OUTPUT_PREFIX}/${t/linux-}/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
-			t2=$(readlink ${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include/asm)
-			ln -s /usr/src/linux/include/${t2} ${T}/asm
-			sed -e "s@#CHANGEME#@${T}/@" -i ${S}/libs/klibc-0.179/klibc/makeerrlist.pl
-		fi
-	fi
-
-	# this should make this version of splashutils compile with the older kernels
-	sed -e 's@../linux/include/asm/unistd.h@@' -i ${S}/libs/klibc-0.179/klibc/Makefile
-}
-
-src_compile() {
-
-	local miscincs
-
-	if [ -n "${KBUILD_OUTPUT_PREFIX}" ]; then
-		t=$(readlink /usr/src/linux)
-		t=${t#/usr/src/}
-		miscincs="-I${T} -I${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include"
-	fi
-
-	emake -j1 MISCINCS="${miscincs}"
-
-	cd ${SM}
-	emake
-}
-
-src_install() {
-	cd ${SM}
-	make DESTDIR=${D} install || die
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-
-	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
-
-	dodir /etc/splash/{emergence,gentoo}
-	cp -pR ${WORKDIR}/{emergence,gentoo} ${D}/etc/splash
-	ln -s emergence ${D}/etc/splash/default
-	dodoc docs/* README AUTHORS
-
-	if [ ! -e ${ROOT}/etc/splash/default ]; then
-		dosym /etc/splash/emergence /etc/splash/default
-	fi
-}
diff --git a/media-gfx/splashutils/splashutils-0.9_rc1.ebuild b/media-gfx/splashutils/splashutils-0.9_rc1.ebuild
index 79edb3b01b2e..a7e98a909672 100644
--- a/media-gfx/splashutils/splashutils-0.9_rc1.ebuild
+++ b/media-gfx/splashutils/splashutils-0.9_rc1.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-0.9_rc1.ebuild,v 1.5 2005/02/11 18:40:34 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-0.9_rc1.ebuild,v 1.6 2005/03/08 17:34:22 spock Exp $
 
 MISCSPLASH="miscsplashutils-0.1.2"
 GENTOOSPLASH="splashutils-gentoo-0.1.3"
@@ -50,18 +50,14 @@ src_unpack() {
 	fi
 
 	if [ ! -e /usr/src/linux/include/asm ]; then
-
-		t=$(readlink /usr/src/linux)
-		t=${t#/usr/src/}
-
-		if [ -z "${KBUILD_OUTPUT_PREFIX}" ] ||
-		   [ ! -e "${KBUILD_OUTPUT_PREFIX}/${t/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
-			t2=$(readlink ${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include/asm)
-			ln -s /usr/src/linux/include/${t2} ${T}/asm
+			t=$(readlink ${KBUILD_OUTPUT}/include/asm)
+			ln -s /usr/src/linux/include/${t} ${T}/asm
 			sed -e "s@#CHANGEME#@${T}/@" -i ${S}/libs/klibc-${KLIBC_VERSION}/klibc/makeerrlist.pl
 		fi
 	fi
@@ -77,10 +73,8 @@ src_compile() {
 
 	local miscincs
 
-	if [ -n "${KBUILD_OUTPUT_PREFIX}" ]; then
-		t=$(readlink /usr/src/linux)
-		t=${t#/usr/src/}
-		miscincs="-I${T} -I${KBUILD_OUTPUT_PREFIX}/${t/linux-}/include"
+	if [ -n "${KBUILD_OUTPUT}" ]; then
+		miscincs="-I${T} -I${KBUILD_OUTPUT}/include"
 	fi
 
 	emake -j1 MISCINCS="${miscincs}"