gentoo auto-resync : 10:04:2023 - 17:37:14

5 files changed, 13 insertions, 205 deletions

diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 025c25ec8d63..dadef449b626 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,13 +1,9 @@
-AUX minetest-5.4.1-system_puc_lua.patch 1285 BLAKE2B 773466b132d1e7fdcd2108c7cae9d7538d02319140c91c87b5533c4225fe64077a4400cdddbfa0d96b256fad54ef7b92a5239036789b2af3a57365ac0a305808 SHA512 acb1ddb7e156324b3e4aea2807ba7b708b563bcf70208bad672a1777eb116dd7c812fcd420cdfb3a08b9b3fe4adf8a56b51ee2827439a058a78e8ffc4cb07ea4
-AUX minetest-5.6.0-no_upstream_optflags.patch 639 BLAKE2B f494610f2973fcde7c6a99b7ec8ad99eeb9ff317aeec3708ec191b600d9c8f689ba744c54dcb137a1114972ad93559d8c96f8970b3f04829516899d7b3f228c3 SHA512 45dd5236b3266f09401fb09d9bbf25668876eb83614a28fb4ba1b3c9a6317a3ef8a75388fc99b3e8495d1e36e98d177070af515b522b0002992b80264a56402f
 AUX minetest-5.7.0-no_upstream_optflags.patch 442 BLAKE2B a76fca23eac81d26079b9d52a10988f31547389ce892575fc9ad6353a5bb42451ca3cbacb541fe33806c80779349b91f4581121bbf295884b76e9162802a6efd SHA512 af0a6ff30670d0f05b5edcb76b7c2204b5e714f22a6aafca7106630e7a8d7ca46edf7efdcb0a4b84475fe6bdaf56c517101814d2886d4b7470a3007631026233
 AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
 AUX minetestserver.logrotate 71 BLAKE2B 9189610adc6e78be5249163e3daa02ebcb73822bed9939df3a807ec47e753e9952b3ac7932327164ae5dcf1ef149f55fdb898b1818412b994572f8ef6b4615e4 SHA512 82de44aa5670113d6a244c7cc662e6f4001510c6766490375f226d2abd4d7749310e8a21d282408a711478bf8449ab15036d9a914657e2ca4699395d32d8b21b
 AUX minetestserver_default.service 371 BLAKE2B a52989d01e7df20facac1796079e38d2145e72eb43868f19ba7ea573cf025d4aea346f7ddfc5e7001d70c6d43609d877be5af95956cc344df2b5c7e318bf07f1 SHA512 dbca1a2cc4b615310ff179f4fb803e05d856e04d8316c9d30807d12788b41e8f1ef87f510ff2db0114237a8d0640c3af3d31cc77a2bd23395e247d86710606e9
 AUX minetestserver_template.service 353 BLAKE2B 8f4231481a23c1ef29523533955e373b50669d6a61a818fe5c36b29be54ec21669f6c0e17ea6675795eb2630be08dcb053ae1843789d615dddb1664ec96f6c55 SHA512 ff9584b709df5f8f6a8544954da7a6ef593ac0b8bad2352a459c6eb97c684104f47708952882bf6b7216b7636328a1ff533b97bbc08cd300f1a47d2af71ac895
-DIST minetest-5.6.1.tar.gz 9924663 BLAKE2B 509b8073a4e82ecff008f692ebdd7a8f35ff5222ba1095937d24870404cca848b80891887837e03d86c117568f9bbee1f92fb958640e06107230673e79d7f813 SHA512 15d2ce3b1150f077ff933a04f0ba8e02c71ee60a0edb636d1511d4e90244a34a14d7e5c4b47bee4de96cd179249a5a6963d7a092084f46c0fa54c9ff431a5265
 DIST minetest-5.7.0.tar.gz 10115973 BLAKE2B 0f7e8864188004d57115c83508706b1cf1d6db0cba1a3002d603d4665e6d014ea2ec31df0a77a65da014467e21c331e3a27762018483a5bf4b2e024e3f7bdfc3 SHA512 6a934db5fd2c7c14fcfa87fb306662fa1ccf20a0eee056aea5c4c863986875017a4fa58ddf14319d385ee0400d00fb6a90f68b8f34527c98a746c6410360a529
