gentoo resync : 16.04.2022

2 files changed, 21 insertions, 14 deletions

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 527bdcfa4894..4bff5f9b43f3 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,3 @@
-DIST freeciv-2.6.6.tar.bz2 52244748 BLAKE2B 88f85b8345b0a2baaa6626a6ab0c8a68e1e7a9a189f661b4fb800572090bf999c62e64641eae36a48b5d90a988bf43b839a411a60af285fbc234e2ca20fadd0c SHA512 97723d260c4e40328aaf26606a4f37871958b58a475cd3fc635edf2e94d28d486c6e28a75b42126e9e69580a60d24fc490da086877d0c912a544d643ff69b103
-EBUILD freeciv-2.6.6.ebuild 4820 BLAKE2B f6c511a8f73375a1aefd77eac76d715b47c70a6d2be8027ca4b3905235125bdec4e35054dd4c84b420fcc90c8b350af6a3a7873fae03a18cfc9a69fa857147f9 SHA512 79a66156a12c6677a05bd6d0f2f9585865cee0c8a3738810ddfa8fbe4f350a7ccee59314bbfa0507dee4571ba4d968a78ebb0effb5c0d0d231b65e1b53d03fbf
+DIST freeciv-3.0.1.tar.xz 33528292 BLAKE2B e19cae8a02aa4b9afc2895560aa7a8d6135a63a0e757c348a75e72522448a026874f8f0120448b38ca2fee0ecc42dd04d80345d9877554168ad07ca2a20e5dcc SHA512 0f28aa7eb6adc2c4fe2af31265965ec30b4ea4f12121c4240ca896070f4ea574db58f02240e74822b9d498e112bcdb7036bb69f3d0b33cea5fec724e9e47da34
+EBUILD freeciv-3.0.1-r1.ebuild 5071 BLAKE2B 016bd7abc69e5dc7897274493e17202339a2674a07ac55d03a3eb3d7b156c8ad4b91a5c1905199ea0b874d717c451d62cf921b05d9aa83cb4bc0a4c125ccf7f2 SHA512 f61cd1f3daf936ff8dc4d9e1102e13973c6cee392a6c560c2137a869dd1f61f85ced50bee9a26dfc22e94e084115f18d7bf48d49db1685959af6a5efdc81b2f7
 MISC metadata.xml 1032 BLAKE2B cbb77e1508bd7149685571dddad89fde9e9f4f8e7c1893b689f508470e11892d5f363af4721e7a21d4026cb3338e161e527149f661020e8d4c04dae9550b6658 SHA512 88937e8b06608fadb6448c7bf61b3f095dab2c5962535d609fc341343e8e27171da8f247ecbd160df49ab6dddc10e17136754cab4624102df49da6a026e2df94
diff --git a/games-strategy/freeciv/freeciv-2.6.6.ebuild b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
index 3f7037e7e0e1..01f0ad879e67 100644
--- a/games-strategy/freeciv/freeciv-2.6.6.ebuild
+++ b/games-strategy/freeciv/freeciv-3.0.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 
@@ -15,7 +15,7 @@ DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
 
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
+	SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -25,19 +25,21 @@ IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline s
 
 REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
 
+# postgres isn't yet really supported by upstream
 RDEPEND="
 	app-arch/bzip2
 	app-arch/xz-utils
 	net-misc/curl
+	dev-libs/icu:=
 	sys-libs/zlib
 	auth? (
-		!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
-		mysql? ( dev-db/mysql-connector-c:0= )
+		!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) )
+		mysql? ( dev-db/mysql-connector-c:= )
 		sqlite? ( dev-db/sqlite:3 )
 	)
-	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+	dedicated? ( aimodules? ( dev-libs/libltdl ) )
 	!dedicated? (
-		media-libs/libpng:0
+		media-libs/libpng
 		gtk? ( x11-libs/gtk+:3 )
 		mapimg? ( media-gfx/imagemagick:= )
 		modpack? ( x11-libs/gtk+:3 )
@@ -54,20 +56,21 @@ RDEPEND="
 			media-libs/sdl2-image[png]
 			media-libs/sdl2-ttf
 		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
+		server? ( aimodules? ( sys-devel/libtool ) )
 		sound? (
 			media-libs/libsdl2[sound]
 			media-libs/sdl2-mixer[vorbis]
 		)
 	)
-	readline? ( sys-libs/readline:0= )
+	readline? ( sys-libs/readline:= )
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}
 	!dedicated? ( x11-base/xorg-proto )
 "
-# postgres isn't yet really supported by upstream
+# Calls gzip during build
 BDEPEND="
+	app-arch/gzip
 	virtual/pkgconfig
 	!dedicated? ( nls? ( sys-devel/gettext ) )
 "
@@ -170,9 +173,13 @@ src_install() {
 			# 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 classic*.html
+			# freeciv-manual only supports one ruleset argument at a time.
+			for RULESET in alien civ1 civ2 civ2civ3 classic experimental multiplayer sandbox
+			do
+				./tools/freeciv-manual -r ${RULESET} || die
+				docinto html/rulesets/${RULESET}
+				dodoc ${RULESET}*.html
+			done
 		fi
 		if use sdl ; then
 			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client