From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- games-strategy/freeciv/Manifest | 2 +- games-strategy/freeciv/freeciv-2.6.4.ebuild | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'games-strategy/freeciv') diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index 2c43df92e460..66a4ba0597cb 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,3 +1,3 @@ DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04 SHA512 4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221 -EBUILD freeciv-2.6.4.ebuild 4743 BLAKE2B 617ad28e21a810514396044c77668f18f6dc2443001ffc7e62392399e3c573fc15d869daf7e18fcaa4198f261f9decf0facd4455b857a231e680cd56a9f3006a SHA512 a1961db7bc8027c1484963504c0d7a3adf9c2d3ed1e30c582379df1c55aa9074adfd9b580802f3ce35f56df953d4cd3565cd9eb52aa2cebdd7af42ec059e6717 +EBUILD freeciv-2.6.4.ebuild 4861 BLAKE2B c385708a6bba1ab946bebf957e96195ad15c9e4658a6362e287adaaa67bc781c069990a410aa41d78138025b9fea7cd7b7f3776c407dee78de4c1bb3e8088266 SHA512 b8753fd5ab8da3eddcc929c31e897a68691e85a1109bd8b07de6feeb0011aeab21ef2e9975b82cdf4563382148d2290fffdf823b675915a4ef49a46ff62e0b51 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201 diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild b/games-strategy/freeciv/freeciv-2.6.4.ebuild index 93312c18dcb0..93e090d0ab52 100644 --- a/games-strategy/freeciv/freeciv-2.6.4.ebuild +++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild @@ -3,10 +3,12 @@ EAPI=7 +LUA_COMPAT=( lua5-3 ) + MY_PV="${PV/_beta/-beta}" MY_PV="${MY_PV/_rc/-RC}" MY_P="${PN}-${MY_PV}" -inherit desktop flag-o-matic qmake-utils xdg +inherit desktop flag-o-matic lua-single qmake-utils xdg DESCRIPTION="Multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/" @@ -20,6 +22,8 @@ LICENSE="GPL-2+" SLOT="0" IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" +REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )" + RDEPEND=" app-arch/bzip2 app-arch/xz-utils @@ -56,7 +60,7 @@ RDEPEND=" ) ) readline? ( sys-libs/readline:0= ) - system-lua? ( >=dev-lang/lua-5.3:= ) + system-lua? ( ${LUA_DEPS} ) " DEPEND="${RDEPEND} !dedicated? ( x11-base/xorg-proto ) @@ -74,6 +78,8 @@ pkg_setup() { ewarn "Disabling server USE flag will make it impossible to start local" ewarn "games, but you will still be able to join multiplayer games." fi + + use system-lua && lua-single_pkg_setup } src_prepare() { -- cgit v1.2.3