Version bump, bug #166461

Package-Manager: portage-2.1.2-r9

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index ac3a85dbf83c75f770faf8ef6efb69d1865412fa..aaf2b2d358e0c9dafb1ce755241386bac95398f2 100644 (file)
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeciv
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.57 2006/11/23 20:19:33 vivo Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.58 2007/02/14 02:14:09 nyhm Exp $
+
+*freeciv-2.0.9 (14 Feb 2007)
+
+  14 Feb 2007; Tristan Heaven <nyhm@gentoo.org> -files/freeciv.png,
+  freeciv-2.0.8-r1.ebuild, freeciv-2.0.8-r2.ebuild, +freeciv-2.0.9.ebuild:
+  Version bump, bug #166461
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> freeciv-2.0.8-r2.ebuild:
   dev-db/mysql => virtual/mysql

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 90cee608dfa88df77c4e94447c3b68da5b9787c8..40fd08e197ede19ac69f251b32a43d4a716abf34 100644 (file)
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,32 +1,47 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freeciv-2.0.8-DoS.patch 1065 RMD160 f4a383a17a6508f7e95966d63bc03785156398e8 SHA1 9106687bf60cc1d321d57277e8a465402d85b99b SHA256 c3e3f83440b581aea1d2d9f46f10f4daeded8fa0f822f974439c6a7d783b190a
 MD5 6f66d4ce889a078a7a154b6e5c9842c9 files/freeciv-2.0.8-DoS.patch 1065
 RMD160 f4a383a17a6508f7e95966d63bc03785156398e8 files/freeciv-2.0.8-DoS.patch 1065
 SHA256 c3e3f83440b581aea1d2d9f46f10f4daeded8fa0f822f974439c6a7d783b190a files/freeciv-2.0.8-DoS.patch 1065
-AUX freeciv.png 3657 RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd SHA1 929520ea26f3e3093f8ab1984ffd61c99c154511 SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160
-MD5 42ae5aa07b3e176f81dfa905bcc0eb4f files/freeciv.png 3657
-RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd files/freeciv.png 3657
-SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160 files/freeciv.png 3657
 DIST freeciv-2.0.8.tar.bz2 8535513 RMD160 7ab93442cf63db22e9e660d2c1955990a1376d26 SHA1 b9098dc46ed169e053f9c7405cc3abf9cebe9792 SHA256 85b396c86f977b85f03fa1309733d21f7cc953e005ff1475f9981b77fa9f28f3
+DIST freeciv-2.0.9.tar.bz2 8875323 RMD160 e79cfc1d00f4f1b7ff28e84aca42dd2ef1e158d5 SHA1 9e1b64a96f38821abadc636621d276f70dedd686 SHA256 e7f1eb6a240db4c48396d8920d103b8cf275b510e304dbbd2af6bb8ab5db4a98
+DIST freeciv.png 3657 RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd SHA1 929520ea26f3e3093f8ab1984ffd61c99c154511 SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160
 DIST stdsounds3.tar.gz 118278 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 SHA1 103d02a0702687fb038f5187a321f8074b4ebfb5 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa
