use games eclass; more alsa checking; fix deps

3 files changed, 29 insertions, 23 deletions

diff --git a/games-emulation/dosbox-cvs/ChangeLog b/games-emulation/dosbox-cvs/ChangeLog
index d3d76ba62acf..8708a53456c9 100644
--- a/games-emulation/dosbox-cvs/ChangeLog
+++ b/games-emulation/dosbox-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/dosbox-cvs
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox-cvs/ChangeLog,v 1.4 2004/02/28 18:27:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox-cvs/ChangeLog,v 1.5 2004/03/05 19:48:57 mr_bones_ Exp $
+
+  05 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  dosbox-cvs-20030809.ebuild:
+  use games eclass; more alsa checking; fix deps
 
   28 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
   dosbox-cvs-20030809.ebuild:
diff --git a/games-emulation/dosbox-cvs/Manifest b/games-emulation/dosbox-cvs/Manifest
index 5683a58b9f71..607ffe44402c 100644
--- a/games-emulation/dosbox-cvs/Manifest
+++ b/games-emulation/dosbox-cvs/Manifest
@@ -1,4 +1,4 @@
-MD5 2d593f07c4b66245c4926daee6814518 ChangeLog 655
-MD5 e604a9a5a24ddf28b50fd730e3fbded0 dosbox-cvs-20030809.ebuild 1243
+MD5 6b81e72af2a5896067fa6a3ed17e777a ChangeLog 790
+MD5 9b4192cdb30120a88b064fa2edff6567 dosbox-cvs-20030809.ebuild 1155
 MD5 95e2b5bfd7767aeae061c77f7e1a055e metadata.xml 221
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-dosbox-cvs-20030809 0
diff --git a/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild b/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild
index b432f643427a..2f2be8057fae 100644
--- a/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild
+++ b/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild
@@ -1,27 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild,v 1.5 2004/02/28 18:27:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox-cvs/dosbox-cvs-20030809.ebuild,v 1.6 2004/03/05 19:48:57 mr_bones_ Exp $
+
+inherit games cvs
 
 DESCRIPTION="DOS Emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/"
 
 KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
-IUSE="alsa"
+IUSE="alsa opengl"
 SLOT="0"
 
-# don't install this package and the stable one at the same time.
-# they use the same binary names.
-DEPEND="sys-libs/ncurses
+DEPEND="virtual/glibc
+	alsa? ( media-libs/alsa-lib )
+	opengl? ( virtual/opengl )
 	>=media-libs/libsdl-1.2.0
-	media-libs/libpng
 	sys-libs/zlib
-	media-libs/sdl-net
-	alsa? ( media-libs/alsa-lib )
-	!games-emulation/dosbox"
-
-inherit cvs debug flag-o-matic
-
+	media-libs/libpng
+	media-libs/sdl-net"
 
 ECVS_SERVER="cvs.sourceforge.net:/cvsroot/dosbox"
 ECVS_MODULE="dosbox"
@@ -29,17 +26,22 @@ ECVS_TOP_DIR="${DISTDIR}/cvs-src/${PN}"
 S="${WORKDIR}/${ECVS_MODULE}"
 
 src_compile() {
-	strip-flags
-	ln -s /usr/include/SDL/*.h ./include/ || \
-		die "Linking SDL-includes failed"
-	./autogen.sh --prefix=/usr --host=${CHOST} || \
-		die "autogen.sh failed"
-	econf `use_enable alsa alsatest` || die
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || \
-		die "emake failed"
+	local myconf=""
+
+	if ! use alsa ; then
+		myconf="--without-alsa-prefix --without-alsa-inc-prefix --disable-alsatest"
+	fi
+	./autogen.sh || die "autogen.sh failed"
+	egamesconf \
+		--disable-dependency-tracking \
+		${myconf} \
+		`use_enable opengl` \
+			|| die
+	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
+	prepgamesdirs
 }