summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2002-08-04 20:31:18 +0000
committerDaniel Robbins <drobbins@gentoo.org>2002-08-04 20:31:18 +0000
commit0c27fdd27f7af096a5ccf0f2474bff503b9a9d94 (patch)
tree4f320b8958f448f5bbbefec839697e5dc62b1100 /app-emulation/dgen-sdl
parentAdded regedit. (diff)
downloadgentoo-2-0c27fdd27f7af096a5ccf0f2474bff503b9a9d94.tar.gz
gentoo-2-0c27fdd27f7af096a5ccf0f2474bff503b9a9d94.tar.bz2
gentoo-2-0c27fdd27f7af096a5ccf0f2474bff503b9a9d94.zip
conflict fix
Diffstat (limited to 'app-emulation/dgen-sdl')
-rw-r--r--app-emulation/dgen-sdl/dgen-sdl-1.23.ebuild11
1 files changed, 3 insertions, 8 deletions
diff --git a/app-emulation/dgen-sdl/dgen-sdl-1.23.ebuild b/app-emulation/dgen-sdl/dgen-sdl-1.23.ebuild
index cf4fbdc4ac98..b7b4882bb750 100644
--- a/app-emulation/dgen-sdl/dgen-sdl-1.23.ebuild
+++ b/app-emulation/dgen-sdl/dgen-sdl-1.23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dgen-sdl/dgen-sdl-1.23.ebuild,v 1.3 2002/08/04 11:25:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dgen-sdl/dgen-sdl-1.23.ebuild,v 1.4 2002/08/04 20:31:18 drobbins Exp $
S=${WORKDIR}/${P}
DESCRIPTION="DGen/SDL is a Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
@@ -10,13 +10,8 @@ SRC_URI="http://www.pknet.com/~joe/${P}.tar.gz"
SLOT="0"
KEYWORDS="x86"
LICENSE="dgen-sdl"
-
-DEPEND="media-libs/libsdl
- X? ( virtual/X11 )
- opengl? ( virtual/opengl )"
-
-RDEPEND="${DEPEND}
- dev-lang/nasm"
+DEPEND="media-libs/libsdl X? virtual/X11 opengl? virtual/opengl"
+RDEPEND="${DEPEND} dev-lang/nasm"
src_compile() {
local myconf=""