-EBUILD freeciv-2.0.8-r1.ebuild 5130 RMD160 bd05aa1de0650ad3fa1a7c759d78eb0543ce8e81 SHA1 a5ac5ecf301fab4c461f831957e98098943eeb3c SHA256 ddf4ede83a661f5e24d755542a7f037938bc91dec7547470d654de5dab1f1ce6
-MD5 2d2aae2cb7b4c088e5d7f0a6ced6f44c freeciv-2.0.8-r1.ebuild 5130
-RMD160 bd05aa1de0650ad3fa1a7c759d78eb0543ce8e81 freeciv-2.0.8-r1.ebuild 5130
-SHA256 ddf4ede83a661f5e24d755542a7f037938bc91dec7547470d654de5dab1f1ce6 freeciv-2.0.8-r1.ebuild 5130
-EBUILD freeciv-2.0.8-r2.ebuild 4973 RMD160 6a569a6fefd4a1dd6e52c8226e3cf00604400cf1 SHA1 c325d5d0e243518f640827cf8c84e48689e61a3d SHA256 b1119a878ab6df23d7803980da5813c6cbee461f1eab80ae0d605356400733c2
-MD5 b1ad3ae600a5aeda101baa78d7079add freeciv-2.0.8-r2.ebuild 4973
-RMD160 6a569a6fefd4a1dd6e52c8226e3cf00604400cf1 freeciv-2.0.8-r2.ebuild 4973
-SHA256 b1119a878ab6df23d7803980da5813c6cbee461f1eab80ae0d605356400733c2 freeciv-2.0.8-r2.ebuild 4973
-MISC ChangeLog 9204 RMD160 9170583678931c9d4357680867996e5e6b53b60d SHA1 1c542a679961f2061adc711282df9ea2836c27f2 SHA256 072241acb30ff4eed278b62aeaedfc9fb6eb7d25080348813248d9a96109c564
-MD5 a6e2f4a01c554df5556ce259f16a4488 ChangeLog 9204
-RMD160 9170583678931c9d4357680867996e5e6b53b60d ChangeLog 9204
-SHA256 072241acb30ff4eed278b62aeaedfc9fb6eb7d25080348813248d9a96109c564 ChangeLog 9204
+EBUILD freeciv-2.0.8-r1.ebuild 5151 RMD160 a78bb656ab3f61f22c7a14645353c87fd45b8d87 SHA1 3a4e97cdd95595e1192667f9fe7973a5193c3cb8 SHA256 5efc2b639abb7cff1d547dee20ccb9f05cad621a330c1a3e68f0d4afc96aefbe
+MD5 025b9d67192da60b49f12f3c0090d49d freeciv-2.0.8-r1.ebuild 5151
+RMD160 a78bb656ab3f61f22c7a14645353c87fd45b8d87 freeciv-2.0.8-r1.ebuild 5151
+SHA256 5efc2b639abb7cff1d547dee20ccb9f05cad621a330c1a3e68f0d4afc96aefbe freeciv-2.0.8-r1.ebuild 5151
+EBUILD freeciv-2.0.8-r2.ebuild 5000 RMD160 1c84f8aa417d915f59119cc7e3465672ba72043b SHA1 3a2416807ae1df415df86eb7295fbf02c5be55b4 SHA256 f2aca5e3008c2eb81d55fe20deedf786b0342b249c42442d57443c9894304247
+MD5 ce748070d1c08dad808399ab21c866ec freeciv-2.0.8-r2.ebuild 5000
+RMD160 1c84f8aa417d915f59119cc7e3465672ba72043b freeciv-2.0.8-r2.ebuild 5000
+SHA256 f2aca5e3008c2eb81d55fe20deedf786b0342b249c42442d57443c9894304247 freeciv-2.0.8-r2.ebuild 5000
+EBUILD freeciv-2.0.9.ebuild 4704 RMD160 c8d402331e4feae91ebd45be86e237d40c22dcf0 SHA1 6adb4405e74ae4c6908dc5f0e2a512cc4aa3f741 SHA256 19c4b591e654689261adeb6d7b27d6d42f62ceb364074021f0268f7b0525d131
+MD5 6a05d155e55dd6c9a18c4d58fab6d920 freeciv-2.0.9.ebuild 4704
+RMD160 c8d402331e4feae91ebd45be86e237d40c22dcf0 freeciv-2.0.9.ebuild 4704
+SHA256 19c4b591e654689261adeb6d7b27d6d42f62ceb364074021f0268f7b0525d131 freeciv-2.0.9.ebuild 4704
+MISC ChangeLog 9406 RMD160 2533c8d4c375c2d1ca7310dae12e6de28855fc74 SHA1 a571f9e7a8a6ca0d0d6691b72d8e4140d0c05f0e SHA256 23baa058b71d28bd015aff731f34d23b83d0e1a87f96b2a2b4c7dc3ccfb3a80d
+MD5 98737678282bc6a5f2940a8bcb83f8aa ChangeLog 9406
+RMD160 2533c8d4c375c2d1ca7310dae12e6de28855fc74 ChangeLog 9406
+SHA256 23baa058b71d28bd015aff731f34d23b83d0e1a87f96b2a2b4c7dc3ccfb3a80d ChangeLog 9406
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 40f3883d3eefecb900a217e2dc40e3da files/digest-freeciv-2.0.8-r1 479
-RMD160 d6332b47a3075ae2b93849528921b9e3672197b5 files/digest-freeciv-2.0.8-r1 479
-SHA256 2d5e6d0e14506a64b40ca97b8bec34a97483796d45226cbe1b316d617377bdf2 files/digest-freeciv-2.0.8-r1 479
-MD5 40f3883d3eefecb900a217e2dc40e3da files/digest-freeciv-2.0.8-r2 479
-RMD160 d6332b47a3075ae2b93849528921b9e3672197b5 files/digest-freeciv-2.0.8-r2 479
-SHA256 2d5e6d0e14506a64b40ca97b8bec34a97483796d45226cbe1b316d617377bdf2 files/digest-freeciv-2.0.8-r2 479
+MD5 455cf34d0f41f43ca3589fef16a92a37 files/digest-freeciv-2.0.8-r1 687
+RMD160 3477bd9759ab36b6991480218bfabb517548427d files/digest-freeciv-2.0.8-r1 687
+SHA256 5fa1ec7c1cdfaf134641ef3d98939df3993c05dbcbc0a4bd4dc26a1d4befe158 files/digest-freeciv-2.0.8-r1 687
+MD5 455cf34d0f41f43ca3589fef16a92a37 files/digest-freeciv-2.0.8-r2 687
+RMD160 3477bd9759ab36b6991480218bfabb517548427d files/digest-freeciv-2.0.8-r2 687
+SHA256 5fa1ec7c1cdfaf134641ef3d98939df3993c05dbcbc0a4bd4dc26a1d4befe158 files/digest-freeciv-2.0.8-r2 687
+MD5 8458999ea562257af9aaa4082f78199f files/digest-freeciv-2.0.9 687
+RMD160 4cc68e40a018673d6e6ca32771d962c10dbb6a73 files/digest-freeciv-2.0.9 687
+SHA256 85a62e60b82bb9f0a6444e5cfaf1bc5f87a29f640860a70d1935115de8ee3a5c files/digest-freeciv-2.0.9 687
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF0nB5dz7hIScOURERAtu1AKC1gn/0fYxCe/kEYy7zYZd98sTgIgCgx/SM
+WLCDmtzLoZlEInHI1MbmHUw=
+=+Ogt
+-----END PGP SIGNATURE-----

