fix build with USE=-opengl (bug #73391); tidy

diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog
index 0049a6a131bef54f4dffbdc8dfd4e5e733f2f2f7..330dc20ce44f404550debeb3d10745666ac55b1d 100644 (file)
--- a/games-fps/duke3d/ChangeLog
+++ b/games-fps/duke3d/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/duke3d
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.17 2004/08/27 02:45:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.18 2004/12/05 12:15:59 mr_bones_ Exp $
+
+  05 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> duke3d-20040817.ebuild:
+  fix build with USE=-opengl (bug #73391); tidy
 
   26 Aug 2004; Mike Frysinger <vapier@gentoo.org> duke3d-20040817.ebuild
   +files/20040817-endian.patch:

diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index 26a3cd1e35d3118c78278aa996c0977ef9820d35..87ee6847b808a6e26126731be174b6b9e703c5c9 100644 (file)
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8bb821d675a41ee8f106e01127b26cb9 ChangeLog 2570
+MD5 c74fd61c7af2dcaae1ba154e6b6e305c ChangeLog 2701
 MD5 3a1f336e4cfd9b74bc9bacb21ea0b300 metadata.xml 2684
-MD5 96f0a5a28d2d7e6c7d6d3a2d6e888467 duke3d-20040817.ebuild 2839
+MD5 90a74e90c0b32749a4f0d7c1cdce80ee duke3d-20040817.ebuild 2946
 MD5 ccf71074bb15e3a511194a887a3a7040 files/duke3d.cfg 4314
 MD5 d9b4e6eca1f10d7502ce7c8b360ba16b files/network.cfg 398
-MD5 7c796eee05f2a392dd0449339bc37804 files/digest-duke3d-20040817 69
 MD5 6ba6bae3aa96076fbb7dc72e06d93d3d files/20040817-credits.patch 1267
 MD5 50643150138fd99d9cfb2ed68df15e7d files/20040817-duke3d-makefile-opts.patch 863
+MD5 7c796eee05f2a392dd0449339bc37804 files/digest-duke3d-20040817 69
 MD5 b5f62f5d9c612de0355e3ca3db6c5875 files/20040817-gcc34.patch 1886
 MD5 8832de2aa57847fefffa6b1f0695603f files/20040817-endian.patch 772
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBhHRqHTu7gpaalycRAhXlAJ9rEINIyCsQqHa10PV06Pag3Vy5qwCeM5Hw
-PkwZR6XyCfGqVb8boKn1rgw=
-=HMJm
------END PGP SIGNATURE-----

diff --git a/games-fps/duke3d/duke3d-20040817.ebuild b/games-fps/duke3d/duke3d-20040817.ebuild
index 525dbe08ba70c966aba170373fd35173234bfa5f..8d1e8eb4f6f5da9be7125fd6743d0b1f3d751458 100644 (file)
--- a/games-fps/duke3d/duke3d-20040817.ebuild
+++ b/games-fps/duke3d/duke3d-20040817.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.3 2004/08/27 02:45:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.4 2004/12/05 12:15:59 mr_bones_ Exp $
 
 fromcvs=0
 ECVS_MODULE="duke3d"
 if [ ${fromcvs} -eq 1 ] ; then
-ECVS_PASS="anonymous"
-ECVS_SERVER="icculus.org:/cvs/cvsroot"
-inherit cvs
+       ECVS_PASS="anonymous"
+       ECVS_SERVER="icculus.org:/cvs/cvsroot"
+       inherit cvs eutils flag-o-matic games
+else
+       inherit eutils flag-o-matic games
 fi
-inherit eutils flag-o-matic games
 
 DESCRIPTION="port of the original DukeNukem 3D"
 HOMEPAGE="http://icculus.org/projects/duke3d/"
@@ -46,7 +47,7 @@ src_unpack() {
        fi
 
        # configure buildengine
-       cd ${S}/source/buildengine
+       cd "${S}/source/buildengine"
        sed -i \
                -e "/^useperl := / s:=.*:= $(use_tf perl):" \
                -e "/^useopengl := / s:=.*:= $(use_tf opengl):" \
@@ -55,21 +56,26 @@ src_unpack() {
                -e 's:/usr/lib/perl5/i386-linux/CORE/libperl.a::' \
                Makefile \
                || die "sed build Makefile failed"
-       epatch ${FILESDIR}/${PV}-endian.patch
+       epatch "${FILESDIR}/${PV}-endian.patch"
 
        # configure duke3d
-       cd ${S}/source
+       cd "${S}/source"
        epatch "${FILESDIR}/${PV}-credits.patch"
-       epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch" # need to sync features with build engine
+       # need to sync features with build engine
+       epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch"
        epatch "${FILESDIR}/${PV}-gcc34.patch" # compile fixes for GCC 3.4
        sed -i \
-               -e "/^useopengl := / s:=.*:= $(use_tf opengl):" \
-               -e "/^usephysfs := / s:=.*:= false:" \
+               -e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \
+               -e "/^use_physfs := / s:=.*:= false:" \
                Makefile \
                || die "sed duke3d Makefile failed"
        if use x86 ; then
-               sed -i -e 's:^#USE_ASM:USE_ASM:' buildengine/Makefile
-               sed -i -e '/^#use_asm := /s:#::' Makefile
+               sed -i \
+                       -e 's:^#USE_ASM:USE_ASM:' buildengine/Makefile \
+                       || die "sed failed"
+               sed -i \
+                       -e '/^#use_asm := /s:#::' Makefile \
+                       || die "sed failed"
        fi
 
        # causes crazy redefine errors with gcc-3.[2-4].x