version bump wrt #487012

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 226 insertions, 19 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index d79f0b60f0c6..559638c15d0a 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.148 2014/05/15 17:03:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.149 2014/05/22 19:00:19 hasufell Exp $
+
+*freeciv-2.4.2 (22 May 2014)
+
+  22 May 2014; Julian Ospald <hasufell@gentoo.org> +freeciv-2.4.2.ebuild,
+  metadata.xml:
+  version bump wrt #487012
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> freeciv-2.3.4.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 2128fd684cbb..851225cb6b3b 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -2,20 +2,27 @@
 Hash: SHA256
 
 DIST freeciv-2.3.4.tar.bz2 31395893 SHA256 084c10c50c06166177c9864b5610eaf36dca3808e3d3a7da8ef7ae927d56c41c SHA512 51d89321cf7b5b08d2338f8d76051ebde745c85e4ebad21b9ff2109696edfdc79ad43d7f8d2bf989400ce5e71f28127835dc4b4e60635fb71ebb3a2fb149269a WHIRLPOOL afcb5543049059d87503451c7d82abe6be765406fe3aba13fa01dec430062c4ed51c39b42827fb863a37c0b9737962f9557c6069f9d7be1efbd851c18268b6ce
+DIST freeciv-2.4.2.tar.bz2 38545497 SHA256 025d3cf51237a0c12422a5f100460a22ce1236b650a1e73cbd1c13c0b0676ce0 SHA512 de2b409b113c0da4cb3279d31f6525e94c9123806e71b183639ac8f7ed5af58520109cf3ce7561637146a11c4d2aa44c74818a7445824c399297009722d98a7c WHIRLPOOL eab5eb1120d325ebfd09be3250f79deea9c9b1208b5dc0b30df5675882594546305b47bd35178a7bc518868be999a2315cd21c3017aa6df26846deea9ab8d2e6
 EBUILD freeciv-2.3.4.ebuild 3216 SHA256 c1d1c253fbf8c4864dc6611f647288d091244113ea137f524b7341cb41c1b8e7 SHA512 ad68f749101cfc93ed18757a80fdecc181a0081f30647f666a896e53c0ecd338811e1d8089f8852b6953b0026627eecb26d148180d5971ae5ed7f3c5ed2afea1 WHIRLPOOL 1cd41f64b65e78fd3108f19daca21a32692cb4664dfdb87468ee9a0bbd4ef5a45b4ffa64c06ae7928e8ea71911feb21e4e67fc56df29211604d442c176607b1e
