From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C0201382C5 for ; Sat, 5 Jun 2021 17:48:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86708E08E8; Sat, 5 Jun 2021 17:48:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69471E08E8 for ; Sat, 5 Jun 2021 17:48:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6B78340DB1 for ; Sat, 5 Jun 2021 17:48:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E00B275B for ; Sat, 5 Jun 2021 17:48:17 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1622915286.520793f9e323a38d14456e058d69c539735e2f9d.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeciv/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/freeciv/freeciv-2.6.4.ebuild X-VCS-Directories: games-strategy/freeciv/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 520793f9e323a38d14456e058d69c539735e2f9d X-VCS-Branch: master Date: Sat, 5 Jun 2021 17:48:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e582e920-e8d7-4abc-882f-b8319b70b87d X-Archives-Hash: f160e914a7ec26a827f95061550e9756 commit: 520793f9e323a38d14456e058d69c539735e2f9d Author: Marek Szuba gentoo org> AuthorDate: Sat Jun 5 17:45:29 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Sat Jun 5 17:48:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520793f9 games-strategy/freeciv: migrate to lua-single.eclass Builds and installs fine against lua5-3. Against lua5-4, src_configure dies with "configure: error: Use of included lua disabled, and no lua found from system" Note: USE=system-lua is still masked for this package, leaving it up to its maintainers to unmask it. Closes: https://bugs.gentoo.org/752711 Signed-off-by: Marek Szuba gentoo.org> games-strategy/freeciv/freeciv-2.6.4.ebuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild b/games-strategy/freeciv/freeciv-2.6.4.ebuild index 93312c18dcb..93e090d0ab5 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() {