Added a new version of splashutils. Removed old ebuilds.

(Portage version: 2.0.51-r15)

6 files changed, 40 insertions, 102 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index c54131a3615b..056306049a1d 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,14 @@
 # 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.14 2005/01/16 13:57:27 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.15 2005/01/27 20:40:52 spock Exp $
+
+*splashutils-0.9.1 (27 Jan 2005)
+
+  27 Jan 2005; Michał Januszewski <spock@gentoo.org>
+  +splashutils-0.9.1.ebuild, -splashutils-0.9_pre07.ebuild,
+  -splashutils-0.9_pre08.ebuild:
+  Added a new version of splashutils with some amazing new features and
+  bugfixes which I'm too lazy to list here ;) Removed old ebuilds.
 
   16 Jan 2005; Michal Januszewski <spock@gentoo.org>
   splashutils-0.9_rc1.ebuild:
diff --git a/media-gfx/splashutils/files/digest-splashutils-0.9.1 b/media-gfx/splashutils/files/digest-splashutils-0.9.1
new file mode 100644
index 000000000000..e2a9c9a6f553
--- /dev/null
+++ b/media-gfx/splashutils/files/digest-splashutils-0.9.1
@@ -0,0 +1,5 @@
+MD5 a153dae7e3c73c972a3b7ff96490649a splashutils-0.9.1.tar.bz2 1631483
+MD5 71f85c661c144665ff5d4a8bbef1936e miscsplashutils-0.1.2.tar.bz2 91301
+MD5 0d32d8c574f0b2f03f8d389ec17f49fe splashutils-gentoo-0.1.4.tar.bz2 4528
+MD5 53437014b3e4ddd2d72de7f6e88e1486 fbsplash-theme-emergence-r2.tar.bz2 4794297
+MD5 a63484ca6ce645cfbacc30c91bbf746c fbsplash-theme-gentoo-r1.tar.bz2 5266047
diff --git a/media-gfx/splashutils/files/digest-splashutils-0.9_pre07 b/media-gfx/splashutils/files/digest-splashutils-0.9_pre07
deleted file mode 100644
index 554bc60d6562..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-0.9_pre07
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 06ea4f23e12511fa07ea9b4c3ed8c55f splashutils-0.9-pre07.tar.bz2 1570517
-MD5 6bbf21be947fd2095377b9b3515bf5b2 miscsplashutils-0.1.1.tar.bz2 91011
-MD5 6fa7dcec2a83ac6c1f33c82a402d3dd8 splashutils-gentoo-0.1.tar.bz2 3653
-MD5 ad45a2fde019f96c88932dd165752286 fbsplash-theme-emergence.tar.bz2 4110217
diff --git a/media-gfx/splashutils/files/digest-splashutils-0.9_pre08 b/media-gfx/splashutils/files/digest-splashutils-0.9_pre08
deleted file mode 100644
index 0b7ad699477e..000000000000
--- a/media-gfx/splashutils/files/digest-splashutils-0.9_pre08
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 ded2c7c1690523de1eac7e22d6b63d42 splashutils-0.9-pre08.tar.bz2 1572610
-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/splashutils-0.9_pre08.ebuild b/media-gfx/splashutils/splashutils-0.9.1.ebuild
index 55e4be5e499e..a8f223a58caa 100644
--- a/media-gfx/splashutils/splashutils-0.9_pre08.ebuild
+++ b/media-gfx/splashutils/splashutils-0.9.1.ebuild
@@ -1,26 +1,27 @@
 # 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_pre08.ebuild,v 1.3 2005/01/04 18:35:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-0.9.1.ebuild,v 1.1 2005/01/27 20:40:52 spock Exp $
 
 MISCSPLASH="miscsplashutils-0.1.2"
-GENTOOSPLASH="splashutils-gentoo-0.1.1"
+GENTOOSPLASH="splashutils-gentoo-0.1.4"
+KLIBC_VERSION="0.179"
 
 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"
+	 mirror://gentoo/fbsplash-theme-emergence-r2.tar.bz2
+	 mirror://gentoo/fbsplash-theme-gentoo-r1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="hardened"
 RDEPEND=">=media-libs/freetype-2
 	media-libs/libpng
 	media-libs/jpeg
-	>=sys-apps/baselayout-1.10.4
+	>=sys-apps/baselayout-1.9.4-r5
 	!media-gfx/bootsplash"
 DEPEND="${RDEPEND}
 	virtual/linux-sources"
@@ -29,6 +30,15 @@ S="${WORKDIR}/${P/_/-}"
 SM="${WORKDIR}/${MISCSPLASH}"
 SG="${WORKDIR}/${GENTOOSPLASH}"
 
+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
+}
+
 src_unpack() {
 	unpack ${A}
 	ln -s /usr/src/linux ${S}/linux
@@ -42,6 +52,7 @@ src_unpack() {
 	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
@@ -51,9 +62,15 @@ src_unpack() {
 		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.159/klibc/makeerrlist.pl
+			sed -e "s@#CHANGEME#@${T}/@" -i ${S}/libs/klibc-${KLIBC_VERSION}/klibc/makeerrlist.pl
 		fi
 	fi
+
+	# this should make this version of splashutils compile with hardened systems
+	if use hardened; then
+		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-${KLIBC_VERSION}/klibc/MCONFIG
+	fi
 }
 
 src_compile() {
@@ -62,6 +79,7 @@ src_compile() {
 
 	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
 
diff --git a/media-gfx/splashutils/splashutils-0.9_pre07.ebuild b/media-gfx/splashutils/splashutils-0.9_pre07.ebuild
deleted file mode 100644
index befb73aa9d94..000000000000
--- a/media-gfx/splashutils/splashutils-0.9_pre07.ebuild
+++ /dev/null
@@ -1,84 +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_pre07.ebuild,v 1.7 2005/01/04 18:35:51 hansmi Exp $
-
-MISCSPLASH="miscsplashutils-0.1.1"
-GENTOOSPLASH="splashutils-gentoo-0.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.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND=">=media-libs/freetype-2
-	media-libs/libpng
-	media-libs/jpeg
-	>=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
-		eerror "It appears that your kernel has not been configured. Please run at least"
-		eerror "\`make prepare\` before merging splashutils."
-		die "Kernel not configured"
-	fi
-}
-
-src_compile() {
-	emake -j1
-
-	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
-	cp -pR ${WORKDIR}/emergence ${D}/etc/splash
-	ln -s emergence ${D}/etc/splash/default
-	dodoc docs/* README AUTHORS
-
-	# fix a little bug in the current version of the emergence theme.
-	sed -re 's/silent-([0-9]+x[0-9]+)-240/silent-\1-256/g' -i ${D}/etc/splash/emergence/*.cfg
-
-	if [ ! -e ${ROOT}/etc/splash/default ]; then
-		dosym /etc/splash/emergence /etc/splash/default
-	fi
-}