Version bump (bug #543586). Permission kindly grantd by Mr_Bones_

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 205 insertions, 16 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 6bef3a15530e..0ca135d8f4cc 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.162 2015/03/09 11:44:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.163 2015/03/19 20:38:19 polynomial-c Exp $
+
+*freeciv-2.5.0 (19 Mar 2015)
+
+  19 Mar 2015; Lars Wendler <polynomial-c@gentoo.org> +freeciv-2.5.0.ebuild,
+  metadata.xml:
+  Version bump (bug #543586). Permission kindly grantd by Mr_Bones_.
 
   09 Mar 2015; Agostino Sarubbo <ago@gentoo.org> freeciv-2.4.4.ebuild:
   Stable for amd64, wrt bug #542504
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 2d6664f2a334..99d08b8f0c2e 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 DIST freeciv-2.3.4.tar.bz2 31395893 SHA256 084c10c50c06166177c9864b5610eaf36dca3808e3d3a7da8ef7ae927d56c41c SHA512 51d89321cf7b5b08d2338f8d76051ebde745c85e4ebad21b9ff2109696edfdc79ad43d7f8d2bf989400ce5e71f28127835dc4b4e60635fb71ebb3a2fb149269a WHIRLPOOL afcb5543049059d87503451c7d82abe6be765406fe3aba13fa01dec430062c4ed51c39b42827fb863a37c0b9737962f9557c6069f9d7be1efbd851c18268b6ce
 DIST freeciv-2.4.4.tar.bz2 38847925 SHA256 8307fc9d69571b031ccc465e8029d8a7ea3dbef4e3651f2de07356aba931e2a3 SHA512 3f2ff619b21c36748a98bda98c923ec9ea71faf18cac77d8b247e4a79c4a8f41c9b399e648a0a51fe54738de3276081c31ded98f769104812125d304716796a7 WHIRLPOOL 0eb8374ad2d7174dab8971c39c0ce7f14e72c1c7a64dfa8461a054a53d2b659af71197bad7c65e65e3e5da4fd5552bfb10aa2fa8b9870c9b1fbd7e03c58c9c00
+DIST freeciv-2.5.0.tar.bz2 40323793 SHA256 bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b SHA512 f03bafdca47da0677ad81ed945afe79bbd01ae871b95e6bdaf6249acb8420e78e3210dd60f520d960ec127e1d443f45c11fcc484b49b6bb59cab5904e51fc651 WHIRLPOOL 1a9768837b40c6c19ff6138d07074d96d75d2cecdb671180659d9380beb7c996fcb0be2fb343166fe46e92cc2c2e7495be2683f62440540cea3072f34e928391
 EBUILD freeciv-2.3.4.ebuild 3084 SHA256 33d92621a203f68f2d4ca61d9ff2878fc265873ba9938154daadc3c47bd663f5 SHA512 25fb6a542dffbae41e9e06f8bbb843a156190cddd01093edb463ad268593b1ce991e6f62b4e67855ca280c9f439204588984746282c4a11840c5641f63512e5e WHIRLPOOL a187339e6b7f2444844646c1137957fca28d94ceae3fad926aa816a939ad685c667a33a37c7fadc9061480e3656ee62879abf6aaef0c3c16030b4d90ba798137
 EBUILD freeciv-2.4.4.ebuild 4562 SHA256 e7e3947583e4307058c74de0b7584ab352d70a28475b19dc46b347420036fce8 SHA512 5bb81c5058a7f0830156268310f040853905cf88ae0771618853218711d2a56a904eaa7d04008d12a66cb93285caeb25c5282b7a1056aa99fe74f2d2d57b20af WHIRLPOOL 5d16fc71bab95e42c2a8caa95c1b433b74a827770a85dd20cdff9fcb0d87c18fd53589076e8b7a032f8b76ba0781fc6cb2e3eda076fd7d49e82fa1ff1610646a
-MISC ChangeLog 23129 SHA256 b521f1871a9dcd2a884bc0cc25fe7ecc7bd582e549a9d7a94b61ee668a0dfdc8 SHA512 7fc1eb7fa78bd7a8889e7cf8b6aaa04a7f59e78cded2b942de7e7c2ef13061ccb780cc4cebaa2f5666f684c0fc5b50b171b28c0fac1080d88be92f35f3d4caf0 WHIRLPOOL 7aa6a2391d41a0f1e97efc83bc1332f9aa123c0720f1a4da670f9131fabe8c105c506d4ea145ebcd24a0d8f2713944ad7ebedaaf8fdfc550e7110c215b05c18a
-MISC metadata.xml 766 SHA256 344b9d2e6a9530190830a3cd22fe4447c03b5d8bb3d4fdf9347afb3480bac1a7 SHA512 44ebb76fc37c9ba0e9ec81426462815d7e878a588337655ec215caa8bc9b8b8adfd0fb5bd9f09bff7ec5625c1b750a0c69baf519100139e65c84197395d2b5a5 WHIRLPOOL b7bb77adf21b60d7cfab0133e002da0d97d641a8b515594c70f3b70aae3edd3eb0a8485daa5023b211a64f0f4aa8894a912197eec066eaa9a98d7141be5664e1
+EBUILD freeciv-2.5.0.ebuild 4718 SHA256 b791ab809b00fe1cbacda29613a5fc4e2ae1151425d3e1bba635d19bb17a3326 SHA512 256d143835700179c7be7ef4beece872adf350ac288b8b20731194284ed19d06dbffe65d240e9925d60a66ca5a13bd3606f6ebac7e7de38871228bcaaecbc01c WHIRLPOOL 0b128ab14a1b117814427ac62ae2c78ee4b838aebeca64505445769015895ef2b8485de932db481e1820d8e5e0e0d8f50b8a68367151fb60802cca2fa867e076
+MISC ChangeLog 23331 SHA256 704d59f68bd4930a1e220d9110588e7c7beb6f2e0980c4785cf66ec64c5d41f0 SHA512 ae26d2a846acd16b7b5010453fc1ea860b0236e7841fc4bdb88a54f48ef80a0aa4786423808f52860b8b03e5f78202980a309c3efafd8a4b6cd416cb1c4911f7 WHIRLPOOL 9e49b7ff2ec24337f832ff627e3c402be4cbfac0533e16c040b9fb942f172f721bb6d00a54c7ed6b41aa290bc87d64c5dabe757b14afc76a2cfc68e121736d8f
+MISC metadata.xml 860 SHA256 ef2048f08823818e8c61405c153e38571a02db328010e8b8ab6b31fc02f4dbea SHA512 46f79f46321355ab35e00e71d1ac35bfefab6cc2619219e9cc44176bf1a0f1f914d946cf035b0459d219c82fd03c05230d93ea3096db23440784401ef71dfbc1 WHIRLPOOL fd747185eba3bd3584109dcb631c9d893342971a0d466059758568bc3b9760ff1aea048d949b7f2007b391a4b3041d98f8dc34ca3c1e0de795afe65f4651e9f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU/YevAAoJELp701BxlEWfabMP/A79ScB7E7Em9ETmhEUar4Np
-fFCZ16OYJHWXxI3RPcSTm4l0id5JrtVTkC0jTDH6OUBx2KTZBZCjMHNYWfBDjJgq
-olYhZWt+qTQGcz6U5Ka0zRkLSJLVDvbMx4SZHQwlmv0aNFmlyDCZTB5gombssHOq
-DIse2nC6ay7zBNK3WAOoQ3LI4g3CyZOC/4nBYIaaxRiH/Mqr65LEG4uSMz94w5gG
-ppa6Gne+Zg0xW5GLvTTZU2g6GB0HG1q/DmC3nyK4r5Mkc5lJSkxP2vMXI1vBo6CK
-72U1+C53dKY6TJzkctvsQ1aG4omgZ/09SflmFKrHBOhsbWXPGIBilVpAQaeegCfh
-kJ3M9pIHt9OUbd9dQnUoN/Pn1tyyKqFb/A9SGvwXM/pLz5RvG1mbiCS8gfbuaSoN
-U6DIk7TmU9rDXEEpmOEBKTfJTGiC8Sj1CpZ5RhCIaMbuMfRTLcDzmX0VhuB94Fhe
-XeHIX2bixIbBRyip9QqfKJL4akpsPnJf5E76QQo2XY2Y9mDwV31U+AObtSv5hRLC
-7GrMv4Vh2tABH+m46Vw9jiTw/yPjkiX7oXECy8mTa7QtPAw3/EgXmLkRWgHVIXnL
-V/Muz0qCGjSCrHi4R5psD5OgocFN1UaWt8jI7fPS3UghXqVE9/WjrgqKocurLS6w
-VoqfyLWft4Vdx2Q3ia/A
-=1RWC
+iQIcBAEBCAAGBQJVCzO8AAoJEPiazRVxLXTFTT8QAJoFA8tcWI1bBZdc/kqX5a+T
+6IbvtsMb1tg1LNf/FDsN6KwjKlyq21JVvWF1U+GdHKbWuCzFw8mvklad94kajHFk
+KcoBAWzvgqq7IfWf/X8u1zVNPGRTBjf4nphfKW4jktnrNFuJwsVR9HfvhuZCiX9T
+q36JLHKOghmVOsi6RhrZgKWVx1CZegD16t6eF+np8xDvd+z5fM52oUZvAw37fC6d
+wa+Yd8PUDN6rqgEU7na+vX7S3zhzKX+sYuFe/IBo+8uUa2DuU/wtoO8wRz7RPIdh
+h3xEvxZ6ETMRFp9uu/yLvoMR5HgvTmZXw3s9uVwq5TeETFQazmBVac2dUW6kleDl
+HWGQa5WawgmHTUE9deIm3k7ta0N1f/DEEwI1us60Gn2Nqh6mAjjkprbGHW4x5d0b
+j7GPBSl8qbeWa6QF3JYp0t1Ww/gjpsp8q5ud3zstefd5kogSkYqE6fI5glhQYP9x
+g8Aj13V9Ka0KRWjRrxgHwq60mDQTz9t2PQsv74bMiqK+xiWtpiQz5AdFyhEAci2+
+Lk3WGeD3GcRBN5NHXMgpKV83vFka2lnyYgQS3TWHipSsmi7UDIiYdQ8ezr+jg0nC
+KJWDvehVmys4a6Y0ShYVLhh8fR4KpGY0QDIPbluZrr0fHL4bw4WQp6Pl7mQID2n+
+QgcsvOyRYDA9FuNeH5jI
+=I6M8
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freeciv/freeciv-2.5.0.ebuild b/games-strategy/freeciv/freeciv-2.5.0.ebuild
new file mode 100644
index 000000000000..70d22424a3ee
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.0.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.5.0.ebuild,v 1.1 2015/03/19 20:38:19 polynomial-c Exp $
+
+EAPI=5
+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="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls postgres qt5 readline sdl +server +sound sqlite system-lua"
+
+RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
+	net-misc/curl
+	sys-libs/zlib
+	auth? (
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql )
+		sqlite? ( dev-db/sqlite:3 )
+		!mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) )
+	)
+	readline? ( sys-libs/readline:0 )
+	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+	!dedicated? (
+		media-libs/libpng:0
+		gtk? ( x11-libs/gtk+:2 )
+		mapimg? ( media-gfx/imagemagick )
+		modpack? ( x11-libs/gtk+:2 )
+		nls? ( virtual/libintl )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		sdl? (
+			media-libs/libsdl[video]
+			media-libs/sdl-gfx
+			media-libs/sdl-image[png]
+			media-libs/sdl-ttf
+		)
+		server? ( aimodules? ( sys-devel/libtool:2 ) )
+		sound? (
+			media-libs/libsdl[sound]
+			media-libs/sdl-mixer[vorbis]
+		)
+		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+	)
+	system-lua? ( >=dev-lang/lua-5.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 \
+		tools/Makefile.in \
+		data/icons/Makefile.in || die
+	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.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 qt5 ; then
+			einfo "No client backend given, defaulting to"
+			einfo "gtk2 client!"
+			myclient="gtk2"
+		else
+			use sdl && myclient+=" sdl"
+			use gtk && myclient+=" gtk2"
+			use qt5 && myclient+=" qt"
+		fi
+		myopts="$(use_enable server) --without-ggz-client"
+	fi
+
+	# disabling shared libs will break aimodules USE flag
+	egamesconf \
+		--docdir="/usr/share/doc/${P}" \
+		--localedir=/usr/share/locale \
+		$(use_enable ipv6) \
+		$(use_enable mapimg) \
+		--enable-aimodules="$(usex aimodules "yes" "no")" \
+		--enable-shared \
+		--enable-fcdb="${mydatabase}" \
+		$(use_enable nls) \
+		$(use_with readline) \
+		$(use_enable sound sdl-mixer) \
+		--enable-fcmp="$(usex modpack "gtk2" "no")" \
+		$(use_enable system-lua 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...
+			./tools/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
+
+	rm -f "${D}$(games_get_libdir)"/*.a
+	prune_libtool_files
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
index 041baf96388f..825ff1b8de82 100644
--- a/games-strategy/freeciv/metadata.xml
+++ b/games-strategy/freeciv/metadata.xml
@@ -15,5 +15,7 @@
 			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>
+		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of
+			the bundled liblua</flag>
 	</use>
 </pkgmetadata>