diff --git a/games-strategy/freeciv/files/digest-freeciv-2.0.8-r1 b/games-strategy/freeciv/files/digest-freeciv-2.0.8-r1
index fd5043d06cbdc4a5b9b9e628e2cca37041784276..5e914708524147f55d9dfbaf0b4c06efa113ba33 100644 (file)
--- a/games-strategy/freeciv/files/digest-freeciv-2.0.8-r1
+++ b/games-strategy/freeciv/files/digest-freeciv-2.0.8-r1
@@ -1,6 +1,9 @@
 MD5 9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 8535513
 RMD160 7ab93442cf63db22e9e660d2c1955990a1376d26 freeciv-2.0.8.tar.bz2 8535513
 SHA256 85b396c86f977b85f03fa1309733d21f7cc953e005ff1475f9981b77fa9f28f3 freeciv-2.0.8.tar.bz2 8535513
+MD5 42ae5aa07b3e176f81dfa905bcc0eb4f freeciv.png 3657
+RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd freeciv.png 3657
+SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160 freeciv.png 3657
 MD5 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz 118278
 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 stdsounds3.tar.gz 118278
 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa stdsounds3.tar.gz 118278

diff --git a/games-strategy/freeciv/files/digest-freeciv-2.0.8-r2 b/games-strategy/freeciv/files/digest-freeciv-2.0.8-r2
index fd5043d06cbdc4a5b9b9e628e2cca37041784276..5e914708524147f55d9dfbaf0b4c06efa113ba33 100644 (file)
--- a/games-strategy/freeciv/files/digest-freeciv-2.0.8-r2
+++ b/games-strategy/freeciv/files/digest-freeciv-2.0.8-r2
@@ -1,6 +1,9 @@
 MD5 9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 8535513
 RMD160 7ab93442cf63db22e9e660d2c1955990a1376d26 freeciv-2.0.8.tar.bz2 8535513
 SHA256 85b396c86f977b85f03fa1309733d21f7cc953e005ff1475f9981b77fa9f28f3 freeciv-2.0.8.tar.bz2 8535513
+MD5 42ae5aa07b3e176f81dfa905bcc0eb4f freeciv.png 3657
+RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd freeciv.png 3657
+SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160 freeciv.png 3657
 MD5 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz 118278
 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 stdsounds3.tar.gz 118278
 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa stdsounds3.tar.gz 118278

