--- /usr/portage/games-action/armagetronad/armagetronad-0.2.7.1.ebuild	2006-01-22 20:35:40.000000000 +0100
+++ armagetronad-0.2.7.1-r1.ebuild	2006-02-03 22:01:25.000000000 +0100
@@ -8,7 +8,7 @@
 DESCRIPTION="3d tron lightcycles, just like the movie"
 HOMEPAGE="http://armagetronad.sourceforge.net/"
 SRC_URI="mirror://sourceforge/armagetronad/${P}.tar.bz2
-	opengl? (
+	!dedicated? (
 		http://armagetron.sourceforge.net/addons/moviesounds_fq.zip
 		http://armagetron.sourceforge.net/addons/moviepack.zip
 	)"
@@ -16,25 +16,23 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="dedicated opengl"
+IUSE="dedicated"
 
-RDEPEND="sys-libs/zlib
-	opengl? (
+RDEPEND="
+	!dedicated? (
+		sys-libs/zlib
 		virtual/opengl
+		virtual/glu
 		media-libs/libsdl
 		media-libs/sdl-image
-		media-libs/sdl-mixer
 		media-libs/jpeg
 		media-libs/libpng )"
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	|| (
-		x11-libs/libX1
-		virtual/x11 )"
+	!dedicated? ( app-arch/unzip )"
 
 src_compile() {
 	filter-flags -fno-exceptions
-	if use dedicated && ! use opengl; then
+	if use dedicated; then
 		egamesconf --disable-glout || die "egamesconf failed"
 	else
 		egamesconf || die "egamesconf failed"
@@ -49,18 +47,16 @@
 	dohtml doc/net/*.html
 	newicon tron.ico ${PN}.ico
 	exeinto "${GAMES_LIBDIR}/${PN}"
-	if use dedicated && ! use opengl; then
+	if use dedicated; then
 		doexe src/tron/${PN}-dedicated || die "copying files"
 	else
 		doexe src/tron/${PN} || die "copying files"
 	fi
 	doexe src/network/armagetronad-* || die "copying files"
 	insinto "${GAMES_DATADIR}/${PN}"
-	if use dedicated && ! use opengl; then
-		doins -r log language || die "copying files"
-	else
-		doins -r arenas models sound textures language log music \
-			|| die "copying files"
+	doins -r log language || die "copying files"
+	if ! use dedicated; then
+		doins -r arenas models sound textures music || die "copying files"
 	fi
 	insinto "${GAMES_SYSCONFDIR}/${PN}"
 	doins -r config/* || die "copying files"
@@ -69,7 +65,7 @@
 	fi
 	cd "${S}"
 	insinto "${GAMES_DATADIR}/${PN}"
-	if use opengl; then
+	if ! use dedicated; then
 		dogamesbin "${FILESDIR}/${PN}"
 		insinto "${GAMES_DATADIR}/${PN}"
 		doins -r ../moviepack ../moviesounds || die "copying movies"