6 files changed, 128 insertions, 9 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index c28b8657a061..503dede18391 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index f3ef35752897..cedbd07eb68e 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,4 +1,4 @@
 AUX frotz-2.53-uint32.patch 11097 BLAKE2B f5690216f66c07864b0b21a8def45e202df12f7437dd29fa7576d6782cd2c08d6405130d6c48aa71865a156f7101c80a8b5abbb9dd398154811074834adf3a41 SHA512 89cbbcc7782367ecfad571652990738adda0030c2b332fb6f137c56c893f41380c97301f4a614f1aad2d7c01537a478332bfe0df5fe69019eabcc4f1260dc330
-DIST frotz-2.53.tar.bz2 375800 BLAKE2B a3d14d11540cb12ed6e5326207946e26b0b3b85e13c50e7431f3901cfb19337661b233bf29077c1efe3a9663aef6d2886bba1717c8132d68e77580692fed30d1 SHA512 e920529920a0b831b859323046aeae032b4b84ac0296d4ef35026fe8a62798cf5f9f4e255af38421aa21ad5507cd87287924daafc759c9b9d7a089ba7d77d808
-EBUILD frotz-2.53-r1.ebuild 1749 BLAKE2B 2ac8cdca73624b4895c097f7737b448056071ae503ac296c41fee4500bcfcefe29fbce37418ad4436bd91c9f200e49e7426742595fb8a8f512b11e2dd559b7ce SHA512 dd434ba333ca3c42ccfa845357f76988e3a010ae5303ecf1840186a4a579e1a95e1543f54146f5dc1a5a72697e0ba995b16ff0a812627070ec70250149fadfa6
+DIST frotz-2.54.tar.bz2 354087 BLAKE2B e3a77038605333ead060ac8b9c1a7fbcbd71ae4d91eae6c7f5dda482fba6113ff32c6e4b7aef701931ed260278522bc5a2b98f61cf939b68166d6ed32e9eba16 SHA512 f608007e4eb979b928128d22d960621100c6f7042e9d8fe1bdf44137da94c1c2aa4778be0309056763185eaab2662e3604bd7396c9f5cbf98ce52db626225295
+EBUILD frotz-2.54.ebuild 1763 BLAKE2B a4e4aee2f3455cb9ee5654d8af0950c9259f6e31a2ee0624e064b830f324b9a22e05e201bc571a397c9c2ec31f3452c9d95f7f74b5e05de3357225796591635a SHA512 8ce0617d7365e91962a48adef5b303228316ab367278c027a460d6dd19af68874959a04cc5dec97551f131c6a52751efbff40f5973679f3753e13990a58ceefa
 MISC metadata.xml 338 BLAKE2B 811899ad96ae5e5b023d3cfdf11dc19de37b336dd7903bb63ec14c83ea0c96955ec1803a9954cff560c89bfb083a8f614e61bbe199e66d053125d4642c8be2aa SHA512 b72ccc452bb2d200f0c3b5cd3e361dadc4d80b248e0c8bef50fb264c85b0e0dd04639014c3b4d3f590ebcbcdd9bfe41c61c540514a272ee7ebb406bfbb337546
