gentoo resync 04.02.2018

4 files changed, 182 insertions, 3 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 3257ddf02eee..d30b15426e8b 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 44cc1360e0eb..5fd258cd32f4 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,7 @@
+DIST freeciv-2.5.10.tar.bz2 40920632 BLAKE2B 1fb6d3d8130088c818ffe95c68a4061732278da8b7e477347cc67e7cc770526a65006844db0d3ecdb462a903fb5589d18666ffe6c9262956bf30fbc0c79742e5 SHA512 198ea42af083ebbfc4d79cbcbc9fc2dd548c92581301d77fd9cff0e2addc7b7255090471dc52aceb966320958b3a4c542615d5ec91a114dfc805fe993864a6f5
 DIST freeciv-2.5.9.tar.bz2 41176249 BLAKE2B d590318e8f03c726fd36714751ed666574951bf988a37b1ee6527a07dcdf4e637cfa525c2ecdf83d537fefdc4c3fd4a3db2c0e037424825af6d1c38f009293c9 SHA512 e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677
-DIST freeciv-2.6.0-beta1.tar.bz2 51744941 BLAKE2B e9d25aee0b13c189ff3a0c6a94c8925075fb7da22f40308db5db8d3bec580f46179228bd278279f0aa1d2fff606913af94ed1b25ae4d51f677f98738a056fb97 SHA512 5e70239e375710ec61f69f6daaa62d1c6881df3f5ddb2905229e2c0cec5cad9ce33688693580b2a24aa5aff79471cda4dbef4f9d51df34bd491b5284b12782e5
+DIST freeciv-2.6.0-beta2.tar.bz2 51503051 BLAKE2B 45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b SHA512 e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976
+EBUILD freeciv-2.5.10.ebuild 4479 BLAKE2B 32598e62346d6dce4a2619b3dfc0b420570096c22c0d8fd1370b3ed993ad8de94f8f19bccd2f507cbabf486c26a15242842c538e1964d44e05e9e7035bbfa45f SHA512 1c0e9534ae300177ffa95270cc2ab3771f22c10fb824595353a05347db88afbc28c394eb6be69a4a5ea2e1ea963bf6a7600196080d326e7b4e9aabbbe9c46f24
 EBUILD freeciv-2.5.9.ebuild 4479 BLAKE2B 485d96ca30a282fbb74123f7b790a0542ac2afe9840926f035316aa1a7a07a7363d7be9fc8bceff80648e869804ef528e5c59546731d4d463cc61871f7adb4b2 SHA512 74e95249151f15bf63cb82a0bf7f3d3472ff33eb47882fce67e4dfe531dc9f6ec207f522faf0b8b6ae47583600b54328b636cb0103d864823374d2819561acd4
-EBUILD freeciv-2.6.0_beta1.ebuild 4645 BLAKE2B 3ccc20fa4e1db55cc6de71a7e7420019172a3c787a22a3bed4bb7f0e4b8d179d4abd2a1f81de4e29fcb172d4f61dbc071a077338637b60b05ebbe61fe110ee6f SHA512 ac35d5ea418b765360f1771eb14e9a03c47c725b379d4e30f679dd8189b4a14dd15d98f1d32db505c5e4fb92aa79568ea71898e5c699447ce5b966cb2ccd2e35
+EBUILD freeciv-2.6.0_beta2.ebuild 4645 BLAKE2B 98fcba2d7b6b879e0446c56bf380b863b9862456568b6d674260a89077bec082af9c7d792938f3550ff05ea7ff5adb4a35f74e4664a8798f2b0812e320e377c7 SHA512 1d2994b0c2b5f3eb6112ffd9ff4f51a3e8d21a7ce99f119b9e00ec1b4b86960e767860d1ec8322f3f85505ce4d55dec0451a5c71d1fd9bd673ba9acec556d75d
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.5.10.ebuild b/games-strategy/freeciv/freeciv-2.5.10.ebuild
new file mode 100644
index 000000000000..b235bb640ff1
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.10.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils
+
+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 ~ppc64 ~x86"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
+
+# postgres isn't yet really supported by upstream
+RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
+	net-misc/curl
+	sys-libs/zlib
+	auth? (
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!mysql? ( ( !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
+}
+
+src_prepare() {
+	default
+
+	# 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 mydatabase myeconfargs
+
+	if use auth ; then
+		if ! use mysql && ! use sqlite ; then
+			einfo "No database backend chosen, defaulting"
+			einfo "to mysql!"
+			mydatabase=mysql
+		else
+			use mysql && mydatabase+=" mysql"
+			use sqlite && mydatabase+=" sqlite3"
+		fi
+	else
+		mydatabase=no
+	fi
+
+	if use dedicated ; then
+		myclient="no"
+		myeconfargs+=( --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"
+			if use qt5 ; then
+				myclient+=" qt"
+				append-cxxflags -std=c++11
+			fi
+		fi
+		myeconfargs+=( $(use_enable server) --without-ggz-client )
+	fi
+
+	myeconfargs+=(
+		--enable-aimodules="$(usex aimodules "yes" "no")"
+		--enable-client="${myclient}"
+		--enable-fcdb="${mydatabase}"
+		--enable-fcmp="$(usex modpack "gtk2" "no")"
+		# disabling shared libs will break aimodules USE flag
+		--enable-shared
+		--localedir=/usr/share/locale
+		$(use_enable ipv6)
+		$(use_enable mapimg)
+		$(use_enable nls)
+		$(use_enable sound sdl-mixer)
+		$(use_enable system-lua sys-lua)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use dedicated ; then
+		rm -rf "${ED%/}/usr/share/pixmaps"
+		rm -f "${ED%/}"/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
+			docinto html
+			dodoc manual*.html
+		fi
+		if use sdl ; then
+			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+		else
+			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
+		fi
+		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
+	fi
+	find "${ED}" -name "freeciv-manual*" -delete
+
+	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild
index 4fc0202df506..85687658671c 100644
--- a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6