Change hard-coded /opt to GAMES_PREFIX_OPT.

(Portage version: 2.1.1)

4 files changed, 28 insertions, 23 deletions

diff --git a/games-fps/ut2003-demo/ChangeLog b/games-fps/ut2003-demo/ChangeLog
index 562a899f0fb7..c9719608766e 100644
--- a/games-fps/ut2003-demo/ChangeLog
+++ b/games-fps/ut2003-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2003-demo
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.22 2006/04/27 19:59:38 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.23 2006/09/15 20:26:41 wolf31o2 Exp $
+
+  15 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/benchmark,
+  files/ut2003-demo, ut2003-demo-2206-r3.ebuild:
+  Change hard-coded /opt to GAMES_PREFIX_OPT.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org>
   files/digest-ut2003-demo-2206-r3, Manifest:
diff --git a/games-fps/ut2003-demo/files/benchmark b/games-fps/ut2003-demo/files/benchmark
index 0e2f39d9b525..2047897da9ab 100644
--- a/games-fps/ut2003-demo/files/benchmark
+++ b/games-fps/ut2003-demo/files/benchmark
@@ -5,7 +5,7 @@
 
 # Tweaks by Daniel Robbins <drobbins@gentoo.org> 25 Feb 2003
 
-STUFF=/opt/ut2003-demo/Benchmark/Stuff
+STUFF=GAMES_PREFIX_OPT/ut2003-demo/Benchmark/Stuff
 MYPATH=${HOME}/.ut2003/Benchmark
 TEMPLOG=${MYPATH}/benchmark.log
 LOG=${MYPATH}/bench.log
@@ -18,8 +18,8 @@ touch ${TEMPLOG} ${LOG}
 date > $LOG
 
 echo ">> Starting benchmark"
-cd /opt/ut2003-demo/System
-for BENCH in /opt/ut2003-demo/Benchmark/*-*.sh
+cd GAMES_PREFIX_OPT//ut2003-demo/System
+for BENCH in GAMES_PREFIX_OPT//ut2003-demo/Benchmark/*-*.sh
 do
 	echo "Running ${BENCH} with MinDetail" 
 	${BENCH} -ini=${STUFF}/MinDetail.ini -userini=${STUFF}/MinDetailUser.ini &> /dev/null
@@ -33,5 +33,5 @@ do
 done
 
 echo ">> Benchmark complete"
-/opt/ut2003-demo/Benchmark/results.sh
+GAMES_PREFIX_OPT/ut2003-demo/Benchmark/results.sh
 echo ">> Use 'ut2003-demo --results' to show these results again (without benchmarking)"
diff --git a/games-fps/ut2003-demo/files/ut2003-demo b/games-fps/ut2003-demo/files/ut2003-demo
index 592cd17ad1c7..56d7e10e6a73 100644
--- a/games-fps/ut2003-demo/files/ut2003-demo
+++ b/games-fps/ut2003-demo/files/ut2003-demo
@@ -2,7 +2,7 @@
 # Written by phoen][x <phoenix@gentoo.org>, Sep/19/2002
 # Modifications, enhancements or bugs? Mail me.
 
-INSTALL="/opt/ut2003-demo"
+INSTALL="GAMES_PREFIX_OPT//ut2003-demo"
 
 case ${1} in
     "--results")
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index 77b35680e317..28b8f89894db 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.17 2006/04/14 12:00:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.18 2006/09/15 20:26:41 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -18,7 +18,7 @@ RESTRICT="strip"
 
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/opengl
-	=virtual/libstdc++-3.3
+	~virtual/libstdc++-3.3
 	x86? (
 		|| (
 			(
@@ -31,55 +31,56 @@ RDEPEND="virtual/opengl
 S="${WORKDIR}"
 
 GAMES_CHECK_LICENSE="yes"
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
 
 src_unpack() {
-	unpack_makeself ${DISTDIR}/ut2003demo-lnx-${PV}.sh.bin \
+	unpack_makeself "${DISTDIR}"/ut2003demo-lnx-${PV}.sh.bin \
 		|| die "unpacking demo"
-	unzip "${DISTDIR}/UT2003CrashFix.zip" \
+	unzip "${DISTDIR}"/UT2003CrashFix.zip \
 		|| die "unpacking crash-fix"
-	tar -zxf setupstuff.tar.gz || die
+	unpack setupstuff.tar.gz || die
 }
 
 src_install() {
-	local f
-
 	einfo "This will take a while ... go get a pizza or something"
-
 	dodir "${dir}"
 
 	tar -jxvf ut2003lnx_demo.tar.bz2 -C "${Ddir}" || die
-	tar -jxvf "${DISTDIR}/${PN}-misc.tar.bz2" -C "${Ddir}" || die
+	tar -jxvf "${DISTDIR}"/${PN}-misc.tar.bz2 -C "${Ddir}" || die
 
 	# fix the benchmark configurations to use SDL rather than the Windows driver
+	local f
 	for f in MaxDetail.ini MinDetail.ini ; do
 		sed -i \
 			-e 's/RenderDevice=D3DDrv.D3DRenderDevice/\;RenderDevice=D3DDrv.D3DRenderDevice/' \
 			-e 's/ViewportManager=WinDrv.WindowsClient/\;ViewportManager=WinDrv.WindowsClient/' \
 			-e 's/\;RenderDevice=OpenGLDrv.OpenGLRenderDevice/RenderDevice=OpenGLDrv.OpenGLRenderDevice/' \
 			-e 's/\;ViewportManager=SDLDrv.SDLClient/ViewportManager=SDLDrv.SDLClient/' \
-			"${Ddir}/Benchmark/Stuff/${f}" \
+			"${Ddir}"/Benchmark/Stuff/${f} \
 			|| die "sed ${dir}/Benchmark/Stuff/${f} failed"
 	done
 
 	# have the benchmarks run the nifty wrapper script rather than ../System/ut2003-bin directly
-	for f in "${Ddir}/Benchmark/"*-*.sh ; do
+	for f in "${Ddir}"/Benchmark/*-*.sh ; do
 		sed -i \
 			-e 's:\.\./System/ut2003-bin:../ut2003_demo:' "${f}" \
 			|| die "sed ${f} failed"
 	done
 
 	# Wrapper and benchmark-scripts
-	dogamesbin "${FILESDIR}/ut2003-demo" || die "dogamesbin failed"
-	exeinto "${dir}/Benchmark"
+	dogamesbin "${FILESDIR}"/ut2003-demo || die "dogamesbin failed"
+	exeinto "${dir}"/Benchmark
 	doexe "${FILESDIR}/"{benchmark,results.sh} || die "doexe failed"
+	dosed "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
+		"${GAMES_BINDIR}"/benchmark "${dir}"/Benchmark/benchmark \
+		|| die "sed"
 
 	# Here we apply DrSiN's crash patch
-	cp "${S}/CrashFix/System/crashfix.u" "${Ddir}/System" \
+	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System \
 		|| die "CrashFix failed"
 
-ed "${Ddir}/System/Default.ini" >/dev/null 2>&1 <<EOT
+ed "${Ddir}"/System/Default.ini >/dev/null 2>&1 <<EOT
 $
 ?Engine.GameInfo?
 a