summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongxiang Liang <tanekliang@gmail.com>2025-06-16 02:42:50 +0800
committerYixun Lan <dlan@gentoo.org>2025-06-21 12:46:48 +0000
commitf93f43d107eefa60e90e2d5d0b90ad521cd444c9 (patch)
treec8203f26171297068b79b5696f0ca68e03fb7346
parentdc1ecd3b427c3fefa580047ff8493e62c85fbd02 (diff)
downloadgentoo-f93f43d107eefa60e90e2d5d0b90ad521cd444c9.tar.gz
gentoo-f93f43d107eefa60e90e2d5d0b90ad521cd444c9.tar.bz2
gentoo-f93f43d107eefa60e90e2d5d0b90ad521cd444c9.zip
app-i18n/librime-lua: fix CMake 4, update to EAPI 8, re-add Lua 5.1 & LuaJIT
Upstream treats librime-lua as a source-level plugin that is built together with librime, so it never set an explicit minimum CMake version. The ebuild now patches CMakeLists.txt to declare `cmake_minimum_required(VERSION 3.12)`, matching librime. Also re-enable support for lua5.1 and luajit. Closes: https://bugs.gentoo.org/913118 Closes: https://github.com/gentoo/gentoo/pull/42612 Signed-off-by: Yongxiang Liang <tanekliang@gmail.com> Signed-off-by: Yixun Lan <dlan@gentoo.org>
-rw-r--r--app-i18n/librime-lua/librime-lua-20240819212322-r1.ebuild (renamed from app-i18n/librime-lua/librime-lua-20240819212322.ebuild)8
-rw-r--r--app-i18n/librime-lua/librime-lua-99999999999999.ebuild8
2 files changed, 8 insertions, 8 deletions
diff --git a/app-i18n/librime-lua/librime-lua-20240819212322.ebuild b/app-i18n/librime-lua/librime-lua-20240819212322-r1.ebuild
index d1f5dd7e4886..d103b463fc09 100644
--- a/app-i18n/librime-lua/librime-lua-20240819212322.ebuild
+++ b/app-i18n/librime-lua/librime-lua-20240819212322-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-LUA_COMPAT=( lua5-{3..4} )
+EAPI="8"
+LUA_COMPAT=( lua5-{1..4} luajit )
inherit cmake lua-single
@@ -36,7 +36,7 @@ fi
src_prepare() {
sed \
- -e "1icmake_minimum_required(VERSION 3.0)\nproject(${PN})\n" \
+ -e "1icmake_minimum_required(VERSION 3.12)\nproject(${PN})\n" \
-e "s/ PARENT_SCOPE//" \
-e "\$a\\\n" \
-e "\$aadd_library(\${plugin_modules} MODULE \${plugin_objs})" \
diff --git a/app-i18n/librime-lua/librime-lua-99999999999999.ebuild b/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
index 9f01797781a9..79886c25f087 100644
--- a/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
+++ b/app-i18n/librime-lua/librime-lua-99999999999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-LUA_COMPAT=( lua5-{3..4} )
+EAPI="8"
+LUA_COMPAT=( lua5-{1..4} luajit )
inherit cmake lua-single
@@ -35,7 +35,7 @@ fi
src_prepare() {
sed \
- -e "1icmake_minimum_required(VERSION 3.0)\nproject(${PN})\n" \
+ -e "1icmake_minimum_required(VERSION 3.12)\nproject(${PN})\n" \
-e "s/ PARENT_SCOPE//" \
-e "\$a\\\n" \
-e "\$aadd_library(\${plugin_modules} MODULE \${plugin_objs})" \