-MISC ChangeLog 21245 SHA256 94d2b1d0e7ce274582302a76b1cd4b9d1bafa6a34ec3803f96e6f37f7d88b85a SHA512 149bc97ca4a9330def288a53f7c76a5e2cfe90c1aa0bc583b177546ecf3e7e935dac435de25d6c3ef7252373d7fbf705f28f50aaaf4957cd0da0dd7a2e18b639 WHIRLPOOL a9050d21e59ae185e3b4170146d61eb1373fb14cd168cbfdadad12ed3ef6d3f65fbeaf02bbbc8978b6c66b6999c7b0543b5beef05dd524dd0e1eb77871913815
-MISC metadata.xml 389 SHA256 f235b6ab122a8aaaee297ee34fe84b294bd2b015ce8cde7c772a387585992f2f SHA512 af497be698410d0fd2a006ff7b7768be9d9a2aec79a247721bf7675e6e15b811eb4cf6f6fd917f85db06f0e0c79c6b61c9a1a245035f2672e0548817d2101670 WHIRLPOOL c11bf694279d81c2f94c3766fd7e05180e9e291dfd7c63471eb3ce1b30201ecedccc6ddb16886e939afb7feefb34f5233d477e19e5b5c93a58b8146aab5366d4
+EBUILD freeciv-2.4.2.ebuild 4895 SHA256 9b520c345a20839830ab3de81cda18b9c54d8324a8a4248c200d30694cecd18c SHA512 ca642370608ed0e6107a0abef2065aeeee1bea44b4046cfea0d9553a05708554b61ddf22d7c59758a4eacc20e0b86b837b25f0e6d4f7f57463512d1ebe1da668 WHIRLPOOL 140d7d7df5f357c18c0f0fc2b467824d5f966cb56408bfc8b4d9f2500344450a7588fa2e80d52f7ca33e438439cead2f6c391c37e425c273f73060a206ec48b6
+MISC ChangeLog 21398 SHA256 4c23c1a8e4d9f7d537dc581c722a16600ad3a49c4abeb9dc0c4e824200c58848 SHA512 6e7db24087ca06fee63def097108fe5746de63c1490ce32ab25e9fa132e78feca3ab9c1a3f0e7f4341c0556d5c62af28859356223438448ea6fb580f646434a2 WHIRLPOOL f98d7bed7749ebcc994130e5765960014d33936593f998b132e6b70a653ed0dfe04c66d07be2c2737c68dafc9a999bc11a94e328cafa2bfa2446b574d50798e2
+MISC metadata.xml 824 SHA256 6cc757311f3ca78853f0cfca67a322d1f332d93b9fdf44cab82957babcf2cdec SHA512 be03ae743496462b779cc6e4f8f2a2b1f2db534fc8bf14060c313843d2c5180bb7d38b6262b9cd4a93aa2ed2116fa5c8f5ad19bd565d7a55f5d7cb4c3d5e480d WHIRLPOOL d3ec0e0b75475c7b9455062be02ad0f575cb1d052118dd83ca6c6bb16171306dd2c0986f13639ae9f3cfce974afac7270bcadce5ace7aca0986a9b88da2e15c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTdPNjAAoJEJQzkH1pP7W4QAML/ilOvPwd2wx4BwkksNFYYAU6
-hmaGAREIbNQaHhgQYxJ8wpp6Wf6SFTVLmsMfPGbP/sg7LBxZpFOwtSbccw9ZZU5l
-qG6sKBgoEL59XlFcv5MNrH7rIQolZcc8JQLbIF5WMO2OLVEj6jOQydS0hcj759p9
-wlkFkGbyGi3IrbzVYD9aIIj3wLVAVJ5X5NjFQs2/2+dTTIQoqQf1MKielwGUrv7f
-MoXJIzqgWL8RVmRrSVWQUmo+FMDXwxjHkLwloZNyKRSQAcRn+JJkmIO0WYDsJwYF
-8C3ZqKWK8MRNxqlZauUcQerDazEGoJ/BnpFw+70ofy55nc/IwdkiM4l78FpvhOGB
-w7IVsRwMtokAp8K2I2ZaOo5rNwavkXQcJt1t94TxCY93PGOGn2mQYZKyHFHOiNXq
-zFSoRHjKx4oIGOw0ZUzVQ74jQL94Nw0w+fm60HvGJL4qB8H8i0c3ab/ZrsuJtKMo
-a4oF4vR4YhP+Y8vKVbx9kHfDIYVDyLtQ/MIbb5BHtQ==
-=bajX
+iQJ8BAEBCABmBQJTfklGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgpwgP/jSRCvgJGejgVslwGllUmSJF
+pRGM5wdoO8jPbdfwOJf6tiAd8sf7fVviVN+ZCiy74Xbrm7cDaaIMiECZmKtnVlky
+EKkRrFmA6I70jaQXr5JUo6U3cRPCJe1SZAbV5PKYwTaS61owdYgewDYY0o4ZqwkB
+mUJmi3auL6E9VXdKyqIDnT9imQKsbame3lYIR3OBfy2nHIl2yrY4uuKQBvty7ZLX
+sK6ksrylrBKjXMd0JI+5r3Z4oxRMYqWVzgbYAE6c7WLTdv/NaEQDLhM3D6Bm7zeJ
+zyD3Q98n+HX8oIHE28SOw1uiQIKHYJwUOJxlHIbP/iUfcJnl1MpRbsKi/M5GyA7R
+X5CDQkG+UvvIE/rGlQPuSiUVF8kq0CQTn1lDs4bV6/MdC+7Tl4gbTQTjyRf6gSUH
+K4ZN589XdcOvXZ0oL9bWwwu4mGZadYurOpQ6Xs3TdCQnvXkfuFRXf6F/59vZecY7
+NGAtmNgP6mrGmWpaBv+UgTq5IbUhKvD5FwyV0TQ0C53vY2crPbWXAY9fpSLAR8AL
+7i76wtoKp5TRb7SJLv5eZKO/2J4TTy+LpikgZy3xoRsrDtAwqjUUwqzNf2j7c8o0
+VyiAGhqMwFDF/J6gqVa4piARWDqX6jTiuYxR+Lm1ppodrT9N3IqxO36h+5wjtiNb
+7Iw/uOF38SIibVkh0slN
+=ylg0
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freeciv/freeciv-2.4.2.ebuild b/games-strategy/freeciv/freeciv-2.4.2.ebuild
new file mode 100644
index 000000000000..b5c35166bd6a
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.4.2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.2.ebuild,v 1.1 2014/05/22 19:00:19 hasufell Exp $
+
+# FIXME: gtk3 support breaks ggz support
+
+EAPI=5
+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 aimodules dedicated ggz +gtk ipv6 mapimg modpack mysql nls postgres qt4 readline sdl +server +sound sqlite"
+
+RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/lua
+	net-misc/curl
+	sys-libs/zlib
+	auth? (
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql-base )
+		sqlite? ( dev-db/sqlite:3 )
+		!mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) )
+	)
+	readline? ( sys-libs/readline )
+	dedicated? ( aimodules? ( sys-devel/libtool:2 ) )
+	!dedicated? (
+		media-libs/libpng:0
+		ggz? ( games-board/ggz-gtk-client )
+		gtk? ( x11-libs/gtk+:2 )
+		mapimg? ( media-gfx/imagemagick )
+		modpack? ( x11-libs/gtk+:2 )
+		nls? ( virtual/libintl )
+		qt4? (
+			dev-qt/qtcore:4
+			dev-qt/qtgui:4
+		)
+		sdl? (
+			media-libs/libsdl[video]
+			media-libs/sdl-image[png]
+			media-libs/freetype:2
+		)
+		server? ( aimodules? ( sys-devel/libtool:2 ) )
+		sound? (
+			media-libs/libsdl[sound]
+			media-libs/sdl-mixer[vorbis]
+		)
+		!sdl? ( !gtk? ( !qt4? ( x11-libs/gtk+:2 ) ) )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!dedicated? (
+		x11-proto/xextproto
+		nls? ( sys-devel/gettext )
+	)"
+
+pkg_setup() {
+	if use !dedicated && use !server ; then
+		ewarn "Disabling server USE flag will make it impossible"
+		ewarn "to start local games, but you will still be able to"
+		ewarn "join multiplayer games."
+	fi
+	games_pkg_setup
+}
+
+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
+}
+
+src_configure() {
+	local myclient myopts mydatabase
+
+	if use auth ; then
+		if use !mysql && use !postgres && use !sqlite ; then
+			einfo "No database backend chosen, defaulting"
+			einfo "to mysql!"
+			mydatabase=mysql
+		else
+			use mysql && mydatabase="${mydatabase} mysql"
+			use postgres && mydatabase="${mydatabase} postgres"
+			use sqlite && mydatabase="${mydatabase} sqlite3"
+		fi
+	else
+		mydatabase=no
+	fi
+
+	if use dedicated ; then
+		myclient="no"
+		myopts="--enable-server"
+	else
+		if use !sdl && use !gtk && use !qt4 ; then
+			einfo "No client backend given, defaulting to"
+			einfo "gtk2 client!"
+			myclient="gtk2"
+		else
+			use sdl && myclient="${myclient} sdl"
+			use gtk && myclient="${myclient} gtk2"
+			use qt4 && myclient="${myclient} qt"
+		fi
+		myopts="$(use_enable server) $(use_with ggz ggz-client)"
+	fi
+
+	# disabling shared libs will break aimodules USE flag
+	egamesconf \
+		--localedir=/usr/share/locale \
+		$(use_enable ipv6) \
+		$(use_enable mapimg) \
+		--enable-aimodules="$(usex aimodules "yes" "no")" \
+		--enable-shared \
+		--enable-fcdb="${mydatabase}" \
+		--with-ggzconfig=/usr/bin \
+		--enable-noregistry="${GGZ_MODDIR}" \
+		$(use_enable nls) \
+		$(use_with readline) \
+		$(use_enable sound sdl-mixer) \
+		--enable-fcmp="$(usex modpack "gtk2" "no")" \
+		--enable-sys-lua \
+		${myopts} \
+		--enable-client="${myclient}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use dedicated ; then
+		rm -rf "${D}/usr/share/pixmaps"
+		rm -f "${D}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
+	else
+		if use server ; then
+			# Create and install the html manual. It can't be done for dedicated
+			# servers, because the 'freeciv-manual' tool is then not built. Also
+			# delete freeciv-manual from the GAMES_BINDIR, because it's 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
+			dohtml manual*.html
+		fi
+		if use sdl ; then
+			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+		else
+			rm -f "${D}"/usr/share/man/man6/freeciv-sdl*
+		fi
+		rm -f "${D}"/usr/share/man/man6/freeciv-xaw*
+	fi
+	find "${D}" -name "freeciv-manual*" -delete
+
+	dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
+	rm -f "${D}$(games_get_libdir)"/*.a
+	prune_libtool_files --all
+
+	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
+}
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
index 8bd84f44148b..c8a038f61f0d 100644
--- a/games-strategy/freeciv/metadata.xml
+++ b/games-strategy/freeciv/metadata.xml
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
-  <use>
-    <flag name="auth">Add authentication capability</flag>
-    <flag name="ggz">Add support for GGZ Gaming Zone</flag>
-	<flag name="sound">Add support for sound provided by <pkg>media-libs/sdl-mixer</pkg></flag>
-  </use>
+	<herd>games</herd>
+	<use>
+		<flag name="aimodules">Support for dynamically loadable AI
+			modules (server-side)</flag>
+		<flag name="auth">Add authentication capability via
+			mysql, postgres or sqlite3</flag>
+		<flag name="ggz">Add support for GGZ Gaming Zone</flag>
+		<flag name="mapimg">Additional mag image toolkit
+			via <pkg>media-gfx/imagemagick</pkg></flag>
+		<flag name="modpack">Build the freeciv-modpack-program
+			to download/install mods</flag>
+		<flag name="server">Enable server support. Disabling this
+			will also make it impossible to start local games.</flag>
+		<flag name="sound">Add support for sound provided by
+			<pkg>media-libs/sdl-mixer</pkg></flag>
+	</use>
 </pkgmetadata>