diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-03-20 20:06:02 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-03-20 20:06:02 +0000 |
| commit | d1175db2529a19262bfde53852a7a149f1c7593d (patch) | |
| tree | 0f7c8dfe646a136e4ebe791c9cae591f950d70ed /games-fps | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-d1175db2529a19262bfde53852a7a149f1c7593d.tar.gz gentoo-2-d1175db2529a19262bfde53852a7a149f1c7593d.tar.bz2 gentoo-2-d1175db2529a19262bfde53852a7a149f1c7593d.zip | |
Changed how the default client is determined and closing bug #126985.
(Portage version: 2.1_pre6-r2)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/nexuiz/ChangeLog | 5 | ||||
| -rw-r--r-- | games-fps/nexuiz/nexuiz-1.5.ebuild | 38 |
2 files changed, 19 insertions, 24 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/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" |