version bump

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

4 files changed, 145 insertions, 2 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 1e45191ff3e0..bf6660b69d1d 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.98 2010/02/09 05:51:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.99 2010/02/26 20:08:38 mr_bones_ Exp $
+
+*freeciv-2.2.0 (26 Feb 2010)
+
+  26 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.2.0.ebuild, +files/freeciv-2.2.0-clean-man.patch:
+  version bump
 
   09 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org>
   freeciv-2.1.11.ebuild:
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 6235c18ac9d5..bf3238af22a2 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,7 +1,10 @@
+AUX freeciv-2.2.0-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
 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 freeciv-2.2.0.tar.bz2 33049084 RMD160 900e7a7e80a37e9faaf2a5eba4a0b35d81ab103f SHA1 9cdb5630159ec3c4a0def8039b02c8b5ed46d413 SHA256 27f0ef73f10543798afa8d7a012df9ec9aca5f41888f2e96c954900f523b9a47
 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
-MISC ChangeLog 14207 RMD160 5c0f7b454800c2da7a2758ff8d35ec798a49acff SHA1 eadffd19ef3cecb36dd1877b7b03747acf17fe9c SHA256 b537115727ed2e5ba5fc56a9546d4e4b1925bc5e5d31521c1d21311c7e8fffb0
+EBUILD freeciv-2.2.0.ebuild 2940 RMD160 6a9d8a6ec980ecb648d7792e175a24c5c68047d4 SHA1 11bc10f5f3ec3ec988b2521eda4f2eaf840e090f SHA256 363a53b9dec697a81262dbcd1f5cab2751f44d6be5489ba9aad64bddd6b2b2ee
+MISC ChangeLog 14371 RMD160 bcd307fc754f20a2e4aec73383a25934b744955a SHA1 d6d835536b00dd4d54ef04e84b09fc7be7c9fc0c SHA256 6973dffc3a946e469fbb32b036c81af677cb495c4cf8ec50c4d01b334430ad60
 MISC metadata.xml 296 RMD160 4731eabd213e1faee5f3c3eae53076eb586a9ff4 SHA1 21d2ebe86e2f6ce406a29b68355040ecc7c788b6 SHA256 0d34de77af9814418b5e1ac89ed6d6caf100ffa2a1faaa51bd900a53f51860bf
diff --git a/games-strategy/freeciv/files/freeciv-2.2.0-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.2.0-clean-man.patch
new file mode 100644
index 000000000000..b5c4d2337360
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.2.0-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.0.ebuild b/games-strategy/freeciv/freeciv-2.2.0.ebuild
new file mode 100644
index 000000000000..c675d2ac5383
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.2.0.ebuild
@@ -0,0 +1,112 @@
+# 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 $
+
+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"
+
+RDEPEND="readline? ( sys-libs/readline )
+	sys-libs/zlib
+	app-arch/bzip2
+	!dedicated? (
+		nls? ( virtual/libintl )
+		gtk? ( x11-libs/gtk+:2 )
+		sdl? (
+			media-libs/libsdl[audio,video]
+			media-libs/sdl-image[png]
+			media-libs/freetype
+			media-libs/sdl-mixer
+		)
+		!gtk? ( !sdl? ( x11-libs/gtk+:2 ) )
+		ggz? ( dev-games/ggz-client-libs )
+		media-libs/libpng
+		auth? ( virtual/mysql )
+	)"
+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="gtk" # default to gtk if none specified
+
+	if use dedicated ; then
+		myclient="no"
+	else
+		use sdl && myclient="${myclient} sdl"
+	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}"
+}
+
+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}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}