tidy; error check

diff --git a/games-fps/quake1/ChangeLog b/games-fps/quake1/ChangeLog
index 634a4342ec4b0e477e1573796312c0491c140979..78f91219d4e7b665312c0a3f4dc53db566920522 100644 (file)
--- a/games-fps/quake1/ChangeLog
+++ b/games-fps/quake1/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/quake1
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1/ChangeLog,v 1.4 2004/06/24 22:43:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1/ChangeLog,v 1.5 2004/11/20 09:33:44 mr_bones_ Exp $
+
+  20 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> quake1-2.40.ebuild:
+  tidy; error check
 
   27 May 2004; Michael Sterrett <mr_bones_@gentoo.org> quake1-2.40.ebuild:
   use fixup

diff --git a/games-fps/quake1/Manifest b/games-fps/quake1/Manifest
index 85deb6e312efddc104737cbefa9f2024c56c3aab..db368e9451ec8c9d125f446aa79cc959921acadd 100644 (file)
--- a/games-fps/quake1/Manifest
+++ b/games-fps/quake1/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1944444e6d9d7a3872ce544e4017528b ChangeLog 418
+MD5 0150abc382202c8e977af7fe635dcccd ChangeLog 515
+MD5 8431d217352ffb495ca1e07c0c09767f quake1-2.40.ebuild 2298
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 8878cee9bd9e4cf7e4e16e609d3b2056 quake1-2.40.ebuild 2268
 MD5 1234946f709d4f661a2030a3b01fab6b files/digest-quake1-2.40 58
 MD5 b9e1b8831a33b812643b9d5f3cab8cf2 files/fix-sys_printf.patch 666
 MD5 08770c3708ba8384c402179f0c247ded files/makefile-gcc2-cflags.patch 815
 MD5 b47df8c86116df21eb3c75ff8d8142e6 files/makefile-gcc3-cflags.patch 878
 MD5 6a5b3a494d26b4f1b8d1063f9a0aa6e4 files/makefile-path-fixes.patch 1539
 MD5 6f4c55f7cf280c7c87e1e5a20934b813 files/makefile-sedable.patch 1064
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBiCVmHTu7gpaalycRAu5yAKCP3/hrcMzRcQGcVSl9yKcqUtFVEACgskdj
-DfDyCaH2maY+r/HS7tpV9cE=
-=OeTU
------END PGP SIGNATURE-----

diff --git a/games-fps/quake1/quake1-2.40.ebuild b/games-fps/quake1/quake1-2.40.ebuild
index 0ab7351cfe338f7cef739a12f1c08cf39c58c0a6..a48411c2dc0b4b507bc786538a2d45f270280394 100644 (file)
--- a/games-fps/quake1/quake1-2.40.ebuild
+++ b/games-fps/quake1/quake1-2.40.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1/quake1-2.40.ebuild,v 1.6 2004/11/03 00:24:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1/quake1-2.40.ebuild,v 1.7 2004/11/20 09:33:44 mr_bones_ Exp $
 
-inherit games eutils gcc
+inherit eutils gcc games
 
 DESCRIPTION="The original Quake engine straight from id !"
 HOMEPAGE="http://www.idsoftware.com/games/quake/quake/"
@@ -32,21 +32,21 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
 
-       epatch ${FILESDIR}/fix-sys_printf.patch
+       epatch "${FILESDIR}/fix-sys_printf.patch"
 
        mv WinQuake/Makefile{.linuxi386,}
        mv QW/Makefile{.Linux,}
 
-       epatch ${FILESDIR}/makefile-path-fixes.patch
+       epatch "${FILESDIR}/makefile-path-fixes.patch"
 
        [ $(gcc-major-version) -eq 3 ] \
-               && epatch ${FILESDIR}/makefile-gcc3-cflags.patch \
-               || epatch ${FILESDIR}/makefile-gcc2-cflags.patch
+               && epatch "${FILESDIR}/makefile-gcc3-cflags.patch" \
+               || epatch "${FILESDIR}/makefile-gcc2-cflags.patch"
        sed -i "s:GENTOO_CFLAGS:${CFLAGS} -DGL_EXT_SHARED=1:" {WinQuake,QW}/Makefile
        cp QW/client/glquake.h{,.orig}
        (echo "#define APIENTRY";cat QW/client/glquake.h.orig) > QW/client/glquake.h
 
-       epatch ${FILESDIR}/makefile-sedable.patch
+       epatch "${FILESDIR}/makefile-sedable.patch"
        if ! use 3dfx ; then
                sed -i 's:^   $(BUILDDIR)/bin/glquake ::' WinQuake/Makefile
                sed -i 's:^   $(BUILDDIR)/bin/glquake.3dfxgl ::' WinQuake/Makefile
@@ -67,15 +67,12 @@ src_unpack() {
 }
 
 src_compile() {
-       cd ${S}/WinQuake
-       make build_release || die "failed to build WinQuake"
-       cd ${S}/QW
-       make build_release || die "failed to build QW"
+       make -C "${S}/WinQuake" build_release || die "failed to build WinQuake"
+       make -C "${S}/QW" build_release || die "failed to build QW"
 }
 
 src_install() {
-       dogamesbin WinQuake/release*/bin/*
-       dogamesbin QW/release*/*qw*
+       dogamesbin WinQuake/release*/bin/* QW/release*/*qw* || die "dogamesbin failed"
        dodoc readme.txt {WinQuake,QW}/*.txt
        prepgamesdirs
 }