diff --git a/games-engines/frotz/frotz-2.53-r1.ebuild b/games-engines/frotz/frotz-2.54.ebuild
index 773b24490f66..a3ebae18235c 100644
--- a/games-engines/frotz/frotz-2.53-r1.ebuild
+++ b/games-engines/frotz/frotz-2.54.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -28,11 +28,11 @@ DEPEND="
 	)
 	sdl? (
 		media-libs/freetype:2
+		media-libs/libjpeg-turbo:=
 		media-libs/libpng:0=
-		media-libs/libsdl2[sound,threads,video]
+		media-libs/libsdl2[sound,threads(+),video]
 		media-libs/sdl2-mixer[mod,vorbis,wav]
 		sys-libs/zlib
-		virtual/jpeg:0=
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index b906b3998c90..e2046dde2b97 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,7 +1,8 @@
 AUX odamex-10.3.0-unbundle-fltk.patch 3556 BLAKE2B 8aa1fd752c465a89566edab409c2df03ce1bae7a3ae1fdf3749fbce90cef81d1315f1f677f3090d676ad514df957a043cfd02c497d03673c248d55b02ee89768 SHA512 3facbcb43f0bc516e85c6030d66fc03c2c0b11d25ed30bac1947cbffd1f3123e173c46e02b198215dc5b4aac7fccbf1bfe9aeaf54db6c0d159d7bd6d3abd3797
 AUX odamex-10.4.0-backport-pr928.patch 2485 BLAKE2B 50219598fd899548148642b97af7cf228a28f0717b44c01fd0cad724a72a7183bbd223e4d65ab22b1581fef395b4dd5142e65787eec9748865e1d46681a4dbad SHA512 6a791b4736375e0cd3158a3c65a3f2ab83b96196fd3b4510bddf80aaedac1827f8914f528bdf5e520a891423edc5cdce72675f66a6dce0e50f4c3970c744fd8d
 AUX odamex-lto.patch 1570 BLAKE2B 9284ff378e543b26a9871a21017ee93c5b0b426c1b3eb813fcc23b990ea1712993cf932a6c0beedbe2a6eddc9c908533470b7334c7167a265ef3170df6f5d995 SHA512 865b136f47f07ecebb94771435d9fba2b8768ad989713492242f71720a023863e71c23561afd101ff19075d8d5df0c6e4d30851a6a6366d77620b8ea30d4785c
+AUX odamex-musl.patch 2693 BLAKE2B 3bb517aeeb7bb3ba38ad83f8cfb973c171a713874ca694b821ed0267da5d796ae3ab6f4d904b8dcf3c2d844e2fe71f4ba34a3d54dcf312fc2c23c8fb54e46fc0 SHA512 80065d86fc1f671baaa920a40c787158eba68fb218f164c810e3dcbd8b601aeb1da545de3b2da8a6a47927a3f4c83a5903898f3e87d06413adda8837ccf12775
 AUX odamex-odalaunch-prefix.patch 1890 BLAKE2B 948054a8b66aacc68b000635a15c17544cf745ba87c71a89b230e76e5b316d41c929fbe792904c76ca2d474d810ac6880a99ba28bed07b04b039b0496af0d7e7 SHA512 8de4a39999af6a1e1f040d26d2c0ed4f1bc100b6c5c407fd6b75408e21cdea3b94a7052432f3e1229816ed7094ce95a7b2f2b8467a2aa8df5a1cf4ccb8c0e7f4
 DIST odamex-src-10.4.0.tar.xz 17255540 BLAKE2B bdfb357424bd1712cf763f5e6109b67910e518703e8a29fa3b071f73302beea2d3e7ed63a4e7195c367a01947ad829a78967cc77acfe3455a6e2094ca33b6590 SHA512 bea6a2e70e6bdab6a1d6b5beccf981b7570142cdabc6e54935601c5fd966e1a0e7935aa6b492185165440b31899fa6240f038a75d4741a92520e6e9be935ef7b
-EBUILD odamex-10.4.0-r3.ebuild 2383 BLAKE2B 2e392c796d41b17f557e25d5a5b47fdac9379f34a590a50b144b918d4fde2a3021f9eb926ec7764e532ff76ee89f7d7dd03939c56d41f1b9ec4c90a0c239cce0 SHA512 5ca92635375dee678f5dd17e71ef609aebe57a1f0fb7043fcd9d38a0dcec41c360e3be44048c5aa1e880d56893fffc235b97626847561e41b5701c8933dcdfa7
+EBUILD odamex-10.4.0-r3.ebuild 2413 BLAKE2B e2d8367bf2814037fbcc67c36991c5fe4b9eb2ed8ec78e96510c2f36a63ffa043e14d596c0f03ef2b671499d663ab36e652c8acd6f1d28deeb37807ce5f958b2 SHA512 4beb4ffb53c5f73f468f5282f7e37a5c5cb11fc296ee11cedb4d93fd19258daf9ae21a7e4ea5d86c9895c75c7516c9ca59220aa864839a045fe7b0961802574a
 MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af
diff --git a/games-engines/odamex/files/odamex-musl.patch b/games-engines/odamex/files/odamex-musl.patch
new file mode 100644
index 000000000000..bf6f2999ba49
--- /dev/null
+++ b/games-engines/odamex/files/odamex-musl.patch
@@ -0,0 +1,119 @@
+From deb113e672588879697ae3343c5d3f1616d13503 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 30 Mar 2024 22:39:14 +0000
+Subject: [PATCH] Include <ctime> wherever time_t is used to fix musl
+
+---
+ client/src/m_menu.cpp       | 2 ++
+ client/src/v_screenshot.cpp | 2 ++
+ common/c_dispatch.cpp       | 1 +
+ common/cmdlib.h             | 1 +
+ common/p_user.cpp           | 2 ++
+ server/src/c_console.cpp    | 2 ++
+ server/src/sv_banlist.cpp   | 1 +
+ server/src/sv_banlist.h     | 1 +
+ 8 files changed, 12 insertions(+)
+
+diff --git a/client/src/m_menu.cpp b/client/src/m_menu.cpp
+index 6268e1819..f82cbf40d 100644
+--- a/client/src/m_menu.cpp
++++ b/client/src/m_menu.cpp
+@@ -25,6 +25,8 @@
+ 
+ #include "odamex.h"
+ 
++#include <ctime>
++
+ #include "gstrings.h"
+ #include "c_console.h"
+ #include "c_dispatch.h"
+diff --git a/client/src/v_screenshot.cpp b/client/src/v_screenshot.cpp
+index 2f24cb184..375de5b9d 100644
+--- a/client/src/v_screenshot.cpp
++++ b/client/src/v_screenshot.cpp
+@@ -24,6 +24,8 @@
+ 
+ #include "odamex.h"
+ 
++#include <ctime>
++
+ #include <SDL.h>
+ 
+ #include <stdlib.h>
+diff --git a/common/c_dispatch.cpp b/common/c_dispatch.cpp
+index 504379aad..d30dd4e24 100644
+--- a/common/c_dispatch.cpp
++++ b/common/c_dispatch.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include <sstream>
+ #include <algorithm>
++#include <ctime>
+ 
+ #include "cmdlib.h"
+ #include "c_console.h"
+diff --git a/common/cmdlib.h b/common/cmdlib.h
+index c7041837b..a20be7c4c 100644
+--- a/common/cmdlib.h
++++ b/common/cmdlib.h
+@@ -24,6 +24,7 @@
+ #pragma once
+ 
+ #include <algorithm>
++#include <ctime>
+ 
+ #ifdef _MSC_VER
+ #pragma warning(disable : 4244)     // MIPS
+diff --git a/common/p_user.cpp b/common/p_user.cpp
+index d9a4bb965..461a3ef03 100644
+--- a/common/p_user.cpp
++++ b/common/p_user.cpp
+@@ -26,6 +26,8 @@
+ 
+ #include "odamex.h"
+ 
++#include <ctime>
++
+ #include <limits.h>
+ 
+ #include "cmdlib.h"
+diff --git a/server/src/c_console.cpp b/server/src/c_console.cpp
+index 34fcd19d9..57d7e71e2 100644
+--- a/server/src/c_console.cpp
++++ b/server/src/c_console.cpp
+@@ -24,6 +24,8 @@
+ 
+ #include "odamex.h"
+ 
++#include <ctime>
++
+ #include <stdarg.h>
+ 
+ #include "m_memio.h"
+diff --git a/server/src/sv_banlist.cpp b/server/src/sv_banlist.cpp
+index c271fe68c..36cdf9b63 100644
+--- a/server/src/sv_banlist.cpp
++++ b/server/src/sv_banlist.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include "odamex.h"
+ 
++#include <ctime>
+ #include <sstream>
+ 
+ #include "win32inc.h"
+diff --git a/server/src/sv_banlist.h b/server/src/sv_banlist.h
+index 6096f73fc..f4d686071 100644
+--- a/server/src/sv_banlist.h
++++ b/server/src/sv_banlist.h
+@@ -23,6 +23,7 @@
+ 
+ #pragma once
+ 
++#include <ctime>
+ #include <sstream>
+ 
+ #include "json/json.h"
+-- 
+2.44.0
+
diff --git a/games-engines/odamex/odamex-10.4.0-r3.ebuild b/games-engines/odamex/odamex-10.4.0-r3.ebuild
index a1d216e1f011..8b0fd3fd1b7b 100644
--- a/games-engines/odamex/odamex-10.4.0-r3.ebuild
+++ b/games-engines/odamex/odamex-10.4.0-r3.ebuild
@@ -9,7 +9,7 @@ inherit cmake desktop prefix wxwidgets xdg
 DESCRIPTION="Online multiplayer free software engine for DOOM"
 HOMEPAGE="https://odamex.net/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz"
-
+S="${WORKDIR}/${PN}-src-${PV}"
 LICENSE="GPL-2+ MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -38,13 +38,12 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="games-util/deutex"
 
-S="${WORKDIR}/${PN}-src-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
 	"${FILESDIR}"/${PN}-10.4.0-backport-pr928.patch
 	"${FILESDIR}"/${PN}-odalaunch-prefix.patch
 	"${FILESDIR}"/${PN}-lto.patch
+	"${FILESDIR}"/${PN}-musl.patch
 )
 
 src_prepare() {