diff --git a/games-strategy/freeciv/files/digest-freeciv-2.0.9 b/games-strategy/freeciv/files/digest-freeciv-2.0.9
new file mode 100644 (file)
index 0000000..c7ffeae
--- /dev/null
+++ b/games-strategy/freeciv/files/digest-freeciv-2.0.9
@@ -0,0 +1,9 @@
+MD5 7bfa40220bd8e19a263ca247202682ce freeciv-2.0.9.tar.bz2 8875323
+RMD160 e79cfc1d00f4f1b7ff28e84aca42dd2ef1e158d5 freeciv-2.0.9.tar.bz2 8875323
+SHA256 e7f1eb6a240db4c48396d8920d103b8cf275b510e304dbbd2af6bb8ab5db4a98 freeciv-2.0.9.tar.bz2 8875323
+MD5 42ae5aa07b3e176f81dfa905bcc0eb4f freeciv.png 3657
+RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd freeciv.png 3657
+SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160 freeciv.png 3657
+MD5 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz 118278
+RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 stdsounds3.tar.gz 118278
+SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa stdsounds3.tar.gz 118278

diff --git a/games-strategy/freeciv/files/freeciv.png b/games-strategy/freeciv/files/freeciv.png
deleted file mode 100644 (file)
index 52d8c90..0000000
Binary files a/games-strategy/freeciv/files/freeciv.png and /dev/null differ

diff --git a/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild b/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild
index 1154240fe5b6a96e7148dcab4f1848af49e8e597..87f7fa4dd1e7cd9ebec687a88cb06013b90fc724 100644 (file)
--- a/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild
+++ b/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild,v 1.4 2006/10/31 20:40:14 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.8-r1.ebuild,v 1.5 2007/02/14 02:14:09 nyhm Exp $
 
 inherit eutils games
 
@@ -8,6 +8,7 @@ MY_P=${PN}-${PV/_/-}
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
 SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2
+       mirror://gentoo/${PN}.png
        !dedicated? (
                alsa? (
                        http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz )
@@ -183,7 +184,7 @@ src_install() {
        dodoc ChangeLog NEWS \
                doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO}
 
-       doicon "${FILESDIR}/${PN}.png"
+       doicon "${DISTDIR}/${PN}.png"
 
        prepgamesdirs
 }

diff --git a/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild b/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild
index c74d536f919f1abbbae0a88b6a2e9031553e7fdc..a905294c70659f0bb080958c7bffba4330c543b3 100644 (file)
--- a/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild,v 1.9 2006/11/23 20:19:33 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild,v 1.10 2007/02/14 02:14:09 nyhm Exp $
 
 inherit eutils games
 
@@ -8,6 +8,7 @@ MY_P=${PN}-${PV/_/-}
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
 SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2
+       mirror://gentoo/${PN}.png
        !dedicated? (
                alsa? (
                        http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz )
@@ -170,7 +171,7 @@ src_install() {
        dodoc ChangeLog NEWS \
                doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO}
 
-       doicon "${FILESDIR}/${PN}.png"
+       doicon "${DISTDIR}/${PN}.png"
 
        prepgamesdirs
 }

