version bump

Package-Manager: portage-2.1.7.16/cvs/Linux i686

4 files changed, 174 insertions, 3 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 9e5e311d539a..3c0394c4cd62 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.96 2010/01/11 13:26:55 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.97 2010/01/31 07:27:00 mr_bones_ Exp $
+
+*freeciv-2.1.11 (31 Jan 2010)
+
+  31 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.1.11.ebuild:
+  version bump
 
 *freeciv-2.1.10 (11 Jan 2010)
 
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 5eb04a671d5e..e0350bbeb19d 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,7 +1,9 @@
 DIST freeciv-2.1.10.tar.bz2 29877983 RMD160 ce9a35a984b7130d04d2df37ccb7f61648143062 SHA1 94a0e9039d12142394df30148a7e1edd685da058 SHA256 552a53da38056bd1c916eaac62e0ce41e27f0b0d026cb56be8dbe527a7287ab6
+DIST freeciv-2.1.11.tar.bz2 29884418 RMD160 5c7ea9d51fa4de876af403c21e37ec545db40fa6 SHA1 bf086d07e12fddd49142a7b20da88d164725cbd9 SHA256 f52fb8318cf121b74da04d5279c24d2045d829718c67cc21cb62439f50754707
 DIST freeciv-2.1.9.tar.bz2 29732845 RMD160 cbe12facbbf00a85410e1324eb6ba3f2351ea1f1 SHA1 01a3500a9d0f9d9c9b95b7c4b57f2446f671a900 SHA256 42ed80ced681f14d3e7a40bcf754bc1d4392d722e49173961829a68cc74baf38
 DIST stdsounds3.tar.gz 118278 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 SHA1 103d02a0702687fb038f5187a321f8074b4ebfb5 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa
 EBUILD freeciv-2.1.10.ebuild 4547 RMD160 d66bb39fde0c231e70bedc7a1beeffcd894b1bcb SHA1 e9987ea8e32e748cf8ad70d8b42fcaf7c9969f91 SHA256 5d74320b8af95e904c07250bd6e493f4d94e9687debff2e6b87e8f449a237c19
+EBUILD freeciv-2.1.11.ebuild 4076 RMD160 8419f69952934f0d9301a555ac0aed5aac078037 SHA1 38a8ce18d359874714fd71238364d8e745c53c1d SHA256 9e54124082270afb010bc5be55b1c79d5e2b8d628c428f45a38326b29f4caa58
 EBUILD freeciv-2.1.9.ebuild 4942 RMD160 55d85709540316671ed8d935fb5cf0983d5483e9 SHA1 086b5ceba8b9fd10ef5c5aeb3eb44635c5bf6718 SHA256 14d5c043d8b64478e03971d68d02ed403b5654fdf0ba1a9947d8c6404ae3cb7a
-MISC ChangeLog 13961 RMD160 54ae970a87bf578963171934646370c70e04cf91 SHA1 a6e5fc1985ab7850b1390c372fd513991ffc1279 SHA256 6cbe0a49f75b9b6c2326091d16f5278874cc4e34d3c1b15851d3474c03ab06c5
-MISC metadata.xml 236 RMD160 da6a85d843183d3823ae8bcaf92cfd5bf61cc098 SHA1 ad6c23aa83441de75d14971aad4b6db5033a57e5 SHA256 c82561dfd15956bdf1e990623e951b31932fc782bdca7d94ea91dae35d88116d
+MISC ChangeLog 14092 RMD160 d6ec7bb705c94c27e1083cb00def99c4e49882ef SHA1 65b45a5f814dcaffe13fb7133774fa57817646ca SHA256 325ada85ef80365690f017b80bf34b70bf5d9d4e9f4770bab977f7c10c5d0911
+MISC metadata.xml 296 RMD160 4731eabd213e1faee5f3c3eae53076eb586a9ff4 SHA1 21d2ebe86e2f6ce406a29b68355040ecc7c788b6 SHA256 0d34de77af9814418b5e1ac89ed6d6caf100ffa2a1faaa51bd900a53f51860bf
diff --git a/games-strategy/freeciv/freeciv-2.1.11.ebuild b/games-strategy/freeciv/freeciv-2.1.11.ebuild
new file mode 100644
index 000000000000..fa0abd92f15a
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.1.11.ebuild
@@ -0,0 +1,162 @@
+# 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.1.11.ebuild,v 1.1 2010/01/31 07:27:00 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils gnome2-utils games
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/"
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="auth dedicated ggz gtk nls readline sdl Xaw3d"
+
+RDEPEND="readline? ( sys-libs/readline )
+	sys-libs/zlib
+	!dedicated? (
+		nls? ( virtual/libintl )
+		gtk? ( x11-libs/gtk+:2 )
+		!gtk? (
+			sdl? (
+				media-libs/libsdl
+				media-libs/sdl-image
+				media-libs/freetype
+			)
+			!sdl? (
+				Xaw3d? ( x11-libs/Xaw3d )
+				!Xaw3d? ( x11-libs/libXaw )
+			)
+		)
+		ggz? ( dev-games/ggz-client-libs )
+		media-libs/libpng
+		media-libs/alsa-lib
+		media-libs/audiofile
+		sdl? ( media-libs/sdl-mixer )
+		auth? ( virtual/mysql )
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	!dedicated? (
+		gtk? ( dev-util/pkgconfig )
+		x11-proto/xextproto
+	)"
+
+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 sdl ; then
+			einfo "The Freeciv Client will be built with the SDL 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
+	fi
+}
+
+src_prepare() {
+	# 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's freedesktop complient
+	sed -i \
+		-e '/Icon/ s:\.png::' \
+		bootstrap/freeciv.desktop.in \
+		|| die "sed failed"
+	# install the .desktop in /usr/share/applications
+	# install the icons in /usr/share/pixmaps
+	sed -i \
+		-e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \
+		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+		client/Makefile.in \
+		server/Makefile.in \
+		data/Makefile.in \
+		data/icons/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_configure() {
+	local mysoundconf
+	local myclient
+
+	if use dedicated ; then
+		myclient="no"
+	else
+		myclient="xaw"
+		use Xaw3d && myclient="xaw3d"
+		use sdl && myclient="sdl"
+		if use gtk ; then
+			myclient="gtk"
+		fi
+	fi
+
+	egamesconf \
+		--disable-dependency-tracking \
+		--localedir=/usr/share/locale \
+		$(use_enable auth) \
+		$(use_enable nls) \
+		$(use_with readline) \
+		$(use_enable sdl sdl-mixer) \
+		$(use_with ggz ggz-client) \
+		--enable-client=${myclient} \
+		${mysoundconf}
+}
+
+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 && ! use sdl ; then
+			insinto /etc/X11/app-defaults
+			doins data/Freeciv || die "doins 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,README*,TODO}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
index cca18d9c0dfb..58799a4955ca 100644
--- a/games-strategy/freeciv/metadata.xml
+++ b/games-strategy/freeciv/metadata.xml
@@ -4,5 +4,6 @@
   <herd>games</herd>
   <use>
     <flag name="auth">Add authentication capability</flag>
+    <flag name="ggz">Add support for GGZ Gaming Zone</flag>
   </use>
 </pkgmetadata>