version bump (bug #410533)

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

6 files changed, 162 insertions, 18 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 9e61cc53fa2f..1e29d64babb1 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.133 2012/01/15 15:39:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.134 2012/04/02 18:10:36 mr_bones_ Exp $
+
+*freeciv-2.3.2 (02 Apr 2012)
+
+  02 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  files/freeciv-2.3.0-clean-man.patch, files/freeciv-2.3.1-clean-man.patch,
+  +freeciv-2.3.2.ebuild, +files/freeciv-2.3.2-clean-man.patch:
+  version bump (bug #410533)
 
   15 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> freeciv-2.3.1.ebuild:
   x86 stable wrt bug #396623
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 597f7af6103c..84701e8da1f8 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX freeciv-2.3.0-clean-man.patch 479 RMD160 e25fc28ad471ed1025ee0dc2538acf2c680ffdbb SHA1 44ea881b066c865120952ab278a601fabc705de8 SHA256 6adfae4f3832aac79e794b4ec584b25491efed0bad7d26b0dcdc76db42881eaf
-AUX freeciv-2.3.1-clean-man.patch 431 RMD160 cacefd53de52c3a7f2f7f61205989b4b11a60d52 SHA1 de856321323e5e75c7f214d2b18cce8d8bb49bea SHA256 cdf0743f4edddb71eaafa00f782ab3f03dc1ff246c5cb3ad4ab7530bef0d3545
+AUX freeciv-2.3.0-clean-man.patch 407 RMD160 e9496a4fce93c3aa9888e82e7c21f98912f39d8a SHA1 62c661aee67bbc1f3e40537091f95d53d5099a56 SHA256 6d97d500eecd868c624074c2dc5f5791cf9ed984fd294867cae2fd7d6b632f21
+AUX freeciv-2.3.1-clean-man.patch 359 RMD160 9b87554a73c4fc3c9ef238eb7cd05e7e5954e21a SHA1 7c68b41729112f61ecfee2245db87c93a50c2160 SHA256 1e553ad8ff05b606182bd48bf33109caac30210fc9a93bf102855d9e019e1235
+AUX freeciv-2.3.2-clean-man.patch 359 RMD160 9b87554a73c4fc3c9ef238eb7cd05e7e5954e21a SHA1 7c68b41729112f61ecfee2245db87c93a50c2160 SHA256 1e553ad8ff05b606182bd48bf33109caac30210fc9a93bf102855d9e019e1235
 DIST freeciv-2.3.0.tar.bz2 30239019 RMD160 1f017139c5ac4c24d1b4b6767aca84e18b9db31b SHA1 d4e871ad749e1807957df4e353fbb8f5510b7248 SHA256 f380f7f89a3478e8b2a68033b37325539248618508d94edf55b84e5e979fbefa
 DIST freeciv-2.3.1.tar.bz2 30528325 RMD160 84bb3f0381284b003a34c5a659f013c4fc75a3c4 SHA1 9d9ee9f48f4c945fc6525139d340443d5a25aac4 SHA256 236686fc7f9cf387aba26b6919a87a791fb23e8aabb19181823349983c986ad8
+DIST freeciv-2.3.2.tar.bz2 30695128 RMD160 63bea690cfd6953bfb30d320a3e3f7a69353b64c SHA1 e6267b5e0483cf9c29d01793d2f9433e73d62191 SHA256 95b1c8cb1bc859abc883221e3e89f67a53799071fdb1fea7b8727fbab0cb4c4e
 EBUILD freeciv-2.3.0.ebuild 3271 RMD160 ee7261bb17903317508814ba814f7bfc94332ded SHA1 b8c1cb9af01650963c7403589c69beb70152c87e SHA256 1bee66dcf7c4aecd2ca25e48c34535edb44cbd9b8719f6d9bfd948f3a67b872a
 EBUILD freeciv-2.3.1.ebuild 3297 RMD160 88e7686096a9d93a4b7c82ea4bd61dbfc877680e SHA1 5d6dbc377bd521ed5aa6b34f74792422153f3d59 SHA256 aa3b64accbd3ab1127297c1df00b52b53cd694825464e35de740c9102fc0c5cb
-MISC ChangeLog 19204 RMD160 26a63c21b16d76b69caeacc5f941db48d4aa337e SHA1 9bd1826fb5869ff991e865d5c50475785f3c17df SHA256 08d2afaba9bb1599e9cce1d3936c5ec197ad82d68323b99cd7e39c342434bb45
+EBUILD freeciv-2.3.2.ebuild 3297 RMD160 9d8e5771546ad1a5ad0ea0e59d6785038ea98d5b SHA1 2dbc5ded685ac58197d3b0f63425b0a50e31a0f9 SHA256 b207495132508372cbf0d3d18ead0aeb18992f752b5760d2b570328653f61d4a
+MISC ChangeLog 19457 RMD160 835ab3db239849ca73ca68d6e0070875fd442185 SHA1 dce94b8645fcf161e94159e8c884306ca2866057 SHA256 759edc6a222d03b9cdbb0dc5dac682085ef01a907777e77bc6f9a0b2cc7697d1
 MISC metadata.xml 389 RMD160 8df0338ed8960825740eb0a12e30725d238855dd SHA1 dcf97dda6c3ca4a024638c1f42914084d4d67984 SHA256 f235b6ab122a8aaaee297ee34fe84b294bd2b015ce8cde7c772a387585992f2f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk8S8ywACgkQuUQtlDBCeQIByQCfbhVGAuJLN6KbZQ9pr6gECxC4
-BlwAn2Ir96EEO8y2ADWeTat/fgE6xS2X
-=NG7R
------END PGP SIGNATURE-----
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
index ebac8144218b..6745a5005d93 100644
--- a/games-strategy/freeciv/files/freeciv-2.3.0-clean-man.patch
+++ b/games-strategy/freeciv/files/freeciv-2.3.0-clean-man.patch
@@ -1,5 +1,5 @@
---- 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
+--- doc/man/Makefile.in.orig
++++ doc/man/Makefile.in
 @@ -360,8 +360,7 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch
index a4ca3ce2a068..6dc1054ead18 100644
--- a/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch
+++ b/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch
@@ -1,5 +1,5 @@
---- doc/man/Makefile.in.orig	2011-11-30 10:50:39.673495365 -0500
-+++ doc/man/Makefile.in	2011-11-30 10:51:05.107409054 -0500
+--- doc/man/Makefile.in.orig
++++ doc/man/Makefile.in
 @@ -358,7 +358,6 @@
  top_srcdir = @top_srcdir@
  MAN_PAGES = \
diff --git a/games-strategy/freeciv/files/freeciv-2.3.2-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.3.2-clean-man.patch
new file mode 100644
index 000000000000..6dc1054ead18
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.3.2-clean-man.patch
@@ -0,0 +1,19 @@
+--- doc/man/Makefile.in.orig
++++ doc/man/Makefile.in
+@@ -358,7 +358,6 @@
+ top_srcdir = @top_srcdir@
+ MAN_PAGES = \
+ 	freeciv-server.6	\
+-	freeciv-client.6	\
+ 	freeciv-modpack.6
+ 
+ MAN_LINKS = \
+@@ -368,7 +367,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.2.ebuild b/games-strategy/freeciv/freeciv-2.3.2.ebuild
new file mode 100644
index 000000000000..027d7d8da6f6
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.3.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.3.2.ebuild,v 1.1 2012/04/02 18:10:36 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 \
+		modinst/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
+}