diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-03-31 06:47:45 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-03-31 06:47:45 +0000 |
| commit | 5809567ced6c0a02362254db935d948081f61c06 (patch) | |
| tree | 58c1ce8d4480cc1a92016e63437f9ab39ad6d0cc | |
| parent | don't RDEPEND on sed; error check sed; virtual/x11; tidy (Manifest recommit) (diff) | |
| download | gentoo-2-5809567ced6c0a02362254db935d948081f61c06.tar.gz gentoo-2-5809567ced6c0a02362254db935d948081f61c06.tar.bz2 gentoo-2-5809567ced6c0a02362254db935d948081f61c06.zip | |
don't rdepend on nasm, sed
| -rw-r--r-- | games-fps/doomlegacy/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/doomlegacy/doomlegacy-1.41-r1.ebuild | 27 |
2 files changed, 21 insertions, 12 deletions
diff --git a/games-fps/doomlegacy/ChangeLog b/games-fps/doomlegacy/ChangeLog index ed02359027f8..19dd18c9a670 100644 --- a/games-fps/doomlegacy/ChangeLog +++ b/games-fps/doomlegacy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/doomlegacy # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/ChangeLog,v 1.6 2004/02/12 20:24:38 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/ChangeLog,v 1.7 2004/03/31 06:47:45 mr_bones_ Exp $ + + 30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> + doomlegacy-1.41-r1.ebuild: + don't rdepend on nasm, sed 12 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> doomlegacy-1.41-r1.ebuild, metadata.xml: diff --git a/games-fps/doomlegacy/doomlegacy-1.41-r1.ebuild b/games-fps/doomlegacy/doomlegacy-1.41-r1.ebuild index 00882b43516f..dbbe2c8d4258 100644 --- a/games-fps/doomlegacy/doomlegacy-1.41-r1.ebuild +++ b/games-fps/doomlegacy/doomlegacy-1.41-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/doomlegacy-1.41-r1.ebuild,v 1.4 2004/02/12 20:24:38 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/doomlegacy-1.41-r1.ebuild,v 1.5 2004/03/31 06:47:45 mr_bones_ Exp $ -inherit games eutils +inherit eutils games DESCRIPTION="Doom legacy, THE doom port" HOMEPAGE="http://legacy.newdoom.com/" @@ -15,14 +15,19 @@ SLOT="0" KEYWORDS="x86 ppc" IUSE="sdl X dga esd" -DEPEND="x86? ( >=dev-lang/nasm-0.98 ) - >=sys-apps/sed-4 +RDEPEND=" virtual/opengl virtual/x11 esd? ( media-sound/esound ) - sdl? ( media-libs/libsdl media-libs/sdl-mixer )" + sdl? ( + media-libs/libsdl + media-libs/sdl-mixer + )" +DEPEND="${RDEPEND} + x86? ( >=dev-lang/nasm-0.98 ) + >=sys-apps/sed-4" -S=${WORKDIR}/legacy_${PV//.}_src +S="${WORKDIR}/legacy_${PV//.}_src" src_unpack() { unpack ${A} @@ -57,8 +62,8 @@ src_compile() { local makeopts="" local redosnd=0 local interfaces="" - [ `use sdl` ] && interfaces="${interfaces} SDL" - [ `use X` ] && interfaces="${interfaces} X" + use sdl && interfaces="${interfaces} SDL" + use X && interfaces="${interfaces} X" [ -z "${interfaces}" ] && interfaces="X" mkdir ${WORKDIR}/my-bins for i in ${interfaces} ; do @@ -68,9 +73,9 @@ src_compile() { makeopts="SDL=1";; X) makeopts="LINUX=1 X=1" - [ `use x86` ] && makeopts="${makeopts} USEASM=1" - [ `use dga` ] && makeopts="${makeopts} WITH_DGA=1" - [ `use esd` ] && makeopts="${makeopts} HAVE_ESD=1";; + use x86 && makeopts="${makeopts} USEASM=1" + use dga && makeopts="${makeopts} WITH_DGA=1" + use esd && makeopts="${makeopts} HAVE_ESD=1";; esac emake EXTRAOPTS="${CFLAGS}" ${makeopts} || redosnd=1 if [ ${redosnd} -eq 1 ] ; then |