diff --git a/games-strategy/freeciv/freeciv-2.0.9.ebuild b/games-strategy/freeciv/freeciv-2.0.9.ebuild
new file mode 100644 (file)
index 0000000..523b1a6
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.0.9.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.9.ebuild,v 1.1 2007/02/14 02:14:09 nyhm Exp $
+
+inherit eutils games
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/"
+SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2
+       mirror://gentoo/${PN}.png
+       !dedicated? (
+               alsa? (
+                       http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz )
+               esd? (
+                       http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz )
+               sdl? (
+                       http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa auth dedicated esd gtk nls readline sdl Xaw3d"
+
+RDEPEND="readline? ( sys-libs/readline )
+       !dedicated? (
+               nls? ( virtual/libintl )
+               gtk? ( >=x11-libs/gtk+-2 )
+               !gtk? (
+                       Xaw3d? ( x11-libs/Xaw3d )
+                       !Xaw3d? ( x11-libs/libXaw )
+                       x11-libs/libXmu
+                       x11-libs/libXpm
+               )
+               alsa? (
+                       media-libs/alsa-lib
+                       media-libs/audiofile
+               )
+               esd? ( media-sound/esound )
+               sdl? ( media-libs/sdl-mixer )
+               auth? ( virtual/mysql )
+       )"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )
+       !dedicated? ( gtk? ( dev-util/pkgconfig ) )
+       x11-proto/xextproto
+       media-libs/libpng"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       games_pkg_setup
+       if ! use dedicated ; then
+               if use gtk ; then
+                       einfo "The Freeciv Client will be built with the GTK+-2 toolkit"
+               elif use Xaw3d ; then
+                       einfo "The Freeciv Client will be built with the Xaw3d toolkit"
+               else
+                       einfo "The Freeciv Client will be built with the Xaw toolkit"
+               fi
+               if ! use esd && ! use alsa && ! use sdl ; then
+                       ewarn
+                       ewarn "To enable sound support in civclient, you must enable"
+                       ewarn "at least one of this USE flags: alsa, esd, sdl"
+                       ewarn
+               fi
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # install locales in /usr/share/locale
+       sed -i \
+               -e 's:^\(localedir = \).*:\1/usr/share/locale:' \
+               intl/Makefile.in po/Makefile.in.in \
+               || die "sed failed"
+       sed -i \
+               -e 's:$datadir/locale:/usr/share/locale:' \
+               configure \
+               || die "sed failed"
+
+       # change .desktop category so it is not gnome specific
+       sed -i \
+               -e 's:^\(Categories=GNOME;Application;Game;Strategy;\):Categories=Application;Game;StrategyGame;:' \
+               -e 's:^\(Icon=\).*:\1freeciv.png:' \
+               bootstrap/freeciv.desktop.in \
+               || die "sed failed"
+       # install the .desktop in /usr/share/applications
+       sed -i \
+               -e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \
+               client/Makefile.in \
+               || die "sed failed"
+
+       # remove civclient manpage if dedicated server
+       if use dedicated ; then
+               sed -i \
+                       -e '/man_MANS = /s:civclient.6::' \
+                       doc/man/Makefile.in \
+                       || die "sed failed"
+       fi
+}
+
+src_compile() {
+       local mysoundconf
+       local myclient
+
+       if use dedicated ; then
+               mysoundconf="--disable-alsa --disable-esd --disable-sdl-mixer"
+               myclient="no"
+       else
+               myclient="xaw"
+               use Xaw3d && myclient="xaw3d"
+               if use gtk ; then
+                       myclient="gtk-2.0"
+               fi
+               #FIXME --enable-{alsa,esd,sdl-mixer} actually disable them...
+               #FIXME   ==> use --disable-* only, and autodetect to enable.
+               use alsa || mysoundconf="${mysoundconf} --disable-alsa"
+               use esd || mysoundconf="${mysoundconf} --disable-esd"
+               use sdl || mysoundconf="${mysoundconf} --disable-sdl-mixer"
+       fi
+
+       egamesconf \
+               --disable-dependency-tracking \
+               --with-zlib \
+               $(use_enable auth) \
+               $(use_enable nls) \
+               $(use_with readline) \
+               --enable-client=${myclient} \
+               ${mysoundconf} \
+               || die "egamesconf failed"
+
+       emake || die "emake failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       if ! use dedicated ; then
+               # Install the app-defaults if Xaw/Xaw3d toolkit
+               if ! use gtk ; then
+                       insinto /etc/X11/app-defaults
+                       doins data/Freeciv || die "doins failed"
+               fi
+               # Install sounds if at least one sound plugin was built
+               if use alsa || use esd || use sdl ; then
+                       insinto "${GAMES_DATADIR}"/${PN}
+                       doins -r ../data/stdsounds* || die "doins sounds failed"
+               fi
+               # Create and install the html manual. It can't be done for dedicated
+               # servers, because the 'civmanual' tool is then not built. Also
+               # delete civmanual from the GAMES_BINDIR, because it's then useless.
+               # Note: to have it localized, it should be ran from _postinst, or
+               # something like that, but then it's a PITA to avoid orphan files...
+               ./manual/civmanual || die "civmanual failed"
+               dohtml manual*.html || die "dohtml failed"
+               rm -f "${D}/${GAMES_BINDIR}"/civmanual
+       fi
+
+       dodoc ChangeLog NEWS \
+               doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO}
+
+       doicon "${DISTDIR}"/${PN}.png
+       prepgamesdirs
+}