Change hard-coded /opt to GAMES_PREFIX_OPT.

Package-Manager: portage-2.1.1

5 files changed, 54 insertions, 49 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/Manifest b/games-fps/ut2003-demo/Manifest
index 4fa126fb8993..5a50845fa919 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX benchmark 1130 RMD160 51ff1f650dbc263af2ebe8e976e033fa63dbf62b SHA1 17d8334fb9b48531648e4a320eb0d9521a237367 SHA256 57df3b3da3a056ceaade7c1630d0417eacb23627043ece7728c4ceefc3847d27 size 1130
-MD5 65c92c0f20bdebbc7369012b63a17f52 files/benchmark 1130
-RMD160 51ff1f650dbc263af2ebe8e976e033fa63dbf62b files/benchmark 1130
-SHA256 57df3b3da3a056ceaade7c1630d0417eacb23627043ece7728c4ceefc3847d27 files/benchmark 1130
-AUX results.py 1461 RMD160 0a39ae382a1a42a3d6bcc795fd7c0b52a84eb3e1 SHA1 967952f180a5ef8e5b2aafb0028cc01dfa031490 SHA256 3c492242e044921fa33e0628eb497be23c0584a0eef3f8eb1b4505ef168c92f7 size 1461
+AUX benchmark 1180 RMD160 01b1d821f58a297eea8125cc038f3bfc50d74159 SHA1 9e810c71e658ee698b41de35bbff8e931b738a1a SHA256 33c890051ecab7a2d136d413c18d20078675ff0e215eb9df7b7ac6380e2db0fc
+MD5 35c8098304d7e4912fae967e18bd0234 files/benchmark 1180
+RMD160 01b1d821f58a297eea8125cc038f3bfc50d74159 files/benchmark 1180
+SHA256 33c890051ecab7a2d136d413c18d20078675ff0e215eb9df7b7ac6380e2db0fc files/benchmark 1180
+AUX results.py 1461 RMD160 0a39ae382a1a42a3d6bcc795fd7c0b52a84eb3e1 SHA1 967952f180a5ef8e5b2aafb0028cc01dfa031490 SHA256 3c492242e044921fa33e0628eb497be23c0584a0eef3f8eb1b4505ef168c92f7
 MD5 1cc2aecbe8968fa325a6e49b7f71f2ca files/results.py 1461
 RMD160 0a39ae382a1a42a3d6bcc795fd7c0b52a84eb3e1 files/results.py 1461
 SHA256 3c492242e044921fa33e0628eb497be23c0584a0eef3f8eb1b4505ef168c92f7 files/results.py 1461
-AUX results.sh 2103 RMD160 46e2bc5a77aa7f7dddb9c1daeebf1596b6580249 SHA1 9a004cb43d2d354ef762dfa2139021e27c2a1163 SHA256 adfe5785d1ae3a368a2e9a4688822fec2118746a0ebaa977c8fcdb8de1af516c size 2103
+AUX results.sh 2103 RMD160 46e2bc5a77aa7f7dddb9c1daeebf1596b6580249 SHA1 9a004cb43d2d354ef762dfa2139021e27c2a1163 SHA256 adfe5785d1ae3a368a2e9a4688822fec2118746a0ebaa977c8fcdb8de1af516c
 MD5 b9b76d93d292d5f73481c37ff7c41454 files/results.sh 2103
 RMD160 46e2bc5a77aa7f7dddb9c1daeebf1596b6580249 files/results.sh 2103
 SHA256 adfe5785d1ae3a368a2e9a4688822fec2118746a0ebaa977c8fcdb8de1af516c files/results.sh 2103
