diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-04-10 09:08:03 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-04-10 09:08:03 +0000 |
| commit | b56343f3ee3768fc5d8bfd0e3a0aef442900529e (patch) | |
| tree | 9e455f875439471ab26a308dab1877840cdc230b /games-fps | |
| parent | error messages (Manifest recommit) (diff) | |
| download | gentoo-2-b56343f3ee3768fc5d8bfd0e3a0aef442900529e.tar.gz gentoo-2-b56343f3ee3768fc5d8bfd0e3a0aef442900529e.tar.bz2 gentoo-2-b56343f3ee3768fc5d8bfd0e3a0aef442900529e.zip | |
don't rdepend on sed; error check sed; use flag tidy
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/duke3d/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/duke3d/duke3d-20030817-r1.ebuild | 43 |
2 files changed, 33 insertions, 16 deletions
diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog index 0522584ba191..03f0a305d592 100644 --- a/games-fps/duke3d/ChangeLog +++ b/games-fps/duke3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/duke3d # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.9 2004/03/19 16:51:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.10 2004/04/10 09:08:03 mr_bones_ Exp $ + + 10 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> + duke3d-20030817-r1.ebuild: + don't rdepend on sed; error check sed; use flag tidy 28 Nov 2003; David Holm <dholm@gentoo.org> duke3d-20030817-r1.ebuild: nasm is only available on x86 and timidity-eawpatches is only available on diff --git a/games-fps/duke3d/duke3d-20030817-r1.ebuild b/games-fps/duke3d/duke3d-20030817-r1.ebuild index 5ce49a4cf4af..9e74602f619b 100644 --- a/games-fps/duke3d/duke3d-20030817-r1.ebuild +++ b/games-fps/duke3d/duke3d-20030817-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20030817-r1.ebuild,v 1.10 2004/03/19 16:51:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20030817-r1.ebuild,v 1.11 2004/04/10 09:08:03 mr_bones_ Exp $ ECVS_PASS="anonymous" ECVS_SERVER="icculus.org:/cvs/cvsroot" @@ -17,20 +17,20 @@ SLOT="0" KEYWORDS="x86 ppc" IUSE="perl opengl" # nophysfs" -DEPEND="virtual/x11 - x86? ( dev-lang/nasm ) - >=sys-apps/sed-4 +RDEPEND="virtual/x11 media-libs/libsdl media-libs/sdl-mixer media-sound/timidity++ media-sound/timidity-eawpatches opengl? ( virtual/opengl )" -# !nophysfs? ( dev-games/physfs )" +DEPEND="${RDEPEND} + x86? ( dev-lang/nasm ) + >=sys-apps/sed-4" S="${WORKDIR}/${ECVS_MODULE}" -use_tf() { [ `use ${1}` ] && echo true || echo false; } -use_ft() { [ `use ${1}` ] && echo false || echo true; } +use_tf() { [ use ${1} && echo true || echo false; } +use_ft() { [ use ${1} && echo false || echo true; } src_unpack() { local fromcvs=0 @@ -49,18 +49,31 @@ src_unpack() { sed -i \ -e "/^useperl := /s:=.*:= `use_tf perl`:" \ -e "/^useopengl := /s:=.*:= `use_tf opengl`:" \ - -e "/^usephysfs := /s:=.*:= false:" \ - Makefile - [ `use x86` ] && sed -i 's:^#USE_ASM:USE_ASM:' Makefile + -e "/^usephysfs := /s:=.*:= false:" Makefile \ + || die "sed Makefile failed" + if use x86 ; then + sed -i \ + -e 's:^#USE_ASM:USE_ASM:' Makefile \ + || die "sed Makefile failed (x86)" + fi epatch ${FILESDIR}/${PV}-buildengine-makefile-cflags.patch - sed -i 's:/usr/lib/perl5/i386-linux/CORE/libperl.a::' Makefile + sed -i \ + -e 's:/usr/lib/perl5/i386-linux/CORE/libperl.a::' Makefile \ + || die "sed Makefile failed" # configure duke3d cd ${S}/source epatch ${FILESDIR}/${PV}-duke3d-makefile-opts.patch - [ `use x86` ] && sed -i '/^#use_asm/s:#::' Makefile - [ `use opengl` ] && sed -i '/^#use_opengl/s:#::' Makefile -# [ `use nophysfs` ] || sed -i '/^#use_physfs/s:#::' Makefile + if use x86 ; then + sed -i \ + -e '/^#use_asm/s:#::' Makefile \ + || die "sed Makefile failed" + fi + if use opengl ; then + sed -i \ + -e '/^#use_opengl/s:#::' Makefile \ + || die "sed Makefile failed" + fi } src_compile() { @@ -75,7 +88,7 @@ src_compile() { src_install() { dogamesbin ${FILESDIR}/duke3d dosed "s:GENTOO_DIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/duke3d - newgamesbin source/duke3d duke3d.bin + newgamesbin source/duke3d duke3d.bin || die "newgamesbin failed" dodoc readme.txt |