version bump

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

4 files changed, 156 insertions, 2 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index a958da200f82..989d7b212eab 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.128 2011/08/03 16:28:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.129 2011/08/19 19:27:28 mr_bones_ Exp $
+
+*freeciv-2.3.0 (19 Aug 2011)
+
+  19 Aug 2011; Michael Sterrett <mr_bones_@gentoo.org> +freeciv-2.3.0.ebuild,
+  +files/freeciv-2.3.0-clean-man.patch:
+  version bump
 
 *freeciv-2.2.7 (03 Aug 2011)
 
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index f03c126b3a2c..c4d84f3b29bc 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,8 +1,11 @@
 AUX freeciv-2.2.5-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
 AUX freeciv-2.2.7-clean-man.patch 588 RMD160 7473ed695b1428cbbf6e91468d66502ced4fc2b6 SHA1 61470afcc751324b7514946ba739cdd30392fb8b SHA256 b3e8e1dadc955c65a5d1f1ae4c4e9c699e016f5d8c868e1b96c570aa588de672
+AUX freeciv-2.3.0-clean-man.patch 479 RMD160 e25fc28ad471ed1025ee0dc2538acf2c680ffdbb SHA1 44ea881b066c865120952ab278a601fabc705de8 SHA256 6adfae4f3832aac79e794b4ec584b25491efed0bad7d26b0dcdc76db42881eaf
 DIST freeciv-2.2.5.tar.bz2 35170438 RMD160 7f34e0d9c3ece7012665b1d1e4ae0be73759596b SHA1 b204c4ae581be632fd2385517ada62558d48e702 SHA256 9bd8bb20ae439d0cdfce8262fb44de33155c698cd15847bef32f8f28a9aad236
 DIST freeciv-2.2.7.tar.bz2 35094644 RMD160 a1114cd9805dfeeab238071f9b7736b948474dde SHA1 b7cf680a25e9006cb3a289a2e5c786dd385577cb SHA256 993dd1685dad8012225fdf434673515a194fa072b3d5bfb04952a98fb862d319
+DIST freeciv-2.3.0.tar.bz2 30239019 RMD160 1f017139c5ac4c24d1b4b6767aca84e18b9db31b SHA1 d4e871ad749e1807957df4e353fbb8f5510b7248 SHA256 f380f7f89a3478e8b2a68033b37325539248618508d94edf55b84e5e979fbefa
 EBUILD freeciv-2.2.5.ebuild 3261 RMD160 9f3cef58e12d2d5955fb7c877e7cd1116c7ea3ac SHA1 ecb06388bff5ac25f2b08fa0c5ffd4fa5f458e76 SHA256 a8ea2e8f61244407d0059d2988376bc62be071e60e707ded7c2ca46d978758a9
 EBUILD freeciv-2.2.7.ebuild 3261 RMD160 48fa8c8b8431ab1f339aa5d2f72a0ef250b69b4a SHA1 01e26a2b87ba3d2552903dee5c8eba0210ec19d9 SHA256 458fb8873a65e2657b5868259750bd4c2f8b1c9a6a44524d503f48a8d85a5bf0
-MISC ChangeLog 18390 RMD160 869b5033466f9c81c69e1c1b2bf4ceeaf29c3cdf SHA1 a31d360e7da7ddf601d3edd0b44ad696d28f4f4e SHA256 7788e43662438255b6fe01e6ea85cb925845f1506242097d10d09e677a14b573
+EBUILD freeciv-2.3.0.ebuild 3271 RMD160 33d89f3a9f1942840fd1d13d272d30fc6a2cd785 SHA1 648b877cc8ccd7ec7d1bad197daa667fc3186156 SHA256 22f1c892b222303b2ebb527423e7cca0285baf97f535e820794c3f24dcf10a19
+MISC ChangeLog 18554 RMD160 ad3c96065ecc763e1f4f6e707e7268bb592aaf34 SHA1 107021dc3173bfbeb5635d2e027eb85c9c2ffa3e SHA256 5d8dbfbd4422a411e0814566aabd70b0b3f498c5e1a6b0cad586db582d7ee65d
 MISC metadata.xml 389 RMD160 8df0338ed8960825740eb0a12e30725d238855dd SHA1 dcf97dda6c3ca4a024638c1f42914084d4d67984 SHA256 f235b6ab122a8aaaee297ee34fe84b294bd2b015ce8cde7c772a387585992f2f
diff --git a/games-strategy/freeciv/files/freeciv-2.3.0-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.3.0-clean-man.patch
new file mode 100644
index 000000000000..ebac8144218b
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.3.0-clean-man.patch
@@ -0,0 +1,21 @@
+--- doc/man/Makefile.in.orig	2011-08-19 14:54:02.163463916 -0400
++++ doc/man/Makefile.in	2011-08-19 14:54:31.354583970 -0400
+@@ -360,8 +360,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		\
+@@ -370,7 +369,7 @@
+ 	freeciv-win32.6		\
+ 	freeciv-ftwl.6
+ 
+-man_MANS = $(MAN_PAGES) $(MAN_LINKS)
++man_MANS = $(MAN_PAGES)
+ EXTRA_DIST = $(MAN_LINKS)
+ all: all-am
+ 
diff --git a/games-strategy/freeciv/freeciv-2.3.0.ebuild b/games-strategy/freeciv/freeciv-2.3.0.ebuild
new file mode 100644
index 000000000000..8c1038be3ca1
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.3.0.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.3.0.ebuild,v 1.1 2011/08/19 19:27:28 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/freeciv-manual || die "freeciv-manual 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
+}