Fix error case; tidy

diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index 8eaf20607c8a6b8204f21253896e6d7349d7397b..32636aab6981ef472625c8d93b4a459799a11f5f 100644 (file)
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/ufo-ai
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.8 2004/06/24 23:29:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.9 2004/06/25 06:05:04 mr_bones_ Exp $
+
+  24 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  ufo-ai-0.10.040218.ebuild:
+  Fix error case; tidy
 
   16 May 2004; Mike Frysinger <vapier@gentoo.org> ufo-ai-0.10.040218.ebuild:
   Make sure to filter-flags -fstack-protector #51116 by Alexander Kahl/Peter

diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index 7ac4b7eb1152a8c85df7739c7f576ab4e967fe02..75d25fe4998cc5a0eb74b924082816cd9f7f63b1 100644 (file)
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -1,5 +1,5 @@
-MD5 694f3def45e0c7f797a92dcd11be890f ufo-ai-0.10.040218.ebuild 1392
-MD5 b30c09ee9ba1662135c94f36f833c1a1 ChangeLog 1269
+MD5 4495fa75bf9fb8dae051c21df8886557 ChangeLog 1378
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 741c23ff1ac99c9aaf9ffead77cf26c4 files/digest-ufo-ai-0.10.040218 135
+MD5 afbe6d02c047ad0b05a6241112213a0f ufo-ai-0.10.040218.ebuild 1408
 MD5 6ca39990b18a4bf10c112bb43983024e files/0.10.040218-Makefile.patch 1759
+MD5 741c23ff1ac99c9aaf9ffead77cf26c4 files/digest-ufo-ai-0.10.040218 135

diff --git a/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild b/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild
index 7a7a121006c8c7f2925f93b7ad110f73253a2bd0..719138dedcad590d2940344b90136fe3e17b6c7f 100644 (file)
--- a/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild,v 1.10 2004/06/24 23:29:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-0.10.040218.ebuild,v 1.11 2004/06/25 06:05:04 mr_bones_ Exp $
 
 inherit eutils games flag-o-matic
 
@@ -20,34 +20,34 @@ DEPEND="virtual/glibc
        media-libs/libvorbis
        media-libs/libogg"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_unpack() {
        unpack ${A}
        cd source/linux
-       epatch ${FILESDIR}/${PV}-Makefile.patch
+       epatch "${FILESDIR}/${PV}-Makefile.patch"
 }
 
 src_compile() {
        filter-flags -fstack-protector #51116
-       cd ${S}/source/linux
+       cd "${S}/source/linux"
        make build_release \
                OPTCFLAGS="${CFLAGS}" \
                || die "make failed"
 }
 
 src_install() {
-       dodir ${GAMES_DATADIR}/${PN}
-       cp -rf ${S}/ufo/* ${D}${GAMES_DATADIR}/${PN} || die "copying data"
-       if [ ${ARCH} == x86 ]; then
+       dodir "${GAMES_DATADIR}/${PN}"
+       cp -rf "${S}/ufo/"* "${D}${GAMES_DATADIR}/${PN}" || die "copying data"
+       if use x86 ; then
                ARCH=i386
        fi
-       exeinto ${GAMES_DATADIR}/${PN}
-       doexe ${S}/source/linux/release${ARCH}-glibc/{ref_gl.so,ref_glx.so,ufo} \
-               || "doexe ufo"\ 3
-       exeinto ${GAMES_DATADIR}/${PN}/base
-       doexe ${S}/source/linux/release${ARCH}-glibc/game${ARCH}.so \
+       exeinto "${GAMES_DATADIR}/${PN}"
+       doexe "${S}/source/linux/release${ARCH}-glibc/"{ref_gl.so,ref_glx.so,ufo} \
+               || die "doexe ufo"
+       exeinto "${GAMES_DATADIR}/${PN}/base"
+       doexe "${S}/source/linux/release${ARCH}-glibc/game${ARCH}.so" \
                || die "doexe game${ARCH}.so"
-       games_make_wrapper ufo-ai ./ufo ${GAMES_DATADIR}/${PN}
+       games_make_wrapper ufo-ai ./ufo "${GAMES_DATADIR}/${PN}"
        prepgamesdirs
 }