gentoo resync : 22.05.2021

19 files changed, 306 insertions, 275 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index bd95d391a815..eb5da2ccc5dd 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 21489de2e5b5..29991d8f0ca3 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,8 +1,10 @@
-AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c239da056e31ba800ec0904d4ad2daa26a9fd5069ecffc2fded37a8409d966403456c239e78d2a7c369345 SHA512 75442376afb031ad65880fd2b9cad034c520c7bed489543d5e1cee65fc998d0ae082d5736528dcdfaca41681b01ee895d7e0471f8581e8f0cba1a8cbbe20b3bc
+AUX minetest-5.4.1-gcc11.patch 605 BLAKE2B d067b6bf6250fa9928c01220fb0da2c8ffc093c949840767db6cf2b84fbe889fd9ed2546c953048d02116f015a279622c1ada29ce1df6e3b254b0d0e9e56083d SHA512 f42b8c3c38b40a9f22eca7947360ae4d786ff0775f46b4184c3fe014b64958c89828bae314acd8bfe99246a452c818527b5d3c5c1c0b813ed0a82c43b915125b
+AUX minetest-5.4.1-system_puc_lua.patch 1285 BLAKE2B 773466b132d1e7fdcd2108c7cae9d7538d02319140c91c87b5533c4225fe64077a4400cdddbfa0d96b256fad54ef7b92a5239036789b2af3a57365ac0a305808 SHA512 acb1ddb7e156324b3e4aea2807ba7b708b563bcf70208bad672a1777eb116dd7c812fcd420cdfb3a08b9b3fe4adf8a56b51ee2827439a058a78e8ffc4cb07ea4
+AUX minetestserver.confd 310 BLAKE2B b5af3f5e87622fc3e1739f3972b32a3f83fa720476d7398ce55657b2e4d2dc8693748720aa422724b40a1309f79158b37ba9628061db31db3e5757a73c122205 SHA512 4905fb8446d82bdd7ccffcd6f0c2f85de9843107f10d21d73814f54587aab5f6c7716a78bc32cd82c8b7d8443f0492a3a7b5e47d10f2900349047b6ba7ceb2f3
 AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1
