version bump

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

4 files changed, 157 insertions, 2 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index f459e342f4a7..4c8a5bff9eb3 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.125 2011/02/09 13:20:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.126 2011/03/13 14:01:18 mr_bones_ Exp $
+
+*freeciv-2.2.5 (13 Mar 2011)
+
+  13 Mar 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.2.5.ebuild, +files/freeciv-2.2.5-clean-man.patch:
+  version bump
 
   09 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> freeciv-2.2.4.ebuild:
   x86 stable wrt bug #353817
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index c2f18cee1b2f..29bac15eb01c 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,8 @@
 AUX freeciv-2.2.4-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
+AUX freeciv-2.2.5-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
 DIST freeciv-2.2.4.tar.bz2 34627702 RMD160 13104982570b8c9196c1c7ffa50ae3480e16895b SHA1 101b42b5f73516e9693c61ae826dd5fbe523edda SHA256 c997127dad5ed62f554c5d2cb0974ac9bb6c1133608fe07ef450042fffba8579
+DIST freeciv-2.2.5.tar.bz2 35170438 RMD160 7f34e0d9c3ece7012665b1d1e4ae0be73759596b SHA1 b204c4ae581be632fd2385517ada62558d48e702 SHA256 9bd8bb20ae439d0cdfce8262fb44de33155c698cd15847bef32f8f28a9aad236
 EBUILD freeciv-2.2.4.ebuild 3261 RMD160 53a4df4807642e233f1928e4063421248c845d8a SHA1 5b4636c22752af449ab6a913e15e4e58308e63d4 SHA256 446813fb6fefda677c6e493a7798bedcdd3f42c8a86936a8504de3b2e59c6f36
-MISC ChangeLog 17942 RMD160 5820758c309c3fb4343c5557775ba2786eeb1858 SHA1 fbd36046960efb94a28f7bafda9169610ca423cb SHA256 2066c0165552a635ffd019ab03c216161c24dfd14394eaa6c4907b4aafbf9f0d
+EBUILD freeciv-2.2.5.ebuild 3261 RMD160 109671839aa9e1ca15f5fb9fabcbc60336087052 SHA1 8ea368a5ec58363f5922beff12e3d7048ff97586 SHA256 fcf6dbbd29651b43c8d7e4ffb34f7f7ca3246f44d59921baa4909ad2b535ea1b
+MISC ChangeLog 18105 RMD160 8c39e905d1ad038d90becc65bc224c7d181d660f SHA1 2e5ef0104184b467d30356cc9f5832b2435f873b SHA256 069ec319676b3f7d46f8afcd6ee6b1ec9535678db9bbab3835e9a67c6d5e71b1
 MISC metadata.xml 389 RMD160 8df0338ed8960825740eb0a12e30725d238855dd SHA1 dcf97dda6c3ca4a024638c1f42914084d4d67984 SHA256 f235b6ab122a8aaaee297ee34fe84b294bd2b015ce8cde7c772a387585992f2f
diff --git a/games-strategy/freeciv/files/freeciv-2.2.5-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.2.5-clean-man.patch
new file mode 100644
index 000000000000..b5c4d2337360
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.2.5-clean-man.patch
@@ -0,0 +1,22 @@
+diff -ru freeciv-2.2.0.orig/doc/man/Makefile.in freeciv-2.2.0/doc/man/Makefile.in
+--- freeciv-2.2.0.orig/doc/man/Makefile.in	2010-02-21 13:52:28.000000000 -0500
++++ freeciv-2.2.0/doc/man/Makefile.in	2010-02-26 04:00:07.713504939 -0500
+@@ -347,8 +347,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ MAN_PAGES = \
+-	freeciv-server.6	\
+-	freeciv-client.6
++	freeciv-server.6
+ 
+ MAN_LINKS = \
+ 	freeciv-gtk2.6		\
+@@ -357,7 +356,7 @@
+ 	freeciv-win32.6		\
+ 	freeciv-ftwl.6
+ 
+-man_MANS = $(MAN_PAGES) $(MAN_LINKS)
++man_MANS = $(MAN_PAGES)
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
+ 
diff --git a/games-strategy/freeciv/freeciv-2.2.5.ebuild b/games-strategy/freeciv/freeciv-2.2.5.ebuild
new file mode 100644
index 000000000000..c27da8e61149
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.2.5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.5.ebuild,v 1.1 2011/03/13 14:01:18 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils gnome2-utils games-ggz 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="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="auth dedicated ggz gtk ipv6 nls readline sdl +sound"
+
+RDEPEND="readline? ( sys-libs/readline )
+	sys-libs/zlib
+	app-arch/bzip2
+	auth? ( virtual/mysql )
+	!dedicated? (
+		nls? ( virtual/libintl )
+		gtk? ( x11-libs/gtk+:2 )
+		sdl? (
+			media-libs/libsdl[video]
+			media-libs/sdl-image[png]
+			media-libs/freetype
+		)
+		!gtk? ( !sdl? ( x11-libs/gtk+:2 ) )
+		sound? (
+			media-libs/libsdl[audio]
+			media-libs/sdl-mixer
+		)
+		ggz? ( games-board/ggz-gtk-client )
+		media-libs/libpng
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	!dedicated? (
+		nls? ( sys-devel/gettext )
+		x11-proto/xextproto
+	)"
+
+src_prepare() {
+	# 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
+		epatch "${FILESDIR}"/${P}-clean-man.patch
+	fi
+}
+
+src_configure() {
+	local myclient myopts
+
+	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
+		myopts=$(use_with ggz ggz-client)
+	fi
+
+	egamesconf \
+		--disable-dependency-tracking \
+		--localedir=/usr/share/locale \
+		--with-ggzconfig=/usr/bin \
+		--enable-noregistry="${GGZ_MODDIR}" \
+		$(use_enable auth) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with readline) \
+		$(use_enable sound sdl-mixer) \
+		${myopts} \
+		--enable-client="${myclient}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if ! use dedicated ; then
+		# 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
+		use sdl && make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+	fi
+
+	dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
+	rm -rf "${D}$(games_get_libdir)"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	games-ggz_update_modules
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	games-ggz_update_modules
+	gnome2_icon_cache_update
+}