Remove invalid usage of $ROOT (bug #167285).

Package-Manager: portage-2.1.2-r9

7 files changed, 25 insertions, 22 deletions

diff --git a/media-gfx/bootsplash/ChangeLog b/media-gfx/bootsplash/ChangeLog
index 57b2a8fac223..d98460445bb1 100644
--- a/media-gfx/bootsplash/ChangeLog
+++ b/media-gfx/bootsplash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/bootsplash
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.63 2006/10/23 19:37:22 spock Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.64 2007/02/17 11:42:40 spock Exp $
+
+  17 Feb 2007; Michał Januszewski <spock@gentoo.org>
+  bootsplash-0.6.1-r7.ebuild:
+  Remove invalid usage of $ROOT (bug #167285).
 
   23 Oct 2006; Michał Januszewski <spock@gentoo.org>
   +files/bootsplash-nostrip.patch, bootsplash-0.6.1-r7.ebuild:
diff --git a/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild b/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
index 1bb74b6bd332..02e30b133541 100644
--- a/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild,v 1.8 2006/10/23 19:37:22 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild,v 1.9 2007/02/17 11:42:40 spock Exp $
 
 inherit eutils
 
@@ -63,11 +63,6 @@ src_install() {
 	dodir /etc/${PN}
 	cp -pR themes/* ${D}/etc/${PN}
 
-	# link default config for boot images if not already set
-	if [ ! -e ${ROOT}/etc/bootsplash/default ]; then
-		dosym ./gentoo /etc/bootsplash/default
-	fi
-
 	exeinto /etc/init.d
 	doexe misc/bootsplash
 
diff --git a/media-gfx/splash-themes-gentoo/ChangeLog b/media-gfx/splash-themes-gentoo/ChangeLog
index 21e1c157792e..2a3d19457951 100644
--- a/media-gfx/splash-themes-gentoo/ChangeLog
+++ b/media-gfx/splash-themes-gentoo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splash-themes-gentoo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/ChangeLog,v 1.5 2007/02/15 15:23:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/ChangeLog,v 1.6 2007/02/17 11:39:43 spock Exp $
+
+  17 Feb 2007; Michał Januszewski <spock@gentoo.org>
+  splash-themes-gentoo-20050429.ebuild:
+  Remove invalid usage of $ROOT (bug #167285).
 
   15 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   splash-themes-gentoo-20050429.ebuild:
diff --git a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild
index 6e60418b630d..1d758c48e5dc 100644
--- a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild
+++ b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild,v 1.5 2007/02/15 15:23:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20050429.ebuild,v 1.6 2007/02/17 11:39:43 spock Exp $
 
 DESCRIPTION="A collection of Gentoo themes for splashutils."
 HOMEPAGE="http://dev.gentoo.org/~spock/"
@@ -16,8 +16,4 @@ RESTRICT="binchecks strip"
 src_install() {
 	dodir /etc/splash/{emergence,gentoo}
 	cp -pR ${WORKDIR}/{emergence,gentoo} ${D}/etc/splash
-
-	if [ ! -e ${ROOT}/etc/splash/default ]; then
-		dosym /etc/splash/emergence /etc/splash/default
-	fi
 }
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 8448d52f6fb9..f3423c5fe845 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.72 2007/02/10 14:23:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.73 2007/02/17 11:36:41 spock Exp $
+
+  17 Feb 2007; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.3-r2.ebuild, splashutils-1.3-r3.ebuild:
+  Remove invalid usage of $ROOT (bug #167285).
 
   10 Feb 2007; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.1.9.10-types_h.patch, splashutils-1.1.9.10-r1.ebuild:
diff --git a/media-gfx/splashutils/splashutils-1.3-r2.ebuild b/media-gfx/splashutils/splashutils-1.3-r2.ebuild
index 5aef54de0ef4..ebcf07db1918 100644
--- a/media-gfx/splashutils/splashutils-1.3-r2.ebuild
+++ b/media-gfx/splashutils/splashutils-1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r2.ebuild,v 1.6 2007/01/27 15:40:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r2.ebuild,v 1.7 2007/02/17 11:36:41 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -76,7 +76,7 @@ src_unpack() {
 	sed -i -e 's#$(LDLIBS) -static#$(LDLIBS) -L/usr/lib/nptl -static#' Makefile
 
 	# Check whether the kernel tree has been patched with fbsplash.
-	if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
+	if [[ ! -e /usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
 		ewarn "The kernel tree against which dev-libs/klibc was built was not patched"
 		ewarn "with a compatible version of fbsplash. Splashutils will be compiled"
 		ewarn "without fbsplash support (ie. verbose mode will not work)."
@@ -110,7 +110,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
+	if [[ ! -e /usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
 		myconf="--without-fbsplash"
 	else
 		myconf="--with-fbsplash"
diff --git a/media-gfx/splashutils/splashutils-1.3-r3.ebuild b/media-gfx/splashutils/splashutils-1.3-r3.ebuild
index f6049ab45082..0c865c1140bc 100644
--- a/media-gfx/splashutils/splashutils-1.3-r3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r3.ebuild,v 1.4 2007/01/27 15:40:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r3.ebuild,v 1.5 2007/02/17 11:36:41 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -76,7 +76,7 @@ src_unpack() {
 	sed -i -e 's#$(LDLIBS) -static#$(LDLIBS) -L/usr/lib/nptl -static#' Makefile
 
 	# Check whether the kernel tree has been patched with fbsplash.
-	if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
+	if [[ ! -e /usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
 		ewarn "The kernel tree against which dev-libs/klibc was built was not patched"
 		ewarn "with a compatible version of fbsplash. Splashutils will be compiled"
 		ewarn "without fbsplash support (ie. verbose mode will not work)."
@@ -113,7 +113,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
-	if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
+	if [[ ! -e /usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
 		myconf="--without-fbsplash"
 	else
 		myconf="--with-fbsplash"