-AUX minetestserver.logrotate 85 BLAKE2B 72ca62554a0146305cbafd9050378252bc4214c23a71d1f43041bd78ad332f25e834de3ae382f383ef8aef40fccb4849343fe23223ad2032efd16a12c10022f8 SHA512 19fe1e9264f195ea178cade577cea5cd93f7de1ceaab14ee00cafc051e1ec8f2e2ceac89557a00a3dd7838002e30da622f90a313776de2ad35aab10c68b6ec14
-DIST minetest-5.4.0.tar.gz 11205196 BLAKE2B 4fd03cf75c6ace4a8e3b1fc81826a43df4a6ea68c7dbdc33cda948e5c81fb49440341f148943c7300036d4063fafb0104fc42a8a29a0495df65d4c66f0d4eb46 SHA512 4cb43678c56ee2ccf9d5dd9c1fc0007119d598a4a56df43fc2a1b827efe08feba0008a30bdb1a1fcd4efe0ada88484b7be0c9e46f108d5424451adb0999b0bcb
+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.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
-EBUILD minetest-5.4.0.ebuild 3468 BLAKE2B 4f143a3891ea938afdeeadd731fd75a141c7037836a8bb2304658db063ad4b4e04a0d285e076e3358ff6221f0c50b7c5a4e1ebd4d9a62ad3a0432d811016d57b SHA512 336f739ff228875e88a3d5c2680ff395341962b102a6a5637d7e93a9f80f28014fe12d548151b1679f09b7c04fdaaa0c4c6b143066912fc5e6e660a77653d0f9
-EBUILD minetest-5.4.1.ebuild 3468 BLAKE2B 4f143a3891ea938afdeeadd731fd75a141c7037836a8bb2304658db063ad4b4e04a0d285e076e3358ff6221f0c50b7c5a4e1ebd4d9a62ad3a0432d811016d57b SHA512 336f739ff228875e88a3d5c2680ff395341962b102a6a5637d7e93a9f80f28014fe12d548151b1679f09b7c04fdaaa0c4c6b143066912fc5e6e660a77653d0f9
-MISC metadata.xml 2334 BLAKE2B 54ba41eec9bd0c5099ff5e6850cf6413c6571f2321a928a71d4bb5d01a7eb44e703c80bad4c534b7e240521661c3faca8b5c7e6edde699c3be0daf4df9bd162f SHA512 660f8c7cf899fdbff19fde69e4f5e135cdc009497a4a640f51af92579620c0d805c803c3c38b751c21ce12ed8abb93422f72f8e2a5326b2a0323384d741085b1
+EBUILD minetest-5.4.1-r1.ebuild 3368 BLAKE2B e5b5e84f77c57a313c4f5c8859e74efc340949cc0331374f4498d6b09d28ef878860344e9ae892305df45974a271039de6fa1dc038769dda8eccffa6557705d6 SHA512 e00070979c30c808ca760a40b8eb98d8a077f63b05d0aec68f010933e0c79ed9f753e67c52f0d79852ca6b55447617b1968a91a32235797c386f467a34e89c89
+MISC metadata.xml 2173 BLAKE2B acf6384d65075fd5a9ea29365777e29a450b19e7f10d0a97791c3a5b86c624987d027190b4f8d67edf458255cfd8242060829bd5cfb050e6d6f731373e20cc5c SHA512 02b71f33bc8ffecc62f8cac1e82c21bcaaf5c9369ed6dd8b7e99e5dbc9b77d613d2106677e1538789956646d7050b56cc40a2b5bde0117f66ac2319defb5f2b5
diff --git a/games-action/minetest/files/minetest-5.4.1-gcc11.patch b/games-action/minetest/files/minetest-5.4.1-gcc11.patch
new file mode 100644
index 000000000000..bb37cdf31e07
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.4.1-gcc11.patch
@@ -0,0 +1,21 @@
+From 7c2826cbc0f36027d4a9781f433150d1c5d0d03f Mon Sep 17 00:00:00 2001
+From: lhofhansl <larsh@apache.org>
+Date: Thu, 6 May 2021 10:24:30 -0700
+Subject: [PATCH] Fix build for newer versions of GCC (#11246)
+
+---
+ src/clientiface.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/clientiface.h b/src/clientiface.h
+index cc5292b71bf9..dfd97674137c 100644
+--- a/src/clientiface.h
++++ b/src/clientiface.h
+@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #include <list>
+ #include <vector>
+ #include <set>
++#include <memory>
+ #include <mutex>
+ 
+ class MapBlock;
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
new file mode 100644
index 000000000000..7f49b427e8ee
--- /dev/null
+++ b/games-action/minetest/files/minetest-5.4.1-system_puc_lua.patch
@@ -0,0 +1,39 @@
+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/minetestserver.confd b/games-action/minetest/files/minetestserver.confd
index 7a6f9b12ff01..b383fbd3e33b 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 0ec4823663aa..2e38adfc5f50 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 000000000000..e2754abaaf12
--- /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 000000000000..a945de53e870
--- /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/metadata.xml b/games-action/minetest/metadata.xml
index 41104cf6b215..dae30ac4e48d 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -29,13 +29,9 @@
 		* Runs natively on Windows, Linux, OS X and FreeBSD.
 		* Supports multiple languages, translated by the community.
 	</longdescription>
-	<maintainer type="person" proxied="yes">
-		<email>vilhelm.gray@gmail.com</email>
-		<name>William Breathitt Gray</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
@@ -52,7 +48,7 @@
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/minetest/minetest/issues</bugs-to>
-		<doc lang="en">http://wiki.minetest.net/Main_Page</doc>
+		<doc lang="en">https://wiki.minetest.net/Main_Page</doc>
 		<remote-id type="github">minetest/minetest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-action/minetest/minetest-5.4.0.ebuild b/games-action/minetest/minetest-5.4.1-r1.ebuild
index 6304747349ed..401043e97758 100644
--- a/games-action/minetest/minetest-5.4.0.ebuild
+++ b/games-action/minetest/minetest-5.4.1-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-LUA_COMPAT=( luajit )
+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"
@@ -62,15 +62,14 @@ BDEPEND="
 	)
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-gcc11.patch
+	"${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
+)
+
 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
 }
