5 files changed, 31 insertions, 163 deletions
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 997555d1b0a9..949028c78329 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,10 +1,8 @@
-AUX odamex-0.9.0-Unbundle-miniupnpc.patch 2765 BLAKE2B f1a7307c82d6ab9ee17524d0384ec7b54ee51a1ee611a89cad9cdd3e8a98b448327a85242f71f0432ec266cbb8b24b893a0ca86dd62b994bc1320ef4157dc9f6 SHA512 a310ede1fc3340e6ee28ea0925da828dae517d7f9f83d015b744e0b3185ed82fa737f0a1d6c73ab000edf87a4467910ab14aa3a6bb34dc7c157535bd8270173c
+AUX odamex-10.0.0-master-std.patch 842 BLAKE2B db7b4daf846c9c0a2bb9ab561a384752fa69c10271997c7669dfcdecec6d006b1abfaacc996d85139024ef6e612bd6a418e54bef99f42a538bea921dc9596fc2 SHA512 afb76e04b7a2f1424099b78fd233ebeae7b3aadf2196b91e41770aa82b8ae4e5123a4a2e43a498ecbe8a0f00a853fcfaf31a7904ccaf75e95e7cc5ddc8013644
 AUX odamex-10.0.0-musl.patch 1976 BLAKE2B 5c0a9a71c37296e5de95528476e1d70198ff15358db15db1203ac44ecfc8d6b2b57613a03a3143e06ae9ff1860ba81a5b65ada64d60325fa8978e573167b0833 SHA512 3acb26554e7237386e239ddb1a62ed695cb79c28f65f2b1a29994438650c5858594f545570532f9b6c89dc33fe1ca7cb3f71b17ca2c00733b867476ca3aad9af
 AUX odamex-10.0.0-unbundle-fltk.patch 3986 BLAKE2B 56507d7aa52eb3708016e0dd1a3c86d6554ef7e44a38ca5be6dc5f0e358d475b78a602bfa9879994047466506722a1fda0454ee752181489e52ec2634ed8a639 SHA512 1a058a69e84343e6f4d1599ccbb3a0b074ed36b87e095c29888d22c848522c7910297e27a5a7799f0ffc0ecc3b6dc92630b7b55642c6dafbc4c825a2f0f93fc9
 AUX odamex-10.0.0-unbundle-jsoncpp.patch 3311 BLAKE2B cf826f9012d2ccd7ee3031ba75dad9044450583f7bc8126841ac63a274b257ab304ab4e0c5cdda88147c5e476d78b430020ebf41801dda3ae012e4a98177a80c SHA512 cfd09a51b3b8ca103d5e77919445c903843f867806a3b6e0ac13c01b61c7986ca4b1a8d662ca70a1e3c0694da81323edfe66895a86e40738a24914fded05e11e
 AUX odamex-10.0.0-unbundle-miniupnpc.patch 3660 BLAKE2B dde9066a0a9da7119ed668cce8443c91c070c93e70d55ec6d47600ea1a02038c8473706f9ff911b9b164ed7599730115f466926cf8ac564a79698d658ccb3098 SHA512 afe2211f70d56284754ecc2ba59f2b519bfce5084b4f9ebd6b514a65b2e624c97fa4317bf505a7dbfedae91de3ad878cd454ba4ff7f56a5064ca5a2ca05858d9
-DIST odamex-0.9.5.tar.bz2 6659528 BLAKE2B 6f6052aff5a1e0c9a54c417113b67a91044d05ebf13d8ab5fb01132f9bb90b1c97392e881b8bff8baee4621c8e53abbb360fc8c7e6de8ff53d45ee55f73c48ec SHA512 70a0deb5e5b5902620f8fe692dc8507f9f19d7d6afabb4e2efbc25dc6879d469aa250dc55bb165db83a4288af9d5adda72ce3823a3db6dd9ccb83f5c684d3ac8
 DIST odamex-src-10.0.0.tar.xz 17680868 BLAKE2B 95df336ccc24c2658174bdd051cb9b98ca906d653d84a120330d8fe6f11ad91ba70ba7edfc960f8815d02795f7392761a0174171de30ea78b37389a61deacae7 SHA512 b825953a446a4eb46d2d004b20df876bceec823cb5f0bf661ecac03eff2f07c11fe47c6861f3c3ee417ce9ca869474ff422d78bba1b742485315ba5ba86bd702
