--- stratagus-2.1.ebuild	2006-12-19 11:55:09.000000000 +0000
+++ stratagus-2.2.1.ebuild	2006-12-19 11:54:32.000000000 +0000
@@ -4,7 +4,6 @@
 
 inherit eutils games
 
-MY_PV=040702
 DESCRIPTION="A realtime strategy game engine"
 HOMEPAGE="http://www.stratagus.org/"
 SRC_URI="mirror://sourceforge/stratagus/${P}-src.tar.gz"
@@ -12,44 +11,32 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc flac mp3 mikmod ogg opengl vorbis"
+IUSE="debug doc mikmod mng opengl theora vorbis"
 
 RDEPEND="app-arch/bzip2
 	dev-lang/lua
 	media-libs/libpng
 	media-libs/libsdl
 	sys-libs/zlib
-	flac? ( media-libs/flac )
-	mp3? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
-	ogg? ( vorbis? ( media-libs/libogg media-libs/libvorbis ) )"
+	mng? ( media-libs/libmng )
+	theora? ( media-libs/libtheora )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )"
 
 DEPEND="${RDEPEND}
 	x11-libs/libXt
 	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/stratagus-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/flac-1.1.3.patch
-}
-
+	
 src_compile() {
 	local myconf
 
-	if use ogg && use vorbis ; then
-		myconf="--enable-ogg" \
-	else
-		myconf="--disable-ogg"
-	fi
 	econf \
 		$(use_enable debug) \
 		$(use_with mikmod) \
-		$(use_with flac) \
-		$(use_with mp3 mad) \
+		$(use_with mng) \
 		$(use_with opengl) \
+		$(use_with theora) \
+		$(use_with vorbis) \
 		${myconf} \
 		|| die "econf failed"
 	emake -j1 || die "emake failed"