commit: 15e6e5e1876ad502cc9002feef4bff84b728e9e4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 11:35:03 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 11:39:22 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e6e5e1
games-sports/xmoto: drop 0.6.1-r101
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
games-sports/xmoto/Manifest | 1 -
.../files/xmoto-0.6.1_cmake_lua_version.patch | 13 ----
.../xmoto/files/xmoto-0.6.1_lua_deprecated.patch | 79 ----------------------
games-sports/xmoto/xmoto-0.6.1-r101.ebuild | 72 --------------------
4 files changed, 165 deletions(-)
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index 9ced224477fa..62f389c1e17f 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,2 +1 @@
-DIST xmoto-0.6.1.tar.gz 41623870 BLAKE2B
a26b89266b05513f2a48a2516ffdd39f05d584e70aa1fb18d463c754acd438cef0b0f1664cc577ebb89012f86dc37e2d52cd9d1310217941f16c9a4085dc3894
SHA512
809e5f149e5679adc2f82313afe654dbd027c0c10292c90e6c1982bdd3f7d0f1305e30b974bba94a92e18aeeff5faa6f0d24be225d4755ae73ad03274adaf60b
DIST xmoto-0.6.3.tar.gz 42113475 BLAKE2B
b820c79c65113bab4d349e1251316b608f00ee16c60f587205b4181673783602e6bd7a5079482c5f5ffbf4d7ac1ca673e38f94f4a961610bccc0e4f887d0289b
SHA512
7c261058059cd4495fc79cd48fbf729f02bbc5678cbbb340baf2691d52cb8a5a30af89b788facb51991323f9630cff7416388d218f1713033dc4ea58e0727c3e
diff --git a/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch
b/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch
deleted file mode 100644
index 53a29161a141..000000000000
--- a/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -40,8 +40,8 @@
- endif()
- find_package(PNG REQUIRED)
-
--find_package(Lua)
--set(USE_SYSTEM_Lua
$<AND:$<BOOL:${PREFER_SYSTEM_Lua}>,$<BOOL:${LUA51_FOUND}>,$<NOT:$<BOOL:${WIN32}>>>)
-+find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
-+set(USE_SYSTEM_Lua
$<AND:$<BOOL:${PREFER_SYSTEM_Lua}>,$<BOOL:${LUA_FOUND}>,$<NOT:$<BOOL:${WIN32}>>>)
- if (NOT LUA_VERSION_STRING VERSION_LESS 5.2 AND LUA_VERSION_STRING
VERSION_LESS 5.3)
- add_definitions("-DLUA_COMPAT_ALL")
- elseif (LUA_VERSION_STRING VERSION_GREATER_EQUAL "5.3")
diff --git a/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch
b/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch
deleted file mode 100644
index 078fa91aaab8..000000000000
--- a/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From fb004501a6387bb7ba5182b60ec305e9947dc545 Mon Sep 17 00:00:00 2001
-From: _yui <[email protected]>
-Date: Tue, 7 Jul 2020 21:44:49 +0300
-Subject: [PATCH 1/2] Fix building with Lua with deprecated functions removed
-
----
- src/CMakeLists.txt | 5 +++++
- src/xmoto/LuaLibBase.cpp | 6 ++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a3f328f9..3618360e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -461,6 +461,11 @@ check_prototype_definition(mkdir
- )
- target_compile_definitions(xmoto PUBLIC MS_MKDIR=$<BOOL:${MS_MKDIR}>)
-
-+if(USE_SYSTEM_Lua)
-+ check_symbol_exists(luaL_openlib lauxlib.h HAVE_LUAL_OPENLIB)
-+ target_compile_definitions(xmoto PUBLIC
HAVE_LUAL_OPENLIB=$<BOOL:${HAVE_LUAL_OPENLIB}>)
-+endif()
-+
- target_compile_definitions(xmoto PUBLIC USE_OPENGL=$<BOOL:${USE_OPENGL}>)
- target_compile_definitions(xmoto PUBLIC USE_SDLGFX=$<BOOL:${USE_SDLGFX}>)
- target_compile_definitions(xmoto PUBLIC USE_GETTEXT=$<BOOL:${USE_GETTEXT}>)
-diff --git a/src/xmoto/LuaLibBase.cpp b/src/xmoto/LuaLibBase.cpp
-index fed3c79e..62b690e1 100644
---- a/src/xmoto/LuaLibBase.cpp
-+++ b/src/xmoto/LuaLibBase.cpp
-@@ -42,7 +42,13 @@ LuaLibBase::LuaLibBase(const std::string &i_libname,
luaL_Reg i_reg[]) {
- luaL_requiref(m_pL, LUA_TABLIBNAME, luaopen_table, 1);
- #endif
-
-+#if HAVE_LUAL_OPENLIB
- luaL_openlib(m_pL, i_libname.c_str(), i_reg, 0);
-+#else
-+ lua_newtable(m_pL);
-+ luaL_register(m_pL, i_libname.c_str(), i_reg);
-+ lua_setglobal(m_pL, i_libname.c_str());
-+#endif
- }
-
- LuaLibBase::~LuaLibBase() {
-
-From 0a92ee4e8d6ffb88f137b74ba3e9a9b688ac50e6 Mon Sep 17 00:00:00 2001
-From: _yui <[email protected]>
-Date: Tue, 7 Jul 2020 23:01:38 +0300
-Subject: [PATCH 2/2] Change luaL_register to luaL_setfuncs for lua 5.2 and
- newer
-
----
- src/xmoto/LuaLibBase.cpp | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/xmoto/LuaLibBase.cpp b/src/xmoto/LuaLibBase.cpp
-index 62b690e1..911c5698 100644
---- a/src/xmoto/LuaLibBase.cpp
-+++ b/src/xmoto/LuaLibBase.cpp
-@@ -44,11 +44,17 @@ LuaLibBase::LuaLibBase(const std::string &i_libname,
luaL_Reg i_reg[]) {
-
- #if HAVE_LUAL_OPENLIB
- luaL_openlib(m_pL, i_libname.c_str(), i_reg, 0);
--#else
-+#else // HAVE_LUAL_OPENLIB
- lua_newtable(m_pL);
-+
-+#if LUA_VERSION_NUM >= 502
-+ luaL_setfuncs(m_pL, i_reg, 0);
-+#else // LUA_VERSION_NUM >= 502
- luaL_register(m_pL, i_libname.c_str(), i_reg);
-+#endif // LUA_VERSION_NUM >= 502
-+
- lua_setglobal(m_pL, i_libname.c_str());
--#endif
-+#endif // HAVE_LUAL_OPENLIB
- }
-
- LuaLibBase::~LuaLibBase() {
diff --git a/games-sports/xmoto/xmoto-0.6.1-r101.ebuild
b/games-sports/xmoto/xmoto-0.6.1-r101.ebuild
deleted file mode 100644
index 9ca6086d31bc..000000000000
--- a/games-sports/xmoto/xmoto-0.6.1-r101.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit cmake lua-single
-
-DESCRIPTION="A challenging 2D motocross platform game, where physics play an
important role"
-HOMEPAGE="https://xmoto.tuxfamily.org";
-SRC_URI="https://github.com/xmoto/xmoto/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="double-precision +nls"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="app-arch/bzip2
- dev-db/sqlite:3
- dev-games/ode[double-precision=]
- ${LUA_DEPS}
- dev-libs/libxdg-basedir
- dev-libs/libxml2:=
- media-fonts/dejavu
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- media-libs/libsdl[joystick,opengl]
- media-libs/sdl-mixer[vorbis]
- media-libs/sdl-net
- media-libs/sdl-ttf
- net-misc/curl
- sys-libs/zlib:=
- virtual/glu
- virtual/opengl
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/xz-utils
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}/${P}_lua_deprecated.patch"
- "${FILESDIR}/${PN}-0.6.1_cmake_lua_version.patch"
-)
-
-src_prepare() {
- sed -e "/^Icon/s/.xpm//" -i extra/xmoto.desktop || die
- sed -e "/add_subdirectory.*\(bzip2\|libccd\|lua\|ode\|xdgbasedir\)/d"
-i src/CMakeLists.txt || die
- rm -rf vendor/{bzip2,lua,ode,xdgbasedir} || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_GETTEXT=$(usex nls)
- -DOpenGL_GL_PREFERENCE=GLVND
- -DLUA_VERSION=$(lua_get_version)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- rm -f "${ED}/usr/share/xmoto"/Textures/Fonts/DejaVuSans{Mono,}.ttf ||
die
- dosym ../../../fonts/dejavu/DejaVuSans.ttf
/usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf
- dosym ../../../fonts/dejavu/DejaVuSansMono.ttf
/usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf
-}
