* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/, games-action/minetest/files/
@ 2016-05-18 12:11 Ian Delaney
0 siblings, 0 replies; 6+ messages in thread
From: Ian Delaney @ 2016-05-18 12:11 UTC (permalink / raw
To: gentoo-commits
commit: de8027e60d545e101694b41bbabd68f08c7c4661
Author: Martin-Kevin Neumann <maddin081591 <AT> gmail <DOT> com>
AuthorDate: Tue May 17 14:40:36 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed May 18 12:11:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8027e6
games-action/minetest: Removal of version 0.4.10
Removes 0.4.10-r1, 0.4.10-r2 and the corresponding patches.
Closes: https://github.com/gentoo/gentoo/pull/1471
Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>
games-action/minetest/Manifest | 1 -
.../minetest/files/minetest-0.4.10-as-needed.patch | 35 -----
.../files/minetest-0.4.10-shared-irrlicht.patch | 23 ----
.../files/minetest-0.4.10-system-lua.patch | 37 -----
games-action/minetest/minetest-0.4.10-r1.ebuild | 150 ---------------------
games-action/minetest/minetest-0.4.10-r2.ebuild | 147 --------------------
6 files changed, 393 deletions(-)
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index eb4977e..5a9bc6d 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,3 +1,2 @@
-DIST minetest-0.4.10.tar.gz 5291236 SHA256 05d15c8e2c8e53ee9d3006e79c2b59200311a7b879220d8b6f6a6fd2acf806b6 SHA512 0d2f2590df530df9bed11a08a3e67dfa39dae1987b8c1f6a4f4f2ace2c40dea3b5afce445e3b2e17b2bd8a426bdd53d717989018f5da531b1eb10965d953c3bf WHIRLPOOL 016c2bc6f9aed44943f238491c445f48013f76a74f9c09e56c1e70e03fa3ded72b042b9dffa0bed81a9dcdc84358a9be88bbf32119dd45a1e2a9873031be1009
DIST minetest-0.4.13.tar.gz 8366306 SHA256 40bafab13e20e7a550ceaa25ef82dd7b4b8188ee8e8080e1ae9295b82603d5e1 SHA512 e2228f540d3b982515de85635a84e5f157894b5eb1c654da76e1f69e398c69ff0d4d569a5035146b5c80130e9353e020c86c6acc20813075cfd7c9e5c2df2652 WHIRLPOOL 4048db2da06cfb161b794359e4a24573c51553ec98a022295d8de4623c64ac9d235d4cf8ec7a842bdafc91aa147d244ed4aed3991064b5dcb42932fafa42da7b
DIST minetest-0.4.14.tar.gz 8638852 SHA256 a2a60db3f22d101f78c582f185242e1d913b86a98a7b583cb2261ab715676910 SHA512 a04c03118ac82c78aca6c79cd618efc3ceea7c3f7c7fbcb3fcb1f87a41368a3a41ccdcb350687e745aeedd83af36ff000c30b3d468a5a8e58b68815527df0307 WHIRLPOOL 88b67d2d15c23dbd30650907260f3ac95b69a062a915811d52383da31ec5b7fd80d94b443c287344cd6f1ab71ab09a7127d570023a70afaa1c7217f3aa030c12
diff --git a/games-action/minetest/files/minetest-0.4.10-as-needed.patch b/games-action/minetest/files/minetest-0.4.10-as-needed.patch
deleted file mode 100644
index 83d1ca7..0000000
--- a/games-action/minetest/files/minetest-0.4.10-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
-Author: hasufell <hasufell@gentoo.org>
-Date: Mon Nov 25 00:28:55 2013 +0100
-
- CMAKE: fix linking order
-
- this also fixes linking with as-needed wrt
- https://github.com/minetest/minetest/issues/617
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a1fee7a..a72bd4a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -427,18 +427,18 @@ if(BUILD_CLIENT)
- set(minetest_LIBS
- ${PROJECT_NAME}
- ${ZLIB_LIBRARIES}
-- ${IRRLICHT_LIBRARY}
-+ ${X11_LIBRARIES}
- ${OPENGL_LIBRARIES}
-+ ${OPENGLES2_LIBRARIES}
- ${JPEG_LIBRARIES}
- ${BZIP2_LIBRARIES}
- ${PNG_LIBRARIES}
-- ${X11_LIBRARIES}
-+ ${IRRLICHT_LIBRARY}
- ${GETTEXT_LIBRARY}
- ${SOUND_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${LUA_LIBRARY}
- ${JSON_LIBRARY}
-- ${OPENGLES2_LIBRARIES}
- ${PLATFORM_LIBS}
- ${CLIENT_PLATFORM_LIBS}
- )
diff --git a/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch b/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch
deleted file mode 100644
index b552c09..0000000
--- a/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
-Author: hasufell <julian.ospald@googlemail.com>
-Date: Sat Jun 8 13:40:30 2013 +0200
-
- CMAKE: use shared lib from Irrlicht
-
-diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
-index bd00422..4632993 100644
---- a/cmake/Modules/FindIrrlicht.cmake
-+++ b/cmake/Modules/FindIrrlicht.cmake
-@@ -50,10 +50,11 @@ else()
- /usr/include/irrlicht
- )
-
-- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
-+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
- PATHS
- /usr/local/lib
- /usr/lib
-+ /usr/lib64
- )
- endif()
-
diff --git a/games-action/minetest/files/minetest-0.4.10-system-lua.patch b/games-action/minetest/files/minetest-0.4.10-system-lua.patch
deleted file mode 100644
index c31c851..0000000
--- a/games-action/minetest/files/minetest-0.4.10-system-lua.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -215,8 +215,6 @@
- message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
- else (NOT ${DISABLE_LUAJIT} MATCHES "1")
- message (STATUS "LuaJIT detection disabled! (DISABLE_LUAJIT=1)")
-- set(LUA_LIBRARY "")
-- set(LUA_INCLUDE_DIR "")
- endif (NOT DISABLE_LUAJIT)
-
- set(USE_LUAJIT 0)
-@@ -267,11 +265,22 @@
- endif (VALID_LUAJIT_VERSION)
- endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
-
-+OPTION(WITH_BUNDLED_LUA "Use bundled lua")
-+
- if(NOT USE_LUAJIT)
- message (STATUS "LuaJIT not found, using bundled Lua.")
-- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
-- set(LUA_LIBRARY "lua")
-- add_subdirectory(lua)
-+ if (WITH_BUNDLED_LUA)
-+ set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
-+ set(LUA_LIBRARY "lua")
-+ add_subdirectory(lua)
-+ else (WITH_BUNDLED_LUA)
-+ find_package(Lua51)
-+ if(LUA51_FOUND)
-+ message (STATUS "Lua51 found")
-+ else(LUA51_FOUND)
-+ message (FATAL_ERROR "Lua51 not found!")
-+ endif(LUA51_FOUND)
-+ endif(WITH_BUNDLED_LUA)
- endif(NOT USE_LUAJIT)
-
- mark_as_advanced(LUA_LIBRARY)
diff --git a/games-action/minetest/minetest-0.4.10-r1.ebuild b/games-action/minetest/minetest-0.4.10-r1.ebuild
deleted file mode 100644
index 0821b46..0000000
--- a/games-action/minetest/minetest-0.4.10-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
-
-DESCRIPTION="An InfiniMiner/Minecraft inspired game"
-HOMEPAGE="http://minetest.net/"
-SRC_URI="https://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+curl dedicated leveldb luajit nls redis +server +sound +truetype"
-
-RDEPEND="dev-db/sqlite:3
- sys-libs/zlib
- curl? ( net-misc/curl )
- !dedicated? (
- app-arch/bzip2
- >=dev-games/irrlicht-1.8-r2
- media-libs/libpng:0
- virtual/jpeg
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- )
- truetype? ( media-libs/freetype:2 )
- )
- leveldb? ( dev-libs/leveldb )
- luajit? ( dev-lang/luajit:2 )
- !luajit? ( >=dev-lang/lua-5.1.4[deprecated] )
- nls? ( virtual/libintl )
- redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
- >=dev-games/irrlicht-1.8-r2
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- games_pkg_setup
-
- if use server || use dedicated ; then
- enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
- fi
-}
-
-src_unpack() {
- vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-shared-irrlicht.patch \
- "${FILESDIR}"/${P}-as-needed.patch \
- "${FILESDIR}"/${P}-system-lua.patch
-
- # correct gettext behavior
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *) ; do
- if ! has ${i} ${LINGUAS} ; then
- rm -r po/${i} || die
- fi
- done
- fi
-
- # jthread is modified
- # json is modified
- rm -r src/{lua,sqlite} || die
-
- # set paths
- sed \
- -e "s#@BINDIR@#${GAMES_BINDIR}#g" \
- -e "s#@GROUP@#${GAMES_GROUP}#g" \
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
- -DCUSTOM_BINDIR="${GAMES_BINDIR}"
- -DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="/usr/share/locale"
- -DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}"
- $(cmake-utils_use_enable curl CURL)
- $(cmake-utils_use_enable truetype FREETYPE)
- $(cmake-utils_use_enable nls GETTEXT)
- -DENABLE_GLES=0
- $(cmake-utils_use_enable leveldb LEVELDB)
- $(cmake-utils_use_enable redis REDIS)
- $(cmake-utils_use_enable sound SOUND)
- $(cmake-utils_use !luajit DISABLE_LUAJIT)
- -DRUN_IN_PLACE=0
- -DWITH_BUNDLED_LUA=0
- $(use dedicated && {
- echo "-DIRRLICHT_SOURCE_DIR=/the/irrlicht/source"
- echo "-DIRRLICHT_INCLUDE_DIR=/usr/include/irrlicht"
- })
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server || use dedicated ; then
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
- newconfd "${T}"/minetestserver.confd minetest-server
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if ! use dedicated ; then
- elog
- elog "optional dependencies:"
- elog " games-action/minetest_game (official mod)"
- elog
- fi
-
- if use server || use dedicated ; then
- elog
- elog "Configure your server via /etc/conf.d/minetest-server"
- elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
- elog "Default logfile is ~/minetest-server.log"
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-action/minetest/minetest-0.4.10-r2.ebuild b/games-action/minetest/minetest-0.4.10-r2.ebuild
deleted file mode 100644
index ad1921e..0000000
--- a/games-action/minetest/minetest-0.4.10-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
-
-DESCRIPTION="An InfiniMiner/Minecraft inspired game"
-HOMEPAGE="http://minetest.net/"
-SRC_URI="https://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl dedicated leveldb luajit nls redis +server +sound +truetype"
-
-RDEPEND="dev-db/sqlite:3
- sys-libs/zlib
- curl? ( net-misc/curl )
- !dedicated? (
- app-arch/bzip2
- >=dev-games/irrlicht-1.8-r2
- media-libs/libpng:0
- virtual/jpeg
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- )
- truetype? ( media-libs/freetype:2 )
- )
- leveldb? ( dev-libs/leveldb )
- luajit? ( dev-lang/luajit:2 )
- nls? ( virtual/libintl )
- redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
- >=dev-games/irrlicht-1.8-r2
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- games_pkg_setup
-
- if use server || use dedicated ; then
- enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
- fi
-}
-
-src_unpack() {
- vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-shared-irrlicht.patch \
- "${FILESDIR}"/${P}-as-needed.patch
-
- # correct gettext behavior
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *) ; do
- if ! has ${i} ${LINGUAS} ; then
- rm -r po/${i} || die
- fi
- done
- fi
-
- # jthread is modified
- # json is modified
- rm -r src/sqlite || die
-
- # set paths
- sed \
- -e "s#@BINDIR@#${GAMES_BINDIR}#g" \
- -e "s#@GROUP@#${GAMES_GROUP}#g" \
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
- -DCUSTOM_BINDIR="${GAMES_BINDIR}"
- -DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="/usr/share/locale"
- -DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}"
- $(cmake-utils_use_enable curl CURL)
- $(cmake-utils_use_enable truetype FREETYPE)
- $(cmake-utils_use_enable nls GETTEXT)
- -DENABLE_GLES=0
- $(cmake-utils_use_enable leveldb LEVELDB)
- $(cmake-utils_use_enable redis REDIS)
- $(cmake-utils_use_enable sound SOUND)
- $(cmake-utils_use !luajit DISABLE_LUAJIT)
- -DRUN_IN_PLACE=0
- $(use dedicated && {
- echo "-DIRRLICHT_SOURCE_DIR=/the/irrlicht/source"
- echo "-DIRRLICHT_INCLUDE_DIR=/usr/include/irrlicht"
- })
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server || use dedicated ; then
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
- newconfd "${T}"/minetestserver.confd minetest-server
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if ! use dedicated ; then
- elog
- elog "optional dependencies:"
- elog " games-action/minetest_game (official mod)"
- elog
- fi
-
- if use server || use dedicated ; then
- elog
- elog "Configure your server via /etc/conf.d/minetest-server"
- elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
- elog "Default logfile is ~/minetest-server.log"
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/, games-action/minetest/files/
@ 2019-11-12 21:35 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2019-11-12 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 9b5012596d0a8ce42e77bb688aad6ae109c035da
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sat Oct 12 18:20:19 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 21:34:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b501259
games-action/minetest: version bump to 5.1.0
Closes: https://bugs.gentoo.org/697576
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/minetest/Manifest | 1 +
games-action/minetest/files/minetestserver.confd | 2 +-
games-action/minetest/minetest-5.1.0.ebuild | 137 +++++++++++++++++++++++
3 files changed, 139 insertions(+), 1 deletion(-)
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 2228aa4c77c..94c97da7470 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1 +1,2 @@
DIST minetest-5.0.1.tar.gz 8761122 BLAKE2B 888e29b956d66543dd506b8e7eadd2e9d37324aebd4f84989745090fe927e97355c2baa7d615f5e0f8e2a074724b89bdf5f807c297cce1bc8483e500b0248e22 SHA512 00f0c77c19eb9619387285e5dad690c8aa9969ff11c4de0bdae99ee6e9a4508a8c2f977837fc2e01aebc5d4c1a5191d4f56acb131182d73c8f50da1458695607
+DIST minetest-5.1.0.tar.gz 8939376 BLAKE2B 5c56bd74a573632636937c5e5a45eb864ec627962b73573a763be7326c2a3fa95ad87683d655725b29d29d91270812beef33c21b3eb100627f21befeb2dbfac5 SHA512 f2cad4720c1003536cc3c619c18234a95cae1dee8fb54b46a2ef5fd24108a4c945efcb0a461926ef3ede7b8bec41ed6620806212fe11f4142bbf31fe4f0f659e
diff --git a/games-action/minetest/files/minetestserver.confd b/games-action/minetest/files/minetestserver.confd
index ec3d0138cb7..7a6f9b12ff0 100644
--- a/games-action/minetest/files/minetestserver.confd
+++ b/games-action/minetest/files/minetestserver.confd
@@ -13,4 +13,4 @@ PIDFILE="/var/run/minetest.pid"
MINETESTBIN="@BINDIR@/minetestserver"
# additional arguments for the server
-ARGS="--logfile /var/lib/minetest/minetest-server.log"
+ARGS="--logfile /var/log/minetest/minetest-server.log"
diff --git a/games-action/minetest/minetest-5.1.0.ebuild b/games-action/minetest/minetest-5.1.0.ebuild
new file mode 100644
index 00000000000..510f4c5648e
--- /dev/null
+++ b/games-action/minetest/minetest-5.1.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils 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 ~x86"
+IUSE="+client +curl doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+REQUIRED_USE="|| ( client server )"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-games/irrlicht
+ dev-libs/gmp:0=
+ dev-libs/jsoncpp:=
+ sys-libs/zlib
+ client? (
+ app-arch/bzip2
+ media-libs/libpng:0=
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXxf86vm
+ sound? (
+ media-libs/libogg:=
+ media-libs/libvorbis:=
+ media-libs/openal:=
+ )
+ truetype? ( media-libs/freetype:2 )
+ )
+ curl? ( net-misc/curl )
+ leveldb? ( dev-libs/leveldb:= )
+ luajit? ( dev-lang/luajit:2 )
+ ncurses? ( sys-libs/ncurses:0= )
+ nls? ( virtual/libintl )
+ postgres? ( >=dev-db/postgresql-9.5:= )
+ redis? ( dev-libs/hiredis )
+ server? (
+ acct-group/minetest
+ acct-user/minetest
+ )
+ spatial? ( sci-libs/libspatialindex )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ # set paths
+ sed \
+ -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
+ -e "s#@GROUP@#${PN}#g" \
+ "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+
+ # remove bundled gmp/jsoncpp
+ rm -rf lib/{gmp,jsoncpp} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_CLIENT=$(usex client)
+ -DBUILD_SERVER=$(usex server)
+ -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_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+ -DENABLE_CURL=$(usex curl)
+ -DENABLE_CURSES=$(usex ncurses)
+ -DENABLE_FREETYPE=$(usex truetype)
+ -DENABLE_GETTEXT=$(usex nls)
+ -DENABLE_GLES=0
+ -DENABLE_LEVELDB=$(usex leveldb)
+ -DENABLE_LUAJIT=$(usex luajit)
+ -DENABLE_POSTGRESQL=$(usex postgres)
+ -DENABLE_REDIS=$(usex redis)
+ -DENABLE_SPATIAL=$(usex spatial)
+ -DENABLE_SOUND=$(usex sound)
+ -DENABLE_SYSTEM_JSONCPP=1
+ -DRUN_IN_PLACE=0
+ )
+
+ use server && mycmakeargs+=(
+ -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use doc ; then
+ cmake-utils_src_compile doc
+ HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use server ; then
+ keepdir /var/log/minetest
+ fowners minetest:minetest /var/log/minetest
+
+ newconfd "${T}"/minetestserver.confd minetest-server
+ newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if use server ; then
+ elog
+ elog "Configure your server via /etc/conf.d/minetest-server"
+ elog
+ fi
+
+ elog
+ elog "The version 5.x series is not compatible to the version 0.4 series."
+ elog "This applies to clients and servers, other content such as mods,"
+ elog "texture packs and worlds is unaffected and backwards-compatible"
+ elog "as usual."
+ elog
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/, games-action/minetest/files/
@ 2019-11-17 21:38 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2019-11-17 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 8e24281824b722f587e1785e0138bdae955cc853
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sun Nov 17 15:50:03 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 21:35:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e242818
games-action/minetest: Add patch to find newer JsonCpp
The luajit flag is also removed since we should always build using the
system-provided LuaJIT rather than the bundled Lua library.
Closes: https://bugs.gentoo.org/700220
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13690
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/minetest/files/5.1.0-FindJson.patch | 31 +++++
games-action/minetest/files/minetestserver.initd | 2 +-
games-action/minetest/minetest-5.1.0-r1.ebuild | 140 +++++++++++++++++++++++
3 files changed, 172 insertions(+), 1 deletion(-)
diff --git a/games-action/minetest/files/5.1.0-FindJson.patch b/games-action/minetest/files/5.1.0-FindJson.patch
new file mode 100644
index 00000000000..3d48b0a0924
--- /dev/null
+++ b/games-action/minetest/files/5.1.0-FindJson.patch
@@ -0,0 +1,31 @@
+From 706b6aad06a112f55105f08b6acd130b276a06ca Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Sat, 16 Nov 2019 13:14:24 -0500
+Subject: [PATCH] Fix find_path for newer jsoncpp installations
+
+The upstream JsonCpp project has renamed the `json/features.h` file to
+`json/json_features.h`. This patch fixes the JsonCpp installation search
+by looking for `json/allocator.h` which has not been renamed on newer
+versions of JsonCpp.
+
+Fixes: https://github.com/minetest/minetest/issues/9119
+---
+ cmake/Modules/FindJson.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
+index 26339a29..53ddf459 100644
+--- a/cmake/Modules/FindJson.cmake
++++ b/cmake/Modules/FindJson.cmake
+@@ -8,7 +8,7 @@ option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JSONCPP. May cause seg
+
+ if(ENABLE_SYSTEM_JSONCPP)
+ find_library(JSON_LIBRARY NAMES jsoncpp)
+- find_path(JSON_INCLUDE_DIR json/features.h PATH_SUFFIXES jsoncpp)
++ find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(JSONCPP DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
+--
+2.24.0
+
diff --git a/games-action/minetest/files/minetestserver.initd b/games-action/minetest/files/minetestserver.initd
index 1e56ff64651..ffca2e55995 100644
--- a/games-action/minetest/files/minetestserver.initd
+++ b/games-action/minetest/files/minetestserver.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="Minetest dedicated server"
diff --git a/games-action/minetest/minetest-5.1.0-r1.ebuild b/games-action/minetest/minetest-5.1.0-r1.ebuild
new file mode 100644
index 00000000000..30beb3bfeb1
--- /dev/null
+++ b/games-action/minetest/minetest-5.1.0-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils 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 ~x86"
+IUSE="+client +curl doc +leveldb ncurses nls postgres redis +server +sound spatial +truetype"
+REQUIRED_USE="|| ( client server )"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-games/irrlicht
+ dev-lang/luajit:2
+ dev-libs/gmp:0=
+ dev-libs/jsoncpp:=
+ sys-libs/zlib
+ client? (
+ app-arch/bzip2
+ media-libs/libpng:0=
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXxf86vm
+ sound? (
+ media-libs/libogg
+ media-libs/libvorbis
+ media-libs/openal
+ )
+ truetype? ( media-libs/freetype:2 )
+ )
+ curl? ( net-misc/curl )
+ leveldb? ( dev-libs/leveldb:= )
+ ncurses? ( sys-libs/ncurses:0= )
+ nls? ( virtual/libintl )
+ postgres? ( >=dev-db/postgresql-9.5:= )
+ redis? ( dev-libs/hiredis:= )
+ server? (
+ acct-group/minetest
+ acct-user/minetest
+ )
+ spatial? ( sci-libs/libspatialindex:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ nls? ( sys-devel/gettext )"
+
+PATCHES="${FILESDIR}/${PV}-FindJson.patch"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ # set paths
+ sed \
+ -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
+ -e "s#@GROUP@#${PN}#g" \
+ "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+
+ # remove bundled libraries
+ rm -rf lib || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_CLIENT=$(usex client)
+ -DBUILD_SERVER=$(usex server)
+ -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_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+ -DENABLE_CURL=$(usex curl)
+ -DENABLE_CURSES=$(usex ncurses)
+ -DENABLE_FREETYPE=$(usex truetype)
+ -DENABLE_GETTEXT=$(usex nls)
+ -DENABLE_GLES=0
+ -DENABLE_LEVELDB=$(usex leveldb)
+ -DENABLE_LUAJIT=1
+ -DENABLE_POSTGRESQL=$(usex postgres)
+ -DENABLE_REDIS=$(usex redis)
+ -DENABLE_SPATIAL=$(usex spatial)
+ -DENABLE_SOUND=$(usex sound)
+ -DENABLE_SYSTEM_GMP=1
+ -DENABLE_SYSTEM_JSONCPP=1
+ -DRUN_IN_PLACE=0
+ )
+
+ use server && mycmakeargs+=(
+ -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use doc ; then
+ cmake-utils_src_compile doc
+ HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use server ; then
+ keepdir /var/log/minetest
+ fowners minetest:minetest /var/log/minetest
+
+ newconfd "${T}"/minetestserver.confd minetest-server
+ newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if use server ; then
+ elog
+ elog "Configure your server via /etc/conf.d/minetest-server"
+ elog
+ fi
+
+ elog
+ elog "The version 5.x series is not compatible to the version 0.4 series."
+ elog "This applies to clients and servers, other content such as mods,"
+ elog "texture packs and worlds is unaffected and backwards-compatible"
+ elog "as usual."
+ elog
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/, games-action/minetest/files/
@ 2021-05-13 15:13 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2021-05-13 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 9f5e7e45fc1a96dc041d99c4e206e51f04ea4fa7
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 15:01:04 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu May 13 15:13:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f5e7e45
games-action/minetest: tweak server configuration
Create /etc/minetest with appropriate permissions, install systemd
units, use /run instead of /var/run for pidfiles in OpenRC mode.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
games-action/minetest/files/minetestserver.confd | 6 ++--
.../minetest/files/minetestserver.logrotate | 2 +-
.../minetest/files/minetestserver_default.service | 15 ++++++++++
.../minetest/files/minetestserver_template.service | 15 ++++++++++
...etest-5.4.1.ebuild => minetest-5.4.1-r1.ebuild} | 34 +++++++---------------
5 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/games-action/minetest/files/minetestserver.confd b/games-action/minetest/files/minetestserver.confd
index 7a6f9b12ff0..b383fbd3e33 100644
--- a/games-action/minetest/files/minetestserver.confd
+++ b/games-action/minetest/files/minetestserver.confd
@@ -4,13 +4,13 @@
USER="minetest"
# group
-GROUP="@GROUP@"
+GROUP="minetest"
# pidfile
-PIDFILE="/var/run/minetest.pid"
+PIDFILE="/run/minetest.pid"
# executable
-MINETESTBIN="@BINDIR@/minetestserver"
+MINETESTBIN="/usr/bin/minetestserver"
# additional arguments for the server
ARGS="--logfile /var/log/minetest/minetest-server.log"
diff --git a/games-action/minetest/files/minetestserver.logrotate b/games-action/minetest/files/minetestserver.logrotate
index 0ec4823663a..2e38adfc5f5 100644
--- a/games-action/minetest/files/minetestserver.logrotate
+++ b/games-action/minetest/files/minetestserver.logrotate
@@ -1,4 +1,4 @@
-/var/log/minetest/minetest-server.log {
+/var/log/minetest/*.log {
rotate 5
weekly
missingok
diff --git a/games-action/minetest/files/minetestserver_default.service b/games-action/minetest/files/minetestserver_default.service
new file mode 100644
index 00000000000..e2754abaaf1
--- /dev/null
+++ b/games-action/minetest/files/minetestserver_default.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Minetest multiplayer server (server config minetest.conf)
+Documentation=man:minetestserver(6)
+After=network.target
+
+[Service]
+Restart=on-failure
+User=minetest
+Group=minetest
+ExecStart=/usr/bin/minetestserver --config /etc/minetest/minetest.conf --logfile /var/log/minetest/minetest-server.log
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/games-action/minetest/files/minetestserver_template.service b/games-action/minetest/files/minetestserver_template.service
new file mode 100644
index 00000000000..a945de53e87
--- /dev/null
+++ b/games-action/minetest/files/minetestserver_template.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Minetest multiplayer server (server config %i.conf)
+Documentation=man:minetestserver(6)
+After=network.target
+
+[Service]
+Restart=on-failure
+User=minetest
+Group=minetest
+ExecStart=/usr/bin/minetestserver --config /etc/minetest/%i.conf --logfile /var/log/minetest/%i-server.log
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/games-action/minetest/minetest-5.4.1.ebuild b/games-action/minetest/minetest-5.4.1-r1.ebuild
similarity index 82%
rename from games-action/minetest/minetest-5.4.1.ebuild
rename to games-action/minetest/minetest-5.4.1-r1.ebuild
index 453757efe39..dfd64db5a93 100644
--- a/games-action/minetest/minetest-5.4.1.ebuild
+++ b/games-action/minetest/minetest-5.4.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
LUA_COMPAT=( lua5-1 luajit )
-inherit cmake lua-single xdg
+inherit cmake lua-single systemd xdg
DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
HOMEPAGE="https://www.minetest.net"
@@ -69,12 +69,6 @@ PATCHES=(
src_prepare() {
cmake_src_prepare
- # set paths
- sed \
- -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
- -e "s#@GROUP@#${PN}#g" \
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-
# remove bundled libraries
rm -rf lib || die
}
@@ -112,7 +106,7 @@ src_configure() {
src_compile() {
cmake_src_compile
- if use doc ; then
+ if use doc; then
cmake_src_compile doc
HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
fi
@@ -121,13 +115,20 @@ src_compile() {
src_install() {
cmake_src_install
- if use server ; then
+ 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 "${T}"/minetestserver.confd minetest-server
+ 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 minetest-server@.service
+
insinto /etc/logrotate.d
newins "${FILESDIR}"/minetestserver.logrotate minetest-server
fi
@@ -135,17 +136,4 @@ src_install() {
pkg_postinst() {
xdg_pkg_postinst
-
- if use server ; then
- elog
- elog "Configure your server via /etc/conf.d/minetest-server"
- elog
- fi
-
- elog
- elog "The version 5.x series is not compatible to the version 0.4 series."
- elog "This applies to clients and servers, other content such as mods,"
- elog "texture packs and worlds is unaffected and backwards-compatible"
- elog "as usual."
- elog
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/, games-action/minetest/files/
@ 2022-02-01 14:33 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2022-02-01 14:33 UTC (permalink / raw
To: gentoo-commits
commit: a3f9a4a42a060a1da740c83c10439cb5d5f72a8f
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 1 12:51:22 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Feb 1 14:33:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f9a4a4
games-action/minetest: add 5.5.0
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
games-action/minetest/Manifest | 1 +
.../files/minetest-5.5.0-bundled_luabitop.patch | 17 +++
games-action/minetest/minetest-5.5.0.ebuild | 142 +++++++++++++++++++++
3 files changed, 160 insertions(+)
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 19c3d0e7364d..4e97ad882efc 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1 +1,2 @@
DIST minetest-5.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
+DIST minetest-5.5.0.tar.gz 9558895 BLAKE2B 13db90556a4faaac31cca7427fb85439cab144d73f25b79ae9f8367883b0fafa39c39fe0e40f3734d7e3f48cef4942a37a302cf58993707a14024905d8ed9b61 SHA512 9c744eac2704457d6896485997666d614dd156214dae26c2cb413771fd3eab54d80731a5220bcc4a18ddc737db64971893a3c89a56a46020adf8d00aad299817
diff --git a/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch b/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
new file mode 100644
index 000000000000..5006ddd499b6
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.5.0-bundled_luabitop.patch
@@ -0,0 +1,17 @@
+When built against PUC Lua, minetest binaries get linked against
+a customised version of LuaBitOp which then gets installed
+as /usr/$(get_libdir)/libbitop.so. This violates the policies of both
+Gentoo (unversioned shared library) and Lua itself (compiled extensions
+should be installed into implementation-specific directories rather than
+top-level libdir, and I'm pretty sure linking against such extensions
+is a no-no). Switching to system dev-lua/LuaBitOp will require work
+so just make the customised version static for now.
+
+--- a/lib/bitop/CMakeLists.txt
++++ b/lib/bitop/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(bitop bit.c)
++add_library(bitop STATIC bit.c)
+ target_link_libraries(bitop)
+
+ include_directories(${LUA_INCLUDE_DIR})
diff --git a/games-action/minetest/minetest-5.5.0.ebuild b/games-action/minetest/minetest-5.5.0.ebuild
new file mode 100644
index 000000000000..0b2a456abd27
--- /dev/null
+++ b/games-action/minetest/minetest-5.5.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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-games/irrlicht-mt-1.9.0.4
+ dev-libs/gmp:0=
+ dev-libs/jsoncpp:=
+ sys-libs/zlib
+ client? (
+ media-libs/freetype:2
+ media-libs/libpng:0=
+ virtual/jpeg:0
+ 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
+ )
+ 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.5.0-bundled_luabitop.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 minetest-server@.service
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/minetestserver.logrotate minetest-server
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/, games-action/minetest/files/
@ 2023-04-09 23:24 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2023-04-09 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 4a437492e78bdce4b1059b5512e893d26a040a5a
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 23:23:26 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 23:23:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a437492
games-action/minetest: add 5.7.0
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
games-action/minetest/Manifest | 1 +
.../minetest-5.7.0-no_upstream_optflags.patch | 11 ++
games-action/minetest/minetest-5.7.0.ebuild | 141 +++++++++++++++++++++
3 files changed, 153 insertions(+)
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 2032f7e2d163..1e0795095a0c 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1 +1,2 @@
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.7.0-no_upstream_optflags.patch b/games-action/minetest/files/minetest-5.7.0-no_upstream_optflags.patch
new file mode 100644
index 000000000000..ad673be1184f
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.7.0-no_upstream_optflags.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -784,7 +784,7 @@
+ endif()
+ endif()
+
+- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS} -pipe -funroll-loops -O3 -fomit-frame-pointer")
++ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS}")
+ 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.7.0.ebuild b/games-action/minetest/minetest-5.7.0.ebuild
new file mode 100644
index 000000000000..e3b199e0fd7d
--- /dev/null
+++ b/games-action/minetest/minetest-5.7.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2023 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 )"
+
+# Use bundled PUC Lua if lua5-1 has been requested requested due to C++
+# interoperability issues, at least until Bug #825766 has been resolved anyway.
+RDEPEND="lua_single_target_luajit? ( ${LUA_DEPS} )
+ 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.10
+ 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.10
+ )
+ spatial? ( sci-libs/libspatialindex:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.7.0-no_upstream_optflags.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # 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/${PN}
+ fowners root:${PN} /etc/${PN}
+ fperms 2750 /etc/${PN}
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ newconfd "${FILESDIR}"/${PN}server.confd ${PN}-server
+ newinitd "${FILESDIR}"/${PN}server.initd ${PN}-server
+
+ systemd_newunit "${FILESDIR}"/${PN}server_default.service ${PN}-server.service
+ systemd_newunit "${FILESDIR}"/${PN}server_template.service ${PN}-server@.service
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}server.logrotate ${PN}-server
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-09 23:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-13 15:13 [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/, games-action/minetest/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2023-04-09 23:24 Marek Szuba
2022-02-01 14:33 Marek Szuba
2019-11-17 21:38 James Le Cuirot
2019-11-12 21:35 James Le Cuirot
2016-05-18 12:11 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox