commit: 7d03b2bfe44e7f5974b056a162d839e6e6f7694a
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 10:20:49 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 10:27:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d03b2bf
games-action/minetest: drop 5.6.1
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
games-action/minetest/Manifest | 1 -
.../files/minetest-5.4.1-system_puc_lua.patch | 39 ------
.../minetest-5.6.0-no_upstream_optflags.patch | 15 ---
games-action/minetest/minetest-5.6.1.ebuild | 144 ---------------------
4 files changed, 199 deletions(-)
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 1e0795095a0c..59134e017841 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,2 +1 @@
-DIST minetest-5.6.1.tar.gz 9924663 BLAKE2B
509b8073a4e82ecff008f692ebdd7a8f35ff5222ba1095937d24870404cca848b80891887837e03d86c117568f9bbee1f92fb958640e06107230673e79d7f813
SHA512
15d2ce3b1150f077ff933a04f0ba8e02c71ee60a0edb636d1511d4e90244a34a14d7e5c4b47bee4de96cd179249a5a6963d7a092084f46c0fa54c9ff431a5265
DIST minetest-5.7.0.tar.gz 10115973 BLAKE2B
0f7e8864188004d57115c83508706b1cf1d6db0cba1a3002d603d4665e6d014ea2ec31df0a77a65da014467e21c331e3a27762018483a5bf4b2e024e3f7bdfc3
SHA512
6a934db5fd2c7c14fcfa87fb306662fa1ccf20a0eee056aea5c4c863986875017a4fa58ddf14319d385ee0400d00fb6a90f68b8f34527c98a746c6410360a529
diff --git a/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch
b/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch
deleted file mode 100644
index 7f49b427e8ee..000000000000
--- a/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream build scripts use either system LuaJIT or bundled PUC Lua 5.1.
-Make it possible to use the system version of the latter too.
-
---- a/cmake/Modules/FindLua.cmake
-+++ b/cmake/Modules/FindLua.cmake
-@@ -2,27 +2,12 @@
- # This selects LuaJIT by default
-
- option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE)
--set(USE_LUAJIT FALSE)
--option(REQUIRE_LUAJIT "Require LuaJIT support" FALSE)
--if(REQUIRE_LUAJIT)
-- set(ENABLE_LUAJIT TRUE)
--endif()
- if(ENABLE_LUAJIT)
-- find_package(LuaJIT)
-- if(LUAJIT_FOUND)
-- set(USE_LUAJIT TRUE)
-- message (STATUS "Using LuaJIT provided by system.")
-- elseif(REQUIRE_LUAJIT)
-- message(FATAL_ERROR "LuaJIT not found whereas
REQUIRE_LUAJIT=\"TRUE\" is used.\n"
-- "To continue, either install LuaJIT or do not use
REQUIRE_LUAJIT=\"TRUE\".")
-- endif()
-+ find_package(LuaJIT REQUIRED)
-+ set(USE_LUAJIT TRUE)
-+ message (STATUS "Using LuaJIT provided by system.")
- else()
-- message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)")
--endif()
--
--if(NOT USE_LUAJIT)
-- message(STATUS "LuaJIT not found, using bundled Lua.")
-- set(LUA_LIBRARY lua)
-- set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/src)
-- add_subdirectory(lib/lua)
-+ find_package(Lua51 REQUIRED)
-+ set(USE_LUAJIT FALSE)
-+ message(STATUS "Using Lua5.1 provided by system.")
- endif()
diff --git
a/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch
b/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch
deleted file mode 100644
index 68d71679924b..000000000000
--- a/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -756,11 +756,10 @@
- endif()
- endif()
-
-- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS}
${OTHER_FLAGS} -pipe -funroll-loops")
-+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS}
${OTHER_FLAGS}")
- if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
- else()
-- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3
-fomit-frame-pointer")
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux"
- AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
- AND CMAKE_CXX_COMPILER_VERSION MATCHES "^9\\.")
diff --git a/games-action/minetest/minetest-5.6.1.ebuild
b/games-action/minetest/minetest-5.6.1.ebuild
deleted file mode 100644
index 12b9726f46c3..000000000000
--- a/games-action/minetest/minetest-5.6.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LUA_COMPAT=( lua5-1 luajit )
-
-inherit cmake flag-o-matic lua-single systemd xdg
-
-DESCRIPTION="A free open-source voxel game engine with easy modding and game
creation"
-HOMEPAGE="https://www.minetest.net";
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server
+sound spatial test"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
- || ( client server )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}
- $(lua_gen_impl_dep 'deprecated' lua5-1)
- app-arch/zstd
- dev-db/sqlite:3
- dev-libs/gmp:0=
- dev-libs/jsoncpp:=
- sys-libs/zlib
- client? (
- >=dev-games/irrlicht-mt-1.9.0.8
- media-libs/freetype:2
- media-libs/libpng:0=
- media-libs/libjpeg-turbo
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libvorbis
- media-libs/openal
- )
- )
- curl? ( net-misc/curl )
- leveldb? ( dev-libs/leveldb:= )
- ncurses? ( sys-libs/ncurses:0= )
- nls? ( virtual/libintl )
- postgres? ( >=dev-db/postgresql-9.5:= )
- prometheus? ( dev-cpp/prometheus-cpp )
- redis? ( dev-libs/hiredis:= )
- server? (
- acct-group/minetest
- acct-user/minetest
- >=dev-games/irrlicht-mt-headers-1.9.0.8
- )
- spatial? ( sci-libs/libspatialindex:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
- "${FILESDIR}"/${PN}-5.6.0-no_upstream_optflags.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # remove bundled libraries other than bitop
- rm -rf lib/{gmp,jsoncpp,lua} || die
-
- # To avoid TEXTRELs on riscv
- append-flags -fPIC
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CLIENT=$(usex client)
- -DBUILD_SERVER=$(usex server)
- -DBUILD_UNITTESTS=$(usex test)
- -DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
- -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
- -DCUSTOM_MANDIR="${EPREFIX}/usr/share/man"
- -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
- -DENABLE_CURL=$(usex curl)
- -DENABLE_CURSES=$(usex ncurses)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GLES=no
- -DENABLE_LEVELDB=$(usex leveldb)
- -DENABLE_LUAJIT=$(usex lua_single_target_luajit)
- -DENABLE_POSTGRESQL=$(usex postgres)
- -DENABLE_PROMETHEUS=$(usex prometheus)
- -DENABLE_REDIS=$(usex redis)
- -DENABLE_SPATIAL=$(usex spatial)
- -DENABLE_SOUND=$(usex sound)
- -DENABLE_SYSTEM_GMP=1
- -DENABLE_SYSTEM_JSONCPP=1
- -DRUN_IN_PLACE=0
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc; then
- cmake_src_compile doc
- HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- fi
-}
-
-src_install() {
- cmake_src_install
-
- if use server; then
- keepdir /etc/minetest
- fowners root:minetest /etc/minetest
- fperms 2750 /etc/minetest
-
- keepdir /var/log/minetest
- fowners minetest:minetest /var/log/minetest
-
- newconfd "${FILESDIR}"/minetestserver.confd minetest-server
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
-
- systemd_newunit "${FILESDIR}"/minetestserver_default.service
minetest-server.service
- systemd_newunit "${FILESDIR}"/minetestserver_template.service
[email protected]
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/minetestserver.logrotate minetest-server
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
