version bump

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

4 files changed, 157 insertions, 2 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index d723a7cbdf5f..d54e56257de5 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.114 2010/08/01 14:05:23 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.115 2010/08/02 18:46:30 mr_bones_ Exp $
+
+*freeciv-2.2.2 (02 Aug 2010)
+
+  02 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.2.2.ebuild, +files/freeciv-2.2.2-clean-man.patch:
+  version bump
 
   01 Aug 2010; Markos Chandras <hwoarang@gentoo.org> freeciv-2.2.1.ebuild:
   Stable on amd64 wrt bug #329957
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 4040285d27e1..1c65f69f8dc8 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,8 @@
 AUX freeciv-2.2.1-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
+AUX freeciv-2.2.2-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
 DIST freeciv-2.2.1.tar.bz2 33400493 RMD160 d6d3fd99946e339b63b6e2cfc0e365e8228dc142 SHA1 f9d141a04e447a57f4fc001dbd789d92717735e4 SHA256 cecf98af004fa49e5fc8b3e4447eefbad27e237377e4c9add2e9da60da53cb31
+DIST freeciv-2.2.2.tar.bz2 33904671 RMD160 42714e95f1839592a79a2b60ee64bc58bbe512e8 SHA1 b306374d5e2e118393b23ff9a0b1a8d391b36c82 SHA256 4e678fe98eb1acb73dbc13dfb81bcdeace360204b4920910f2ccb5c79fac34eb
 EBUILD freeciv-2.2.1.ebuild 3258 RMD160 0ef086f1aaaf33db7c062e9ae8518117ce0ff4df SHA1 acc84b3f6a063a7177f2a3b3062ebd51d5ce89e1 SHA256 c0f4499d7f3183b2d9f36d9cf2a5682dc284036f3e846169d608dc5be9ebb254
-MISC ChangeLog 16491 RMD160 cee463e6d6fec39361755a813d47ff8a7cbfd139 SHA1 50314dd9359120e5db6098e34df896339b0f1e90 SHA256 b8e9ba629037c3e6c7a4c74399f2952fb4e5308371134a8a0bf1aff9bbc4312b
+EBUILD freeciv-2.2.2.ebuild 3261 RMD160 0ceeb0ae83145b0ede253fb84ee958cf3c4c3a1e SHA1 35d92515395042d6552380541a22776584761c59 SHA256 dcb669bb87a8bba5cfe3bb1d20d25fa63582e959d7f94dd8056ebacea60c2455
+MISC ChangeLog 16656 RMD160 96d014b3c81fa96e7d77921caf9e3470e95b0185 SHA1 01d26cddcdf58645ed95113c00e926a6a605eccc SHA256 ea8ebd64164d54d46f908c4cb0f3c5bd50b22d422bb4a756eee6dcaba9007e08
 MISC metadata.xml 389 RMD160 8df0338ed8960825740eb0a12e30725d238855dd SHA1 dcf97dda6c3ca4a024638c1f42914084d4d67984 SHA256 f235b6ab122a8aaaee297ee34fe84b294bd2b015ce8cde7c772a387585992f2f
diff --git a/games-strategy/freeciv/files/freeciv-2.2.2-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.2.2-clean-man.patch
new file mode 100644
index 000000000000..b5c4d2337360
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.2.2-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.2.ebuild b/games-strategy/freeciv/freeciv-2.2.2.ebuild
new file mode 100644
index 000000000000..b87c99e80a6c
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.2.2.ebuild
@@ -0,0 +1,124 @@
+# 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.2.ebuild,v 1.1 2010/08/02 18:46:30 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
+}