fix default client logic (bug #307117)
authorMichael Sterrett <mr_bones_@gentoo.org>
Sat, 27 Feb 2010 22:11:23 +0000 (22:11 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Sat, 27 Feb 2010 22:11:23 +0000 (22:11 +0000)
Package-Manager: portage-2.1.7.16/cvs/Linux i686

games-strategy/freeciv/ChangeLog
games-strategy/freeciv/Manifest
games-strategy/freeciv/freeciv-2.2.0.ebuild

index bf6660b69d1ddeea1bd4847cc10644d52354349f..20e0b41f49d1287d7e4a07c926d465fe04952811 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.99 2010/02/26 20:08:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.100 2010/02/27 22:11:23 mr_bones_ Exp $
+
+  27 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.2.0.ebuild:
+  fix default client logic (bug #307117)
 
 *freeciv-2.2.0 (26 Feb 2010)
 
index bf3238af22a23ea3640134dc6abf6e8c54a78177..6b283faaf55e8c4b774f131fa1c8916d96751d42 100644 (file)
@@ -5,6 +5,6 @@ DIST freeciv-2.2.0.tar.bz2 33049084 RMD160 900e7a7e80a37e9faaf2a5eba4a0b35d81ab1
 DIST stdsounds3.tar.gz 118278 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 SHA1 103d02a0702687fb038f5187a321f8074b4ebfb5 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa
 EBUILD freeciv-2.1.11.ebuild 3580 RMD160 0a97435beba5928802e9233526004c9dc5a8b89b SHA1 eda027c2c6a7e16bc430265ed63829f64f5eecc1 SHA256 98569c454d1197d2bf130c3c32b8376315080c000f2f69126390ca1fc97f6d74
 EBUILD freeciv-2.1.9.ebuild 4942 RMD160 55d85709540316671ed8d935fb5cf0983d5483e9 SHA1 086b5ceba8b9fd10ef5c5aeb3eb44635c5bf6718 SHA256 14d5c043d8b64478e03971d68d02ed403b5654fdf0ba1a9947d8c6404ae3cb7a
-EBUILD freeciv-2.2.0.ebuild 2940 RMD160 6a9d8a6ec980ecb648d7792e175a24c5c68047d4 SHA1 11bc10f5f3ec3ec988b2521eda4f2eaf840e090f SHA256 363a53b9dec697a81262dbcd1f5cab2751f44d6be5489ba9aad64bddd6b2b2ee
-MISC ChangeLog 14371 RMD160 bcd307fc754f20a2e4aec73383a25934b744955a SHA1 d6d835536b00dd4d54ef04e84b09fc7be7c9fc0c SHA256 6973dffc3a946e469fbb32b036c81af677cb495c4cf8ec50c4d01b334430ad60
+EBUILD freeciv-2.2.0.ebuild 3015 RMD160 8aa801fac12fc7cb54fe315d2174e44642b06f93 SHA1 c0e10098fa94ad454068fb03a31a916748497e08 SHA256 d07639142c407217f2af9f6caa6186cee5630e19c3478ebf8dea04156e319f97
+MISC ChangeLog 14491 RMD160 7f0fcd1eb57448f0d74ed03df1436491a10bcff4 SHA1 47089ab03ba1246e3f7587b5df6080bab2cc7734 SHA256 2ef0f2ec4437c1d4b6323ac67eaba98f73c3332200d0a5ca4e20712b8994fb5f
 MISC metadata.xml 296 RMD160 4731eabd213e1faee5f3c3eae53076eb586a9ff4 SHA1 21d2ebe86e2f6ce406a29b68355040ecc7c788b6 SHA256 0d34de77af9814418b5e1ac89ed6d6caf100ffa2a1faaa51bd900a53f51860bf
index c675d2ac5383c51d05dc11a9aea4b04c7915fa23..6d504214877daec6869ec14f86de0e80c98a65ca 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.0.ebuild,v 1.1 2010/02/26 20:08:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.0.ebuild,v 1.2 2010/02/27 22:11:23 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils gnome2-utils games
@@ -58,12 +58,14 @@ src_prepare() {
 }
 
 src_configure() {
-       local myclient="gtk" # default to gtk if none specified
+       local myclient
 
        if use dedicated ; then
                myclient="no"
        else
                use sdl && myclient="${myclient} sdl"
+               use gtk && myclient="${myclient} gtk"
+               [[ -z ${myclient} ]] && myclient="gtk" # default to gtk if none specified
        fi
 
        egamesconf \