-EBUILD odamex-0.9.5.ebuild 1845 BLAKE2B 39c34dba167f4a7c23471cd6725885fc726c16e5d0d75d235cbe0709da76b22e6a51ede94cb00cc03751fd447484df2b9b53b3e5419a7f64d251c4f654003884 SHA512 aa1fe92f0184c745a8974f95efd68a1b2a6f5d5688720e8c30de873e4226eef739f4465554251fc8b9982c0374a7cb75fe0b360697bbf3d7d0541a7fc7fc2920
-EBUILD odamex-10.0.0.ebuild 2322 BLAKE2B 3ca6443984f7c8c9385cb1498549224cb567b5c65785909c448911b505314edb7bd641d7dda176ed415f47c8f7fae67a7777d518542a3303e41f845a349a2488 SHA512 5d7d44123932daf7560d7c460885c7b319c0ace9fcb182b6c2263be779cfd03277bd299d123dd651fe90ddb823e6e8d4e72556c03fd70c2549d3f0b3a9be4f86
+EBUILD odamex-10.0.0.ebuild 2367 BLAKE2B d6753857e9352e392cda37febdac858239a6ad04ae0cea6e707234838c7a4646180d04cd44597c0978cc2c6d7ea42fceb077545d34b5f4aecc4e2e13deddb8dc SHA512 07aa89f6314be22fa476431e2923935a3db562168d59cf1282dd81a6b3176959b70554d07b656784fa93bbaf69793a98f699bf79423c1c083bc4f732097f250d
 MISC metadata.xml 1385 BLAKE2B f97715d64f4798d968ae5e17c32f66df5728f1f1994ffdca7001926931f998796a727b965fbb69b6bb1641028b3c36c36505553fe08f090138a967065d0ccf0c SHA512 4f9cbdef3d8005b6f533248379cc1798487d8e2e2b4fca5791c3a62e52f1164ba3a1de253db2be382d5ec50e053d0f9e37a8a08432857c7ec94a84d9cdccdcbc