-EBUILD minetest-5.6.1.ebuild 3547 BLAKE2B 219278235f9ff317a7b9f960325edfededee89eae365bcce1c3dcc9dfad16ea697ce62cc8ccfe0e1d89a5f0d70ce4d5c5ffc31edbde350cd20301b2237d305b3 SHA512 fb1cb628cdca4ab13f27d674105b741c7ffb1c14a6ccbd7fe625e3e200d83e4ffff5aef5562dfb794a55089ee9daf019f57c11de47a4274e2c4682a521d310f9
-EBUILD minetest-5.7.0.ebuild 3505 BLAKE2B 9e04cda3bb9c75b7c96396ab324508b20599b3679ecacbf99ea681ca1767de059f4786a2e5f61c1857ed75f50f0a09cd396aa3ae89e628e2feccc362a387cb1c SHA512 f737a57faecf9c12a18de075d2d4609da9ad40b0da31874c100559262fc439d5a90ee62ce757290bd38587552226ddf0468b5a93d2df5c51cf97cc8229c18c4b
+EBUILD minetest-5.7.0-r2.ebuild 3998 BLAKE2B 87f7662f0c7d30cbd734ec368c5aeabe561d454603b1e5e3df21bbf057ae756851777b8f10949a146134ec096aec39a75a5fc7b81825b38660a3bfa320b5ea56 SHA512 e81c069a3c7f1c26e49eee0bd0b67f3c554a245d3794806e92020b4138f584f150d7ead71e2ddd50568fa8418ab2ce144c3f2b8dffb397a17e29be05490b8864
 MISC metadata.xml 2174 BLAKE2B ad72184bd3f52d94304fb316d325478b03a5751d564174deac0eec4d05dce67f55dabc0e7c0788f9221318ac453802be552a711e35c60cce7f8396afb5fc7a9c SHA512 e3d99fa37f56133a051d8369ee5c8bc60a8e7159683cf11fba95470ff2e00acd2c3987b3d261641e2508a9f8f409e2f7249167a4226f490152ac35e58b476b1b
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 minetest-server@.service
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
diff --git a/games-action/minetest/minetest-5.7.0.ebuild b/games-action/minetest/minetest-5.7.0-r2.ebuild
index e3b199e0fd7d..c34a0a5a97d6 100644
--- a/games-action/minetest/minetest-5.7.0.ebuild
+++ b/games-action/minetest/minetest-5.7.0-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="lua_single_target_luajit? ( ${LUA_DEPS} )
 	dev-libs/jsoncpp:=
 	sys-libs/zlib
 	client? (
-		>=dev-games/irrlicht-mt-1.9.0.10
+		~dev-games/irrlicht-mt-1.9.0.10
 		media-libs/freetype:2
 		media-libs/libpng:0=
 		media-libs/libjpeg-turbo
@@ -53,7 +53,7 @@ RDEPEND="lua_single_target_luajit? ( ${LUA_DEPS} )
 	server? (
 		acct-group/minetest
 		acct-user/minetest
-		>=dev-games/irrlicht-mt-headers-1.9.0.10
+		~dev-games/irrlicht-mt-headers-1.9.0.10
 	)
 	spatial? ( sci-libs/libspatialindex:= )"
 DEPEND="${RDEPEND}"
@@ -99,6 +99,7 @@ src_configure() {
 		-DENABLE_SOUND=$(usex sound)
 		-DENABLE_SYSTEM_GMP=1
 		-DENABLE_SYSTEM_JSONCPP=1
+		-DENABLE_UPDATE_CHECKER=no
 		-DRUN_IN_PLACE=0
 	)
 
@@ -138,4 +139,13 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
+
+	elog "Since 5.7.0-r2 new ${PN} configurations no longer check if newer versions are available upstream,"
+	elog "a feature unnecessary when ${PN} is installed using distro packages."
+	elog "To disable this check for existing configurations open the file ~/.minetest/minetest.conf"
+	elog "in a text editor while ${PN} is not running, locate the keyword 'update_last_checked',"
+	elog "and change that line to say:"
+	elog
+	elog "	update_last_checked = disabled"
+	elog
 }