gentoo resync : 20.03.2022

13 files changed, 98 insertions, 21 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 1ff09bd92ff9..1ea89acce619 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index f34e78f32610..e9cdb948693b 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -2,5 +2,7 @@ AUX bzflag-2.4.12-configure.patch 1113 BLAKE2B 922feac9bb501d21a0b5decbc3ae8aff9
 AUX bzflag-2.4.12-sdl2-cppflags.patch 437 BLAKE2B e7abcaf318a67f9252e32be1215b1e80edfbe0926bdf5533849f39b5366a3acaf19bec88428bb700a7be2fe2a63053006c69d1284e4050adbf71e0f34d853394 SHA512 eb59f965b716869168cc5dc40f8b4e55d27abe997e83f2434de5e54802b6b29410e43b3fb00e5ede7da56e631bb4e0daaabd3072b4577e14127e54aa2fab9428
 AUX bzflag-2.4.12-tinfo.patch 683 BLAKE2B 720a6b5aa97a474c2e37bb2927cd9680a55249e732f6f07cc894e114c745b15886325a2d56a7731d397580a1dedba6be1acb71086e146bb8af2f983c908b3bb0 SHA512 f670e7362fc81055d3996a16c213746fa55338aed0756c36565c856eae4e7f9ed8bed3b2b2955b659f83bf03d4b4249b53a7ea02e614409fe38dbcd215c805da
 DIST bzflag-2.4.22.tar.bz2 14169079 BLAKE2B e3020d161326215b721e142198295314fce60212322d787389ee47519a8f20a64065ec2744799b8dc282fb343af1b2c5ae54bdab93827a5716ad5ac2363f8978 SHA512 c78ad0e9e861d0c922ef73dd1e040d998836efaab3a48d5a3cd8392835ce37392b1b9438aed7483ea48c6bce672bb937aeba40553553dce0c0fd3cce38bf10cf
+DIST bzflag-2.4.24.tar.bz2 14094506 BLAKE2B 4b14f00ce071d69b75091d0492ce26862e1f01356c61048ba46381f60f091b5dbf144d979e1f07bc87f4bd1159df3fc48c739fa370c92b7cf630308c8478ce24 SHA512 2e6c620e39e65058397515f309b58b0338ee972a63b241546f9947889a43b6274ce313fe5551517d1a099963d0ce877c67e29dfb70d424626926e77b9562c3f7
 EBUILD bzflag-2.4.22.ebuild 1381 BLAKE2B 7b3a9de69b7d270e672a409a7fb318111ad20fc6c6e3dfa09e943c251f9dadf3b743570301a22cb58e4f8917096c9c77d903a203dd0fb8e22cd51677a0fabba9 SHA512 d0ea410d2413ebc3ba709b9c9a76e1316b60a0b86f0a9c0e483e5ab19f290512e6ca9b4c3842d6ca6fd247a8767496b3b393991224964eeec281c2d92eed7db2
+EBUILD bzflag-2.4.24.ebuild 1381 BLAKE2B c5246ded3fa9a980540ea07677c408d961a6cc7d64bafcff330a5b98ab46e3a6f1cb7bfa3de40fe1f49693079f63e8cad4899c0c9359d7b2e412060142cd7299 SHA512 2ec5c96689016700e0adf3a8b61c2c5ce5c50afa3a16cbe702ca6e949c8afdc0f99184abb167b83ca7dd6274d856017ed5382f14ff3133ed6a687eb5bf57bbd0
 MISC metadata.xml 330 BLAKE2B 790c851882ad78f7df7572b461eaea63a0f047fc113e71162bb84bbbae84cbf2d0766afc5c56ca55d258077a89639fd37d2e5ac6133d6377095ac6e6a7743d4c SHA512 724aacf97ccfc2e43445cf9ee366c15653fc10e7f0dab4f48bd942fe6bc4e6e3710c6fe9afcc2bf9c88c50b2adbf04d610a727d612f631c4b1ed9acd7b796851
