[gentoo-commits] repo/gentoo:master commit in: profiles/base/, games-strategy/naev/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, games-strategy/naev/

[Ionen Wolkens]

commit:     f5eb679d5cf045fca91bb3552d3647fd0f30f17e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 15:43:36 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 15:45:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5eb679d

games-strategy/naev: force luajit for >=0.12

Also lets us drop the selection workaround.

Closes: https://bugs.gentoo.org/946881
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/naev/naev-0.12.0.ebuild | 8 +++-----
 profiles/base/package.use.force        | 5 +++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/games-strategy/naev/naev-0.12.0.ebuild b/games-strategy/naev/naev-0.12.0.ebuild
index d1d0dfb99967..31298e490603 100644
--- a/games-strategy/naev/naev-0.12.0.ebuild
+++ b/games-strategy/naev/naev-0.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{10..13} )
 inherit lua-single meson python-any-r1 virtualx xdg
 
@@ -87,18 +87,16 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# use eclass' generated lua.pc first rather than as fallback
-	sed -i "s/'lua51'/'lua'/" meson.build || die
-
 	# don't probe OpenGL for tests (avoids sandbox violations, bug #829369)
 	sed -i "/subdir('glcheck')/d" test/meson.build || die
 }
 
 src_configure() {
 	local emesonargs=(
+		# *can* do lua5-1 but upstream uses+test luajit most (bug #946881)
+		-Dluajit=enabled
 		$(meson_feature doc docs_c)
 		$(meson_feature doc docs_lua)
-		$(meson_feature lua_single_target_luajit luajit)
 	)
 
 	meson_src_configure

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index e79e18f28a2e..6546f32dd3f4 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2024-12-24)
+# ebuild currently only support luajit, spare users from having
+# to set it by forcing it here (bug #946881)
+>=games-strategy/naev-0.12 lua_single_target_luajit
+
 # Michał Górny <mgorny@gentoo.org> (2024-12-18)
 # Force building these LLVM runtimes with Clang.  GCC builds are not
 # supported upstream (to the point of refusing bug fixes), and are