-AUX ut2003-demo 679 RMD160 8febf324ca13c5f44844ec68972dc9bb9f1adecd SHA1 749e54b2d2afef2d53ebd9df3a988abd474b0f31 SHA256 5d0e573f892a2ff364e5842bcbf84cc461e8a9722c6041aa870d632b8c467366 size 679
-MD5 4605ca0fbc6b80d2980c183e00771be3 files/ut2003-demo 679
-RMD160 8febf324ca13c5f44844ec68972dc9bb9f1adecd files/ut2003-demo 679
-SHA256 5d0e573f892a2ff364e5842bcbf84cc461e8a9722c6041aa870d632b8c467366 files/ut2003-demo 679
-DIST UT2003CrashFix.zip 2764 RMD160 647c14d1b6574e4c117426a1a21e1f0e3d846160 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 size 2764
-DIST ut2003-demo-misc.tar.bz2 31851 RMD160 54f9f746389a752184a223f2fc0d44818d5eb825 SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced size 31851
-DIST ut2003demo-lnx-2206.sh.bin 137253079 RMD160 db31bfdfd031dc7394f9d2a84f89b11af7a460c5 SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173 size 137253079
-EBUILD ut2003-demo-2206-r3.ebuild 3422 RMD160 6a56b660fff2c80284e8e02a46af7880a404075e SHA1 6606f71b7471868dfbda9713479b999fc31fd31b SHA256 a7917fc0c46507a91bb24d2ee0498c66bb011bb0b3689e398d9398f135e78835 size 3422
-MD5 e166c71ac14d5ffdced64e9d85ac70a5 ut2003-demo-2206-r3.ebuild 3422
-RMD160 6a56b660fff2c80284e8e02a46af7880a404075e ut2003-demo-2206-r3.ebuild 3422
-SHA256 a7917fc0c46507a91bb24d2ee0498c66bb011bb0b3689e398d9398f135e78835 ut2003-demo-2206-r3.ebuild 3422
-MISC ChangeLog 6656 RMD160 932e1180ba63cd3b895e093cb3364fb7819c195d SHA1 f2f07bb36720efe5d7da3ef77776b76195e55cf8 SHA256 334206a7180f85516b4638e9c047f1c1c2435dc040db727f8350cd0c7104fb4e size 6656
-MD5 23b07afa0f820416d3f835e402bcb5ee ChangeLog 6656
-RMD160 932e1180ba63cd3b895e093cb3364fb7819c195d ChangeLog 6656
-SHA256 334206a7180f85516b4638e9c047f1c1c2435dc040db727f8350cd0c7104fb4e ChangeLog 6656
-MISC metadata.xml 607 RMD160 29edc49f7f222cbe32ce2c89050e754f4bb0156f SHA1 385129c0ec5c75ed6870de4b77891eae48ac25be SHA256 a7245eb0e1eaa658e9eb48539ece13de36c0859d2ad89d4cc97a968501a161a3 size 607
+AUX ut2003-demo 692 RMD160 6ee19137378fc8db596847a948bbac9f96be88b0 SHA1 4974b261221df35fc89668ff8c7b8155b04dda61 SHA256 a40b124f93f8f47c5823ddec5234eef4c249e7f488a69fbb0f0949921d92474b
+MD5 68a3cf54360ab9b7666c614f8b53432b files/ut2003-demo 692
+RMD160 6ee19137378fc8db596847a948bbac9f96be88b0 files/ut2003-demo 692
+SHA256 a40b124f93f8f47c5823ddec5234eef4c249e7f488a69fbb0f0949921d92474b files/ut2003-demo 692
+DIST UT2003CrashFix.zip 2764 RMD160 647c14d1b6574e4c117426a1a21e1f0e3d846160 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813
+DIST ut2003-demo-misc.tar.bz2 31851 RMD160 54f9f746389a752184a223f2fc0d44818d5eb825 SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced
+DIST ut2003demo-lnx-2206.sh.bin 137253079 RMD160 db31bfdfd031dc7394f9d2a84f89b11af7a460c5 SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173
+EBUILD ut2003-demo-2206-r3.ebuild 3543 RMD160 8fdf40f35c4bbbbc03b7bdf24ea5362e83363ae7 SHA1 06d998e8c07cc3c6adcfafa3a263935ea018e2b7 SHA256 b76fe7019487d052a95e0f8696ad04e52d8856b228e5ed63c4d4a6ad82b30fda
+MD5 d690e05b615391af34aaea58e4ad3419 ut2003-demo-2206-r3.ebuild 3543
+RMD160 8fdf40f35c4bbbbc03b7bdf24ea5362e83363ae7 ut2003-demo-2206-r3.ebuild 3543
+SHA256 b76fe7019487d052a95e0f8696ad04e52d8856b228e5ed63c4d4a6ad82b30fda ut2003-demo-2206-r3.ebuild 3543
+MISC ChangeLog 6824 RMD160 367ea3c6c46f34b8c0818e1e3734b17a787b37cf SHA1 b2aef9bbc5d9cf9def5cc4de1c116e3ebccca23a SHA256 442d2750efd63380bddc8b451cf76a40352f663934f2c73046c9e6b30b9ce611
+MD5 f9cb728ac43c2ddf6bc397e8e14bf363 ChangeLog 6824
+RMD160 367ea3c6c46f34b8c0818e1e3734b17a787b37cf ChangeLog 6824
+SHA256 442d2750efd63380bddc8b451cf76a40352f663934f2c73046c9e6b30b9ce611 ChangeLog 6824
+MISC metadata.xml 607 RMD160 29edc49f7f222cbe32ce2c89050e754f4bb0156f SHA1 385129c0ec5c75ed6870de4b77891eae48ac25be SHA256 a7245eb0e1eaa658e9eb48539ece13de36c0859d2ad89d4cc97a968501a161a3
 MD5 d1603da79c3c68c905ab4524a4e2152d metadata.xml 607
 RMD160 29edc49f7f222cbe32ce2c89050e754f4bb0156f metadata.xml 607
 SHA256 a7245eb0e1eaa658e9eb48539ece13de36c0859d2ad89d4cc97a968501a161a3 metadata.xml 607
@@ -36,9 +36,9 @@ MD5 6a2a66566b886ff9c36e44bc08e5bf45 files/digest-ut2003-demo-2206-r3 747
 RMD160 a7d53e20c0a0c3fa8d4c8519f0806d539e1fd7dd files/digest-ut2003-demo-2206-r3 747
 SHA256 84d7ca286b9387f2ae1c563a3925dd3e98b219c824660cfe6eb1589f37a988ad files/digest-ut2003-demo-2206-r3 747
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEUSK5W78445TWHXcRAgcHAJ0bZqN4Ct2fyADZ7VTV63WT7rdXAwCfZX7X
-FINeYv0Gl2bVS/2xlRA19n4=
-=ouqi
+iD8DBQFFCwyIkT4lNIS36YERAow1AJ9/cNf1PHBqPuNT5i+K+fxie8nTjgCgrNcO
+HMy78DigaVeKP9JEjtker/0=
+=TKbR
 -----END PGP SIGNATURE-----
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