diff --git a/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch b/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch
deleted file mode 100644
index 77b6220041da..000000000000
--- a/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 4b9a8ca565e5cd388a49cd0fbe693b5332577c57 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Mon, 22 Mar 2021 18:20:15 +0900
-Subject: [PATCH] Unbundle miniupnpc
-
----
- libraries/CMakeLists.txt | 42 ----------------------------------------
- server/CMakeLists.txt    |  3 ++-
- 2 files changed, 2 insertions(+), 43 deletions(-)
-
-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index 177a86a2..2ffe95a5 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -227,48 +227,6 @@ endif()
- 
- ### MiniUPnPc ###
- 
--if(BUILD_SERVER)
--  message(STATUS "Compiling MiniUPnPc...")
--
--  # Figure out the correct library path to attach to our imported target
--  set(MINIUPNPC_INCLUDE_DIR
--    "${CMAKE_CURRENT_BINARY_DIR}/local/include/miniupnpc")
--  set(MINIUPNPC_LIBRARY
--    "${CMAKE_CURRENT_BINARY_DIR}/local/lib/${libprefix}miniupnpc${libsuffix}")
--
--  # This must exist before the target is synthesized.
--  file(MAKE_DIRECTORY ${MINIUPNPC_INCLUDE_DIR})
--
--  # Generate the build.
--  execute_process(COMMAND "${CMAKE_COMMAND}"
--    -S "${CMAKE_CURRENT_SOURCE_DIR}/libminiupnpc"
--    -B "${CMAKE_CURRENT_BINARY_DIR}/libminiupnpc-build"
--    -G "${CMAKE_GENERATOR}"
--    -A "${CMAKE_GENERATOR_PLATFORM}"
--    -T "${CMAKE_GENERATOR_TOOLSET}"
--    "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
--    "-DCMAKE_LINKER=${CMAKE_LINKER}"
--    "-DCMAKE_RC_COMPILER=${CMAKE_RC_COMPILER}"
--    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
--    "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/local"
--    "-DCMAKE_INSTALL_LIBDIR=lib" # Without this, CentOS installs into lib64
--    "-DUPNPC_BUILD_SHARED=No"
--    "-DUPNPC_BUILD_TESTS=No")
--
--  # Compile the library.
--  execute_process(COMMAND "${CMAKE_COMMAND}"
--    --build "${CMAKE_CURRENT_BINARY_DIR}/libminiupnpc-build"
--    --config RelWithDebInfo --target install --parallel ${PARALLEL_PROC_COUNT})
--
--  # Synthesize an imported target that can be linked against.
--  add_library(upnpc-static STATIC IMPORTED GLOBAL)
--  set_target_properties(upnpc-static PROPERTIES
--    INTERFACE_INCLUDE_DIRECTORIES "${MINIUPNPC_INCLUDE_DIR}"
--    IMPORTED_LOCATION ${MINIUPNPC_LIBRARY})
--  if(WIN32)
--    set_target_properties(upnpc-static PROPERTIES INTERFACE_LINK_LIBRARIES "ws2_32;iphlpapi")
--  endif()
--endif()
- 
- ### SDL libraries ###
- 
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 73a70000..e4b085f2 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -53,7 +53,8 @@ endif()
- target_link_libraries(odasrv jsoncpp odamex-common)
- 
- if(USE_MINIUPNP)
--  target_link_libraries(odasrv upnpc-static)
-+	target_include_directories(odasrv SYSTEM PRIVATE "/usr/include/miniupnpc")
-+	target_link_libraries(odasrv -lminiupnpc)
- endif()
- 
- if(WIN32)
--- 
-2.31.0
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-master-std.patch b/games-engines/odamex/files/odamex-10.0.0-master-std.patch
new file mode 100644
index 000000000000..2fe299fd12df
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.0.0-master-std.patch
@@ -0,0 +1,28 @@
+From 08ff1a04abfde739f7b6d273ebfad65e9a09c24a Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 20 Mar 2022 13:19:49 +0000
+Subject: [PATCH] Set odamast C++ standard to 98
+
+Otherwise the use of `byte` is ambiguous with newer compilers, resulting
+in a build error.
+
+(cherry picked from commit 4c06d27e60b1e10c4d661523894430323398b140)
+---
+ master/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
+index cbe6a0311..f216eab9a 100644
+--- a/master/CMakeLists.txt
++++ b/master/CMakeLists.txt
+@@ -6,6 +6,7 @@ file(GLOB MASTER_SOURCES *.cpp *.h)
+ # Master target
+ add_executable(odamast ${MASTER_SOURCES})
+ odamex_target_settings(odamast)
++set_property(TARGET odamast PROPERTY CXX_STANDARD 98)
+ 
+ if(WIN32)
+   target_link_libraries(odamast wsock32)
+-- 
+2.34.1
+
diff --git a/games-engines/odamex/odamex-0.9.5.ebuild b/games-engines/odamex/odamex-0.9.5.ebuild
deleted file mode 100644
index eb8519c9e40f..000000000000
--- a/games-engines/odamex/odamex-0.9.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake desktop prefix wxwidgets xdg
-
-DESCRIPTION="Online multiplayer free software engine for DOOM"
-HOMEPAGE="https://odamex.net/"
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+client master +odalaunch portmidi server upnp X"
-REQUIRED_USE="|| ( client master server )"
-
-RDEPEND="
-	client? (
-		media-libs/libpng:0=
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/sdl2-mixer
-		net-misc/curl
-		portmidi? ( media-libs/portmidi )
-		X? ( x11-libs/libX11 )
-	)
-	odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-	server? (
-		upnp? ( net-libs/miniupnpc:= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-Unbundle-miniupnpc.patch"
-	"${FILESDIR}/${PN}-10.0.0-musl.patch"
-)
-
-src_prepare() {
-	rm -r libraries/libminiupnpc || die
-	hprefixify common/d_main.cpp
-
-	use odalaunch && setup-wxwidgets
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_INTERNAL_LIBS=0
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_LAUNCHER=$(usex odalaunch)
-		-DBUILD_MASTER=$(usex master)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_OR_FAIL=1
-		-DENABLE_PORTMIDI=$(usex portmidi)
-		-DUSE_MINIUPNP=$(usex upnp)
-	)
-	use client && mycmakeargs+=(-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X))
-
-	cmake_src_configure
-}
-
-src_install() {
-	if use client ; then
-		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
-		make_desktop_entry "${PN}" "Odamex"
-
-		if use odalaunch ; then
-			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
-			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
-		fi
-	fi
-
-	cmake_src_install
-}
diff --git a/games-engines/odamex/odamex-10.0.0.ebuild b/games-engines/odamex/odamex-10.0.0.ebuild
index 36c7c98744f3..3f412be3f47d 100644
--- a/games-engines/odamex/odamex-10.0.0.ebuild
+++ b/games-engines/odamex/odamex-10.0.0.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-10.0.0-unbundle-jsoncpp.patch
 	"${FILESDIR}"/${PN}-10.0.0-unbundle-fltk.patch
 	"${FILESDIR}"/${PN}-10.0.0-musl.patch
+	"${FILESDIR}"/${PN}-10.0.0-master-std.patch
 )
 
 src_prepare() {