--- nexuiz-1.5-orig	2006-03-20 17:27:59.000000000 +0000
+++ nexuiz-1.5.ebuild	2006-03-20 18:21:54.000000000 +0000
@@ -47,11 +47,21 @@
 dir=${GAMES_DATADIR}/${PN}
 exe=${PN}
 
+default_client() {
+	if use opengl || ( ! use dedicated && ! use sdl )
+	then
+		# Build default client
+		return 0
+	fi
+	return 1
+}
+
 pkg_setup() {
-	if ! use dedicated && ! use sdl && ! use opengl
+	if default_client && ! use opengl
 	then
 		einfo "Defaulting to OpenGL client"
 	fi
+
 	games_pkg_setup
 }
 
@@ -69,7 +79,7 @@
 }
 
 src_compile() {
-	if use opengl
+	if default_client
 	then
 		emake cl-release \
 			CFLAGS_RELEASE="" OPTIM_RELEASE="" \
@@ -92,29 +102,18 @@
 			CFLAGS_COMMON="${CFLAGS}" \
 			|| die "emake dedicated failed"
 	fi
-
-	if ! use dedicated && ! use sdl && ! use opengl
-	then
-		emake cl-release \
-			CFLAGS_RELEASE="" OPTIM_RELEASE="" \
-			CFLAGS_COMMON="${CFLAGS}" \
-			|| die "emake cl-release failed"
-	fi
 }
 
 src_install() {
 	insinto "${dir}"
 	exeinto "${dir}"
 
-	if use opengl || use sdl
-	then
-		newicon darkplaces72x72.png ${PN}.png
-	elif ! use dedicated && ! use sdl && ! use opengl
+	if default_client || use sdl
 	then
 		newicon darkplaces72x72.png ${PN}.png
 	fi
 
-	if use opengl
+	if default_client
 	then
 		newexe darkplaces-glx ${exe} || die "newexe glx failed"
 		games_make_wrapper ${PN} ./${exe} "${dir}"
@@ -134,13 +133,6 @@
 		games_make_wrapper ${PN}-ded ./${PN}-ded "${dir}"
 	fi
 
-	if ! use dedicated && ! use sdl && ! use opengl
-	then
-		newexe darkplaces-glx ${exe} || die "newexe glx failed"
-		games_make_wrapper ${PN} ./${exe} "${dir}"
-		make_desktop_entry ${PN} Nexuiz ${PN}.png
-	fi
-
 	cd "${WORKDIR}/${MY_PN}"
 	insinto "${dir}/data"
 	doins -r data/* || die "doins data failed"