diff --git a/games-action/bzflag/bzflag-2.4.24.ebuild b/games-action/bzflag/bzflag-2.4.24.ebuild
new file mode 100644
index 000000000000..704daa557b95
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.24.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="https://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated upnp"
+
+RDEPEND="
+	net-dns/c-ares
+	>=net-misc/curl-7.15.0
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl )
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.12-configure.patch
+	"${FILESDIR}"/${PN}-2.4.12-tinfo.patch
+	"${FILESDIR}"/${PN}-2.4.12-sdl2-cppflags.patch
+)
+
+DOCS=( AUTHORS ChangeLog DEVINFO PORTING README README.Linux )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable upnp UPnP)
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
+	)
+
+	if use dedicated ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf+=( --disable-client --without-SDL )
+	else
+		myconf=( --with-SDL=2 )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use dedicated ; then
+		newicon data/bzflag-48x48.png ${PN}.png
+		make_desktop_entry ${PN} "BZFlag"
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/games-action/deathchase3d/Manifest b/games-action/deathchase3d/Manifest
index ac51218ed63c..83054e4fb188 100644
--- a/games-action/deathchase3d/Manifest
+++ b/games-action/deathchase3d/Manifest
@@ -1,4 +1,4 @@
 AUX deathchase3d-0.9-underlink.patch 362 BLAKE2B 37e7f99a739a3882b9b68354850f840b61cbb1b771f6075fbbc129b2cb80b416ddcc795226427401a6e5e9372523f69290ada2a700dc8834f82feb9528f46004 SHA512 4a255f6bb158baff2651815a83fa22b01a1ec21b91a1990db14c26ad30c1ef62441556bce3cdaea39edcac9c4fba30f95957ccccf2e4b1a110d23993c0606f58
 DIST deathchase3d-0.9.tar.gz 587888 BLAKE2B 1d2afba5687a7f4d3044ad65ddaaa7eae59e1d517c50e4d10c87db1f292eebe56ab9b83d2093de9d0fe646c9f25919a4af36183eb1511076bfe7d4ef78643602 SHA512 21e382ec389ff64e11562f9715ab53662d6f2150af7f7f940311acd0abad76da3904f4bae849479a04af99b0001fefe77509755975636de81767a9faa4487d90
-EBUILD deathchase3d-0.9-r1.ebuild 582 BLAKE2B a9f79e9489271b025d0370d60082c34fd9098e6067ea73006aad25bc2787d6b48a88bcf240a8eb5934aaa2e18c1301ce9d699bbf0e566a8af2a2a6ab86a8b997 SHA512 8427467dd19dc58f89eb86190691a885cc1f68516a13764128de67d17dd0110f45d7c2be3c6bcd5a939f260611771e642cf3370b815b6e8a4210f57ab3cffded
+EBUILD deathchase3d-0.9-r1.ebuild 583 BLAKE2B 181f6174501cf629e2d3be91a49977b6442e4fbfcd2e2b4a6a908eaa43abee7b56eff32d9ebebe98f3e7923dddd86e3621980cc5090d59dc59d3c12d95333762 SHA512 cfb52c9231bc6c21291a0451d05a1c78cfcf2cf8e7fd4b9376ce65ddf3aa07fdb99726abf034652c45f62d9ef1ff9f3b2b198274cc6191d284cd03545c39e03d
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-action/deathchase3d/deathchase3d-0.9-r1.ebuild b/games-action/deathchase3d/deathchase3d-0.9-r1.ebuild
index 89616438bd28..e32544fe26a8 100644
--- a/games-action/deathchase3d/deathchase3d-0.9-r1.ebuild
+++ b/games-action/deathchase3d/deathchase3d-0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="media-libs/libsdl[video]"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-underlink.patch"
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 533bfedcd08e..18e6d848257b 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,4 +1,4 @@
 DIST dxx-rebirth_20210623-src.tar.xz 1340044 BLAKE2B f16a8904d777559e789d719bc0d6d2dbb7d26c1128984117b6c64a334ae589dd5806439cc51e458a583e1b6cc831dae7c51bf7bd3fbc972989b0ce4e5b932a4e SHA512 150d873fa045df6fb2f9bb70334d08eeae0cc7a639e825f1352fed28501ab9541a27bf3395fc1929bc8d76ed9126b038eed67c5a01657f43116da4663e929821
-EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8459 BLAKE2B 6e060891494e94277063f859fdfba480f075c978e15d7efc3b0ad9c99735416f4bb83ce3b6da8cad7ab6f063721debdd559a3df47981d1f3a5e0a4aec51cf985 SHA512 5238166c421c14324b66d09a49767966a8cc08a4e1748edd6489d565a247cfd46ea3e484cd5c163c6eb3e31088d3868454b9bf983ea6a409157f06d6362a979d
-EBUILD dxx-rebirth-9999.ebuild 8495 BLAKE2B 909fdfbe780bf8c7bc3c06068ab4bfb854dfa95980787fce953dfcfc5dc21812f99a0cd2f5e5d02f31b4d2ef1bd3ca39e74fd6117a6549b1fcfc097dc352624d SHA512 f13b26f24a28d996a4fbf44ab4c7dd0aadb07bfe0ee22fe82540a0a20aa5907859d3c15f70e4b589145ae96348385c92ced92031e39a2b0a9348d1315549e541
+EBUILD dxx-rebirth-0.61.0_pre20210623.ebuild 8503 BLAKE2B fcb2f8ee52a7aac859dc361fbbf8e23f157217e096b0fdce3f3b7fb07cb3dfa9cf0daa2540ce59155213889bc3c1145913ead61d041136ec80cba0cec304c8b0 SHA512 fafb4e65901d2a504fe7fe49368ac2f2ab8be34cd38540a73d9974f2de020bef8d3e3c216014d96975536f8bde24c0d72deaa9881f11f29f8ea977e2015658f5
+EBUILD dxx-rebirth-9999.ebuild 8546 BLAKE2B 4047babd9e1416b70869999d785244ba69cbfc662fb63c50626e05170fbec85ec343655554565fcc305429553a5239b0d2637a1c95bd486d820d6a2cfe90dd03 SHA512 9bfc9f39480fa654bc7a790fd6db01d96d70a2697e80f0278d1f53f46ea7775d4058b56e67aeaa63624883cb86a7ba7621089763725084af95b49ddb5395cf32
 MISC metadata.xml 2538 BLAKE2B fd07b7eed8d0b484312d4ee54a6b13834b823ee2cd23eb8e5cef93a5b44b4311c2eee97946fed8d303883142b65243dbbefab921a7e01a111bc5126334230113 SHA512 9d07f6718f74adddcd9e3041758e29e456d62c8808c30f2e6963872a9d647491dea380134951973eeaad63dea0fb88710a5b6fc8e37461f011e6d8aea0e69693
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
index b941cf320c02..52185ad3b734 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
+inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 if [[ "${PV}" = 9999 ]]; then
 	inherit git-r3