@@ -91,7 +90,7 @@ src_configure() {
 		-DENABLE_GETTEXT=$(usex nls)
 		-DENABLE_GLES=0
 		-DENABLE_LEVELDB=$(usex leveldb)
-		-DENABLE_LUAJIT=1
+		-DENABLE_LUAJIT=$(usex lua_single_target_luajit)
 		-DENABLE_POSTGRESQL=$(usex postgres)
 		-DENABLE_PROMETHEUS=$(usex prometheus)
 		-DENABLE_REDIS=$(usex redis)
@@ -108,7 +107,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
@@ -117,13 +116,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
@@ -131,17 +137,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
 }
diff --git a/games-action/minetest/minetest-5.4.1.ebuild b/games-action/minetest/minetest-5.4.1.ebuild
deleted file mode 100644
index 6304747349ed..000000000000
--- a/games-action/minetest/minetest-5.4.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-
-inherit cmake lua-single 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 prometheus redis +server +sound spatial test +truetype"
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	|| ( client server )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${LUA_DEPS}
-	dev-db/sqlite:3
-	dev-libs/gmp:0=
-	dev-libs/jsoncpp:=
-	sys-libs/zlib
-	client? (
-		app-arch/bzip2
-		dev-games/irrlicht
-		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:= )
-	prometheus? ( dev-cpp/prometheus-cpp )
-	redis? ( dev-libs/hiredis:= )
-	server? (
-		acct-group/minetest
-		acct-user/minetest
-		dev-games/irrlicht-headers
-	)
-	spatial? ( sci-libs/libspatialindex:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-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
-}
-
-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_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_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 /var/log/minetest
-		fowners minetest:minetest /var/log/minetest
-
-		newconfd "${T}"/minetestserver.confd minetest-server
-		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/minetestserver.logrotate 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
-}
diff --git a/games-action/multimc/Manifest b/games-action/multimc/Manifest
new file mode 100644
index 000000000000..79445f71b539
--- /dev/null
+++ b/games-action/multimc/Manifest
@@ -0,0 +1,6 @@
+AUX multimc-0.6.12-gcc11.patch 443 BLAKE2B 866a6219c2a5ddc21cbe84ed4158174afced6b8689dddcd65c372678cc81fc13105e5416e27a41c69fef41a8b9b3cca6d73860a8e41721f8b09f56b72c16a7f4 SHA512 a97879fbc807e805d55c19007774f1698f717c021be1ba2ba9084a87341d9588be72d5b07779a57b2ea2d15015c100801289d782f2c0d27fe7a0da4ccd97f5d8
+DIST libnbtplusplus-multimc-0.6.1.tar.gz 47171 BLAKE2B e0e4d2593554dc59605114fcae86c59877da67d3f0888145b9ec2fe3d08decec7345a92c7d37310e021b5719f1371a58a22dc796e719028a478877e6d08982ed SHA512 81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d
+DIST multimc-0.6.12.tar.gz 2389805 BLAKE2B d7b7660578d78d5d1cbaae607bf340c0c0a0aab5b0d2460218e1e468f450a3ac7030cb235c3e25f61d27d8c1e3cca71a1abbea22f9759726d34e495fe49de180 SHA512 334b0996b7b49a0f4a46a3e5b08d50d5f7aa398b8d5871772c751c1f98438d9584ffcdaf27ad6d2e84b2776415bd38910dffb8e746c4b343916c6849df2146da
+DIST quazip-multimc-3.tar.gz 103519 BLAKE2B 7a636f9e76cae61cee42131093b56d2a577814b2eb04bdc3c3a7614cf307bbdabe533c66a9f07848bbd929a62b7043dc53f2f85e2e487bfcc820170112f1114b SHA512 2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0
+EBUILD multimc-0.6.12.ebuild 1761 BLAKE2B e74216f056d010ee75ef6f79ddab98be66f5e94c4a933f0ecd8f48bfaaf5407c4dcc94023b97ab731a9e8057040823aa955763aab16a339ef867dc45df64bff5 SHA512 6b31371ea25c1d50bd6cd518cb98884841150be42015f2e9551472fb4b49a0bb078d17fb0b94f2f88f9333fd2d55f539c2eb04187e8af61f5057b018e1e666cd
+MISC metadata.xml 1351 BLAKE2B fa740424b91185e19950b651ad9d0315ef8a2ebea92194ad2170998186d3fd807bd7c65d4e4067209b4e84abf90c448b1757f81d767ca71c006a979c03b5f18f SHA512 9fef1f3e445119fff1e506450f4dca9fad7d7843b1f645e218eb1516612c4d3f3c62036b67008a3c55842395e957eb3612d5eb5fed8d0232086c04a0621ef48a
diff --git a/games-action/multimc/files/multimc-0.6.12-gcc11.patch b/games-action/multimc/files/multimc-0.6.12-gcc11.patch
new file mode 100644
index 000000000000..b523fa7c5554
--- /dev/null
+++ b/games-action/multimc/files/multimc-0.6.12-gcc11.patch
@@ -0,0 +1,11 @@
+diff -Naur MultiMC5-0.6.12.orig/libraries/systeminfo/src/sys_unix.cpp MultiMC5-0.6.12/libraries/systeminfo/src/sys_unix.cpp
+--- MultiMC5-0.6.12.orig/libraries/systeminfo/src/sys_unix.cpp	2021-03-22 04:45:06.000000000 +0900
++++ MultiMC5-0.6.12/libraries/systeminfo/src/sys_unix.cpp	2021-04-29 06:41:55.269952475 +0900
+@@ -4,6 +4,7 @@
+ 
+ #include <sys/utsname.h>
+ #include <fstream>
++#include <limits>
+ 
+ Sys::KernelInfo Sys::getKernelInfo()
+ {
diff --git a/games-action/multimc/metadata.xml b/games-action/multimc/metadata.xml
new file mode 100644
index 000000000000..3e76d82c569f
--- /dev/null
+++ b/games-action/multimc/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">MultiMC/MultiMC5</remote-id>
+		<bugs-to>https://github.com/MultiMC/MultiMC5/issues</bugs-to>
+	</upstream>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<longdescription>
+		MultiMC is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. It also allows you to easily install and remove mods by simply dragging and dropping. Here are the current features of MultiMC:
+
+		- Manage multiple instances of Minecraft at once
+		- Start Minecraft with a custom resolution
+		- Change Java's runtime options (including memory options)
+		- Shows Minecraft's console output in a colour-coded window
+		- Kill Minecraft easily if it crashes/freezes
+		- Custom icons and groups for instances
+		- Forge, Fabric and LiteLoader integration (automatic installation, version downloads, mod management)
+		- Import of Curse modpacks
+		- LWJGL version changing built-in
+		- Supports every version of Minecraft that the vanilla launcher does
+		- Upload screenshots
+		- Import, export Instances allowing you to share with friends and/or make backups
+	</longdescription>
+</pkgmetadata>
diff --git a/games-action/multimc/multimc-0.6.12.ebuild b/games-action/multimc/multimc-0.6.12.ebuild
new file mode 100644
index 000000000000..5535354b2292
--- /dev/null
+++ b/games-action/multimc/multimc-0.6.12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2 xdg cmake
+
+MY_PN="MultiMC5"
+MY_P="${MY_PN}-${PV}"
+
+QUAZIP_VER="multimc-3"
+LIBNBTPLUSPLUS_VER="multimc-0.6.1"
+
+DESCRIPTION="An advanced Qt5-based open-source launcher for Minecraft"
+HOMEPAGE="https://multimc.org
+	https://github.com/MultiMC/MultiMC5"
+BASE_URI="https://github.com/MultiMC"
+SRC_URI="
+	${BASE_URI}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${BASE_URI}/libnbtplusplus/archive/${LIBNBTPLUSPLUS_VER}.tar.gz -> libnbtplusplus-${LIBNBTPLUSPLUS_VER}.tar.gz
+	${BASE_URI}/quazip/archive/${QUAZIP_VER}.tar.gz -> quazip-${QUAZIP_VER}.tar.gz
+"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0 LGPL-2.1-with-linking-exception LGPL-3"
+SLOT="0"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtgui:5
+	dev-qt/qttest:5
+	dev-qt/qtxml:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.8.0
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/zlib
+	>=virtual/jre-1.8.0
+	virtual/opengl
+	x11-libs/libXrandr
+"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/multimc-0.6.12-gcc11.patch )
+
+src_unpack() {
+	default
+	rm -r "${S}/libraries/libnbtplusplus" "${S}/libraries/quazip" || die
+	mv "${WORKDIR}/libnbtplusplus-${LIBNBTPLUSPLUS_VER}" "${S}/libraries/libnbtplusplus" || die
+	mv "${WORKDIR}/quazip-${QUAZIP_VER}" "${S}/libraries/quazip" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -r -i 's/-Werror([a-z=-]+)?//g' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMultiMC_LAYOUT=lin-system
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	domenu application/package/linux/multimc.desktop
+	doicon -s scalable application/resources/multimc/scalable/multimc.svg
+}
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 2cdea8b43072..81fe52263f76 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,8 +1,5 @@
 AUX teeworlds-init.d 1000 BLAKE2B 7681574d8e35583ea029b604925fa0ed3af50dafb17993e7315b2c9ff6bb83ecbe788e9745851d7763fd74018ef5ec222ba5b4a65c3b57ed0be2c7ae5b3e8b5a SHA512 01d39e8a0b5991000d336a4d51f8b61e296c0c9fce7b4247d24007b119c9c7a863e284e670b6286923a1e22fd25c4a171d20846feacea34bcc0c4d33120e98bd
 AUX teeworlds_srv.cfg 193 BLAKE2B dbbad582189f5b098e9f199dc59227ef90485e7a1bc406372d69f9985ee5a7fe39db68c52d8eb394a1c6e1320496925fa8c5474dd91204bf6e93787c2c0ba838 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5
-DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8 SHA512 74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3
-DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925 SHA512 41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc
-DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3 SHA512 673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b
-DIST teeworlds.png 21502 BLAKE2B 8064e0c2149f20f182b2ca2f7454f0e8395e199a432b8f21a9963cc771b1504ebe8cbe427ecd738d35313b1a378eaf8e305d509cd5360a07e9ab3c5224b78b77 SHA512 a272a1d9f13504c43ba873d93899df93c435f58cec20ae68bc9493a983e54cdd4c8f0f2e0630558c5e915aec891d2267bc3459ecc78c25738602452a2123fadf
-EBUILD teeworlds-0.7.5.ebuild 1945 BLAKE2B 7754b29decddf9de5e41f0d6d9add0814429fb1d4b9c9318e03b78068d3d6d9a31c98eb0fd7379c227d9f98cd298dda370962f7bbab0f7c9c00bcf89c6c189c0 SHA512 b578b7ca2c4a90d6781c14db6850edf4525d76880185648b408e74cbdfae40d3adcc9dfde705af57c5bfc9cce1047fddc7e1e229d26ead676a91dff4fcf3eef5
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
+DIST teeworlds-0.7.5-src.tar.gz 8935505 BLAKE2B 40cf14e4f6d811df29a98cd51adc773021083e3474cc768998923fb6746e65b17c502d80af8e5613716dd3f12cf1e7cf840ec44b19ad8d214bd2cfa71f1871f3 SHA512 f0c55489b99b06e27298ac42adcf31e1130e7eace6f8672836e50c66c27ab0ccce5b8680c7181a2adc59e1f5808564001b5f0bc8ac7ab355ad8db71328ea7a76
+EBUILD teeworlds-0.7.5-r1.ebuild 1219 BLAKE2B dcc7d55f1b69b204a063e11adca65b01a27744e182456d1a7cd12923f9628cb58697efbe548a3676a9a89cb4f09a5a47559f31681f10d54b0d528a5472760ceb SHA512 6545d42db396c349773901b6bb964bade73c41b61dc3c36727dad1a240502bf8eaef19a938fd6226138767b324d4257c3e6ea547d239b86261681f34342732cc
+MISC metadata.xml 337 BLAKE2B 5858a9bda53e0846c5826c8d2b9582163b48125078b7660596b84878f4821c4eb4797fe0371c2bfd7419734ccaf3fb665e05cec49823a9f4f6e820d705476534 SHA512 add8e01d15363a41fc6e0b2f0ada8b76fcf2ce1ada63f1082d0a6b2e6b992bf9d510a93c30e20d3d8cbf590e2f69b046f5cb5dc5e9386d49cf4d1906a6b1044d
diff --git a/games-action/teeworlds/metadata.xml b/games-action/teeworlds/metadata.xml
index 26079e608bed..01627dd2b74e 100644
--- a/games-action/teeworlds/metadata.xml
+++ b/games-action/teeworlds/metadata.xml
@@ -5,4 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">teeworlds/teeworlds</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild b/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..6eb673a54626
--- /dev/null
+++ b/games-action/teeworlds/teeworlds-0.7.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit xdg cmake desktop python-any-r1
+
+DESCRIPTION="Online multi-player platform 2D shooter"
+HOMEPAGE="https://www.teeworlds.com/"
+SRC_URI="https://github.com/teeworlds/teeworlds/releases/download/${PV}/teeworlds-${PV}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated"
+
+RDEPEND="
+	!dedicated? (
+		app-arch/bzip2:=
+		media-libs/freetype
+		media-libs/libsdl2[X,sound,opengl,video]
+		media-libs/pnglite
+		media-sound/wavpack
+		virtual/glu
+		virtual/opengl
+		x11-libs/libX11
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/imagemagick-tools[png]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLIENT=$(usex dedicated OFF ON)
+		-DDEV=$(usex debug ON OFF)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	convert "other/icons/teeworlds.ico[0]" ${PN}.png || die
+	doicon -s 256 ${PN}.png
+
+	domenu other/teeworlds.desktop
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/teeworlds_srv.cfg
+}
diff --git a/games-action/teeworlds/teeworlds-0.7.5.ebuild b/games-action/teeworlds/teeworlds-0.7.5.ebuild
deleted file mode 100644
index 318db644f58b..000000000000
--- a/games-action/teeworlds/teeworlds-0.7.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-COMMIT_LANG="4ba6f824e9c34565e61340d25bc8c3cc004d40fb"
-COMMIT_MAPS="1d3401a37a3334e311faf18a22aeff0e0ac9ee65"
-inherit cmake desktop python-any-r1 xdg-utils
-
-DESCRIPTION="Online multi-player platform 2D shooter"
-HOMEPAGE="https://www.teeworlds.com/"
-SRC_URI="
-	https://github.com/ktrace/gentoo-blobs/raw/master/teeworlds.png
-	https://github.com/teeworlds/teeworlds/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/teeworlds/teeworlds-maps/archive/${COMMIT_MAPS}.tar.gz -> ${P}-maps.tar.gz
-	https://github.com/teeworlds/teeworlds-translation/archive/${COMMIT_LANG}.tar.gz -> ${P}-translation.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated"
-
-RDEPEND="
-	!dedicated? (
-		app-arch/bzip2:=
-		media-libs/freetype
-		media-libs/libsdl[X,sound,opengl,video]
-		media-libs/pnglite
-		media-sound/wavpack
-		virtual/glu
-		virtual/opengl
-		x11-libs/libX11
-	)
-	dev-libs/openssl:0=
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND} ${PYTHON_DEPS}"
-
-src_prepare() {
-	cmake_src_prepare
-	rm -r "${S}/datasrc/languages" || die
-	rm -r "${S}/datasrc/maps" || die
-	mv "${WORKDIR}/${PN}-translation-${COMMIT_LANG}" "${S}/datasrc/languages" || die
-	mv "${WORKDIR}/${PN}-maps-${COMMIT_MAPS}" "${S}/datasrc/maps" || die
-	cp "${DISTDIR}/${PN}.png" "${S}/" || die
-	python_fix_shebang scripts/
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCLIENT=$(usex dedicated OFF ON)
-		-DDEV=$(usex debug ON OFF)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon -s 256 "${PN}.png"
-	domenu other/teeworlds.desktop
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	insinto "/etc/${PN}"
-	doins "${FILESDIR}"/teeworlds_srv.cfg
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}