Changed how the default client is determined and closing bug #126985.

Package-Manager: portage-2.1_pre6-r2

3 files changed, 25 insertions, 30 deletions

diff --git a/games-fps/nexuiz/ChangeLog b/games-fps/nexuiz/ChangeLog
index 8e9ac70fa3b5..b4099a4b507a 100644
--- a/games-fps/nexuiz/ChangeLog
+++ b/games-fps/nexuiz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/nexuiz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.5 2006/03/17 19:43:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/ChangeLog,v 1.6 2006/03/20 20:06:00 wolf31o2 Exp $
+
+  20 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> nexuiz-1.5.ebuild:
+  Changed how the default client is determined and closing bug #126985.
 
 *nexuiz-1.5 (17 Mar 2006)
 
diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest
index d9a93a8192b1..d4263f3394b3 100644
--- a/games-fps/nexuiz/Manifest
+++ b/games-fps/nexuiz/Manifest
@@ -1,6 +1,6 @@
-MD5 85922de1435d6ae325e0541ce58cf7d3 ChangeLog 861
-RMD160 db8d2f9625e85352f63f3a9edb11dedc483968de ChangeLog 861
-SHA256 dc13866d27d08f414f15ef5b2a4f9f4e80de53553a87bf4c80f1ef51a647771f ChangeLog 861
+MD5 c79e984bcc105b8e5ea35cbd1a22145c ChangeLog 1007
+RMD160 e54e5c76302c164be53cd873dcee123c1d4a45bc ChangeLog 1007
+SHA256 cd462b22e5a45c22f2f2489d32505b89aeec8814d6dc11a3d756fc792a7f0cab ChangeLog 1007
 MD5 33383983267ad2c04687135876d5dbfb files/digest-nexuiz-1.2.1 61
 RMD160 a0210a28d2620a7938ff18660e50f1f0659ba93d files/digest-nexuiz-1.2.1 61
 SHA256 73a6e412a397a1f7f07d73a85c3f03568c37a78c2a435d7d91f5678f13fe349c files/digest-nexuiz-1.2.1 61
@@ -13,6 +13,6 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 1cf21aff651d6aa61dbe0af07c959347 nexuiz-1.2.1.ebuild 2137
 RMD160 a9191dfe7d08b7456a9a61811d0c66a66473fae5 nexuiz-1.2.1.ebuild 2137
 SHA256 23e62a7e868cf7fa2506af012432a00246af98bb97fa77ebb7c37714fa5e37de nexuiz-1.2.1.ebuild 2137
-MD5 fd7d23193e0c18125f6a6d08ef65f709 nexuiz-1.5.ebuild 3313
-RMD160 3b410f6ccdb78b816cdc6aeb13a3604acb2d4b94 nexuiz-1.5.ebuild 3313
-SHA256 c98e692671a25c445d03ab1012d5039f275a358412f369e88239d8ed775c708f nexuiz-1.5.ebuild 3313
+MD5 11d838820649828899ca43357092f13f nexuiz-1.5.ebuild 2949
+RMD160 33df9cecb105d6abea1e34f1e7eb7a4cff8faf79 nexuiz-1.5.ebuild 2949
+SHA256 b7b64a6fdde25f2e79c538bc33babbb7d9c32abe0fd28f5fe148fd171fe81a4e nexuiz-1.5.ebuild 2949
diff --git a/games-fps/nexuiz/nexuiz-1.5.ebuild b/games-fps/nexuiz/nexuiz-1.5.ebuild
index e262f2898e9f..9e170af600e5 100644
--- a/games-fps/nexuiz/nexuiz-1.5.ebuild
+++ b/games-fps/nexuiz/nexuiz-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-1.5.ebuild,v 1.2 2006/03/17 20:07:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/nexuiz/nexuiz-1.5.ebuild,v 1.3 2006/03/20 20:06:02 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -47,11 +47,21 @@ S=${WORKDIR}/${MY_PN}/darkplaces
 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_unpack() {
 }
 
 src_compile() {
-	if use opengl
+	if default_client
 	then
 		emake cl-release \
 			CFLAGS_RELEASE="" OPTIM_RELEASE="" \
@@ -92,29 +102,18 @@ src_compile() {
 			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 @@ src_install() {
 		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"