@@ -215,6 +215,7 @@ dxx_scons() {
 
 src_compile() {
 	tc-export CXX PKG_CONFIG
+	replace-flags -O3 -O2 #831896
 	dxx_scons register_install_target=0 build
 }
 
diff --git a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
index 8b70e138369e..36013cd510bc 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit desktop python-any-r1 scons-utils toolchain-funcs xdg
+inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 if [[ "${PV}" = 9999 ]]; then
 	inherit git-r3
@@ -25,7 +25,7 @@ else
 	# fixes are merged into the main source by upstream.
 	#
 	# Cross-compilation to Windows is also supported.
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
@@ -217,6 +217,7 @@ dxx_scons() {
 
 src_compile() {
 	tc-export CXX PKG_CONFIG
+	replace-flags -O3 -O2 #831896
 	dxx_scons register_install_target=0 build
 }
 
diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest
index 5e18477bb088..a1ac8bbeceba 100644
--- a/games-action/minecraft-launcher/Manifest
+++ b/games-action/minecraft-launcher/Manifest
@@ -1,6 +1,6 @@
 DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
-DIST minecraft-launcher-1093 1639888 BLAKE2B 20f48d909d7b5f56f61508447cb57b94789df7a2f1fc33f3ca3d37a0609cfbb31d7be4b3becdc465652a2d4071a80209118d53f9eade5c6554d4289fc9dd9c46 SHA512 a75fc0003c72a3dbab4fb907a30f025cfad671a8e797fc2809a67f8c9ba8c98f0a8e2e275c928016739f474207dc17d1144e4c357abe76d409f99d75752c59fb
+DIST minecraft-launcher-1121 1639888 BLAKE2B 20f48d909d7b5f56f61508447cb57b94789df7a2f1fc33f3ca3d37a0609cfbb31d7be4b3becdc465652a2d4071a80209118d53f9eade5c6554d4289fc9dd9c46 SHA512 a75fc0003c72a3dbab4fb907a30f025cfad671a8e797fc2809a67f8c9ba8c98f0a8e2e275c928016739f474207dc17d1144e4c357abe76d409f99d75752c59fb
 DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
 EBUILD minecraft-launcher-1.6.93.ebuild 917 BLAKE2B 2d9bdc8209022a0bf140dd38cc0c7afbe063596d9d62f17207f37fce79d3ac8ebf5b30ddec9f7f98695bfe8376d5ba9e21b9522b26e8b19647d30e11c1c55e99 SHA512 c219bdc9fa912a9ddf30da207dd9fcdd998a0c16fe93d88a759298a5541693246fd8ebfd6a34c52d5a88b98b84abc1ec1ff2e53284888579c192ed8ff41f03dc
-EBUILD minecraft-launcher-1093.ebuild 1393 BLAKE2B b349f7e4244fca4d9614aaff308de79566d0d3af9251fde7005d4097591378b03a5358ac3f17aa744a02f48cb143166e5efecb42bd7d4612742e38a5f3b47f50 SHA512 5b135f58c636f712a65b6cf26c0d8ac530cb796207c83561eb9997ee84e5fd2706b9d0fd3198b119ab86a7440e961566a274b567e2a25639fa8c0e0098790805
+EBUILD minecraft-launcher-1121.ebuild 1392 BLAKE2B fc295741f02e21c8135f5b2ffbdfe7e2c93fe4a4d7d1bf60a590e9a9e7be9f3de2c2d6c212539a9b9ff07c8da2090e998d63c41a6461b5a4b9007cb2b403f3a5 SHA512 afc01ca464138c8d2332bf261ad6deb3b0c4596455a90b6bb7d2f533102026eabddab8b1864114698aa3ab46917728fd7c1b43ce66d8729b329bd0108421f749
 MISC metadata.xml 259 BLAKE2B 3bd5fecaefa4296413fd08aac88185d04771439afd26b516016a83ad674ca42d886412f99424be93e997431c64d5601ae89ae6478784cffb44e400d3fa4889b8 SHA512 d73de9f4636e5d93e57d9a781e5292e8d3bc270f8fb3b90c246cf3a2ba4a9ac9f36a9aea5a7f08aa6c608e61c836275bb1eb4b5c079b3db0da938efd10cdff9f
diff --git a/games-action/minecraft-launcher/minecraft-launcher-1093.ebuild b/games-action/minecraft-launcher/minecraft-launcher-1121.ebuild
index 7a66c936c8de..4166be98ee22 100644
--- a/games-action/minecraft-launcher/minecraft-launcher-1093.ebuild
+++ b/games-action/minecraft-launcher/minecraft-launcher-1121.ebuild
@@ -12,6 +12,7 @@ DESCRIPTION="An open-world game whose gameplay revolves around breaking and plac
 HOMEPAGE="https://www.minecraft.net/"
 SRC_URI="https://launcher.mojang.com/v1/objects/ce9e6169550628003e22de8086e9fe1186c2285e/minecraft-launcher -> ${P}
 	https://launcher.mojang.com/download/minecraft-launcher.svg"
+S="${WORKDIR}"
 
 KEYWORDS="-* ~amd64"
 LICENSE="Mojang"
@@ -47,8 +48,6 @@ RDEPEND="
 	x11-libs/xcb-util
 "
 
-S="${WORKDIR}"
-
 QA_PREBUILT="
 	usr/bin/minecraft-launcher
 "
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index dae7dfff21ef..0d6f5fdb30bf 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -8,6 +8,6 @@ AUX minetestserver_default.service 371 BLAKE2B a52989d01e7df20facac1796079e38d21
 AUX minetestserver_template.service 353 BLAKE2B 8f4231481a23c1ef29523533955e373b50669d6a61a818fe5c36b29be54ec21669f6c0e17ea6675795eb2630be08dcb053ae1843789d615dddb1664ec96f6c55 SHA512 ff9584b709df5f8f6a8544954da7a6ef593ac0b8bad2352a459c6eb97c684104f47708952882bf6b7216b7636328a1ff533b97bbc08cd300f1a47d2af71ac895
 DIST minetest-5.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
 DIST minetest-5.5.0.tar.gz 9558895 BLAKE2B 13db90556a4faaac31cca7427fb85439cab144d73f25b79ae9f8367883b0fafa39c39fe0e40f3734d7e3f48cef4942a37a302cf58993707a14024905d8ed9b61 SHA512 9c744eac2704457d6896485997666d614dd156214dae26c2cb413771fd3eab54d80731a5220bcc4a18ddc737db64971893a3c89a56a46020adf8d00aad299817
-EBUILD minetest-5.4.1-r1.ebuild 3478 BLAKE2B cb5f11ed5e8b8c0339570af29fd126f75b4f084f0910cd692870c797ecb3ae0349bc26db743cbd911d4d2fd01aedb5ccce4fa6c043ac07d421a7054a20522232 SHA512 3eb3ace3d2f20f457b2460c7a2a28720534a69454337db9ea3089e1b56bee74b267a1745fc1e13ea4e6cba6403de2aebdcccfdb9138443f49462377b76111cc7
-EBUILD minetest-5.5.0.ebuild 3463 BLAKE2B a91b8486891ee45266e45978615d89238aeec189eaac91708acc12b18a5c8a88cb293d26f06409224bbb8dbd4b664f20b582e0b650fad507adc9b9dec9ae2693 SHA512 c24c159b44f82a19a8bedbae2493868d28769aaca8214ef4421f1be6ad89c51e520726fde4d0b6b12065ea447f143b5dd80903da30d44453e05f8844310e5c8c
+EBUILD minetest-5.4.1-r1.ebuild 3473 BLAKE2B a6ef8825ce2a9d3dd4e3bc526763a84bae591cc4f3e41835d015358aae645239c7b56727a8af6369eb340b8854d0fe42af352bfe4cfe3ba5f24c831c2233c6e3 SHA512 9b261a166b0034f201b4b784a4b89f18b6651257a8958479f6f321fbd5d1d31260ee6ab49dfdf02277c0b3adfd4a9d00a5ddc566d291464f43bd3b4697062e2d
+EBUILD minetest-5.5.0.ebuild 3506 BLAKE2B c3aa05422df552e2662a678d65cce304677cbe3d45e7b84b7c4548da2ddc647f492147c9cd176421912f2cbe27f6e52a6d2261ade7cb17af8db80ac16464541c SHA512 ce823c2780a9474810900510e7cdf8b08f88275f0c8ef5b5dc9cc305d432ce04d7ec53cd2730a6f15489224138d1ebe6661436f2460f36d561afcf3b3f9b9158
 MISC metadata.xml 2174 BLAKE2B ad72184bd3f52d94304fb316d325478b03a5751d564174deac0eec4d05dce67f55dabc0e7c0788f9221318ac453802be552a711e35c60cce7f8396afb5fc7a9c SHA512 e3d99fa37f56133a051d8369ee5c8bc60a8e7159683cf11fba95470ff2e00acd2c3987b3d261641e2508a9f8f409e2f7249167a4226f490152ac35e58b476b1b
diff --git a/games-action/minetest/minetest-5.4.1-r1.ebuild b/games-action/minetest/minetest-5.4.1-r1.ebuild
index 5d74b5209d0c..1ba22196fef2 100644
--- a/games-action/minetest/minetest-5.4.1-r1.ebuild
+++ b/games-action/minetest/minetest-5.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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 ~x86"
+KEYWORDS="~amd64 ~riscv"
 IUSE="+client +curl doc +leveldb ncurses nls postgres prometheus redis +server +sound spatial test +truetype"
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
diff --git a/games-action/minetest/minetest-5.5.0.ebuild b/games-action/minetest/minetest-5.5.0.ebuild
index 0b2a456abd27..9491fc7de410 100644
--- a/games-action/minetest/minetest-5.5.0.ebuild
+++ b/games-action/minetest/minetest-5.5.0.ebuild
@@ -25,11 +25,11 @@ 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? (
+		>=dev-games/irrlicht-mt-1.9.0.4
 		media-libs/freetype:2
 		media-libs/libpng:0=
 		virtual/jpeg:0
@@ -51,6 +51,7 @@ RDEPEND="${LUA_DEPS}
 	server? (
 		acct-group/minetest
 		acct-user/minetest
+		>=dev-games/irrlicht-mt-headers-1.9.0.4
 	)
 	spatial? ( sci-libs/libspatialindex:= )"
 DEPEND="${RDEPEND}"