[gentoo-commits] repo/gentoo:master commit in: games-fps/ut2003-demo/

[Michael Sterrett]

commit:     9abb74de765cfa8a57ee07009c2fcf3b264c1939
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 04:51:09 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 04:51:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9abb74de

games-fps/ut2003-demo: add QA_PREBUILT; tidy

Package-Manager: portage-2.2.26

 games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild 
b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index 01d9279..e933177 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -32,11 +32,11 @@ S=${WORKDIR}
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
+QA_PREBUILT="${dir:1}/*.so ${dir:1}/*-bin ${dir:1}/System/libSDL-1.2.so.0"
+
 src_unpack() {
-       unpack_makeself "${DISTDIR}"/ut2003demo-lnx-${PV}.sh.bin \
-               || die "unpacking demo"
-       unzip "${DISTDIR}"/UT2003CrashFix.zip \
-               || die "unpacking crash-fix"
+       unpack_makeself "${DISTDIR}"/ut2003demo-lnx-${PV}.sh.bin || die
+       unzip "${DISTDIR}"/UT2003CrashFix.zip || die
        cd "${S}"
        unpack ./setupstuff.tar.gz || die
        unpack ./ut2003lnx_demo.tar.bz2 || die
@@ -64,29 +64,25 @@ src_install() {
                        -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} \
-                       || die "sed ${dir}/Benchmark/Stuff/${f} failed"
+                       "${Ddir}"/Benchmark/Stuff/${f} || die
        done
 
        # Have the benchmarks run the nifty wrapper script rather than
        # ../System/ut2003-bin directly
        for f in "${Ddir}"/Benchmark/*-*.sh ; do
                sed -i \
-                       -e 's:\.\./System/ut2003-bin:../ut2003_demo:' "${f}" \
-                       || die "sed ${f} failed"
+                       -e 's:\.\./System/ut2003-bin:../ut2003_demo:' "${f}" || 
die
        done
 
        # Wrapper and benchmark-scripts
-       dogamesbin "${FILESDIR}"/ut2003-demo || die "dogamesbin failed"
+       dogamesbin "${FILESDIR}"/ut2003-demo
        exeinto "${dir}"/Benchmark
        doexe "${FILESDIR}/"{benchmark,results.sh}
        sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
-               "${ED}/${GAMES_BINDIR}/${PN}" 
"${ED}/${dir}"/Benchmark/benchmark \
-               || die "sed GAMES_PREFIX_OPT"
+               "${ED}/${GAMES_BINDIR}/${PN}" 
"${ED}/${dir}"/Benchmark/benchmark || die
 
        # Here we apply DrSiN's crash patch
-       cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System \
-               || die "CrashFix failed"
+       cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System || die
 
 ed "${Ddir}"/System/Default.ini >/dev/null 2>&1 <<EOT
 $