gentoo resync : 08.09.2019

12 files changed, 139 insertions, 550 deletions

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index b47961450631..7489754fee1a 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,10 +1,4 @@
-AUX 1-odamex-0.7.0-install-rules.patch 2713 BLAKE2B 885f9d88127bae449383b66305ae266bceccd8b9d321ff2a850cf85732e254281ea7222a95d6c1890d16633e0237df9c5f23a3a65aeb111dfcb18221b3e00dea SHA512 8ad2f8eaaf6697275daec6ff3076c3f8359eed46bc89bb8567f25e5c825ef065ae875c7c607a5bb99fd62bf8e616e4c0296af374817e9fe02abcd311b306a453
-AUX 2-odamex-0.7.0-cmake-options.patch 3459 BLAKE2B 3fa5b4f813a3e1fcbab917d7468807335883c78d328fd554c7c85e937023a2674610878449b93359059075133fbf68a38ff60b3dc73dfb50fc74362f5d2ceed2 SHA512 ef5ac9a88b189fb4276989e1de6e2723491777fa0cc12cd5dd38b9c992ed22e6be6892371efa4cf4af28eda85883056c27efa3ed074b878f89325333476dd19d
-AUX 3-odamex-0.7.0-wad-search-path.patch 1758 BLAKE2B a202ea34cf7c219b611d48601affd505614454b04a43d5678f70cc400e7100c65cce955bd378f4f51479572f09bcde447da425ac0a794a1a45227533ded9eb1c SHA512 031507d97734e75cddbcde5b09a7e483f1110dd08e692652b71a79e7f90b703090798916b3f25a74e18f29e0091e2f018d93662d82f994fb11317ba0215dfd10
-AUX 4-odamex-0.7.0-odalauncher-bin-path.patch 1671 BLAKE2B 833c95320ce5567fea90b12eedd7e2703540bff8f1a38e99ec80563ac4556ffe748b946948bb46d12064a08ed46a8c42fac92fbc5d6d408478067650718d92b8 SHA512 4ab5c84d5e3e1465fb02c775fad0208bf177264137d82297515c8f2bf188e9f4ce79a5510e28dfc4811392ecef407b89267e2baf45d37c236fb86cfc066c1ed2
-AUX odamex-0.7.0-gcc6.patch 1149 BLAKE2B e97191c08be8f1987c3374c4920b9016beb1e824e5e7781c8d4ec9088d9eb977e2dbb155ab7930914e3bae295098156c05d0726da7ee2df82a80a90d1ee333a7 SHA512 e34fc554016d67e42d95b9f2e964b69282791a9c07c9976c49990778188bfc1dab5784b29a798e10d6fcd8cc36893bd3416b57c8e2c9f1bd67587a3524c0a422
-AUX odamex-0.7.0-miniupnpc.patch 1144 BLAKE2B feb91380a8f1677f6aae2d29a569f3e452e6464c48962fe7f718a83733ce160b6bf2d4d0c84be78fbdb3f9102862571c13c69a9163a822f003743167d52a564d SHA512 0a805aca36687f183aa168972ecc9bfcd04c117787e42967fbf62b08873943b9f6c5118f15089a70ede43335ce571216255f315e08ce08f89ff23f6859507951
-AUX odamex-0.7.0-miniupnpc20.patch 850 BLAKE2B 5b3d1efca9a76b64b0783d66f47a3d1f6385963f257cc16c8205d1d5061dc9b7eb0c1b4f3396e6c8e05ed9effdd27e135822dbe7659da9b7ec2584c6d75bdffc SHA512 070a1e93e79485c7e30db95312f5d6cb089fba26acd34f3a1415c311f5753123e967dfe3fc1e4fb8cc3591ed5342387ca7e96daaef2440b759b9b3b4f29e035b
-DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b
-EBUILD odamex-0.7.0-r1.ebuild 2441 BLAKE2B 57337f452bef08fd79aa5f1d1ce6a2dfd34fac6456fb9e5069827f9f8a2faafec7b884a4e69e14d209424f4c7eaecf25c15fea85134548ca025a86245f1b7cf8 SHA512 09784c80f0741d80c49659578d1e400298888c76c75e3f33b7b3a1c1e37c9b157fb8c41a652af4d72e92c1459c5908ec274caf2ee92c9aff7ea5678858f94065
-MISC metadata.xml 1467 BLAKE2B 43e3e80b72476360be1f5a345946a96c4ba0b6068209afa8506325a9a8467d56c8f19b62e5713a8d41c6a84cdc24c8218b8dd73453feb7ac621e3338a9421e16 SHA512 386792eba91c781bdb52d0f3d262a516843b3ab17e9522e23506fb7327ca726178ac387d577464faa1608fd396e81b3be813ab2bdac6b92caf10a9133a28332b
+AUX odamex-0.8.1-miniupnpc.patch 1378 BLAKE2B 06ea9b7154e574d487a2a241474e401951319c7dd0ce71135605d84c8b3442fce1e23fc30ec5b12c77521dff2215640faa4eb1b99484272a51b0ccf67e232cb2 SHA512 5bcf602ae484eed180dbd02c315e2a6bab38a5e90711466a5ba005fed6782ea6a7244b9e8b8ebea38df5875f1d4eced1e51aaaa98e1124710f11aaafe4480049
+DIST odamex-src-0.8.1.tar.bz2 8520197 BLAKE2B 9744460f2a2bff375cbf80416a38212e7576a4ef6874d2647c1371dc66b464666d67dd69ac61c918c51bee6da0150cbb70799eb81fc2fd7ff62edaec332241a5 SHA512 5cdd05df9683c9b26cac5e2947f5365405b0c6239890d89ab962f4ac088788148bb1eabc15e80b0f13fca0dea69bffcd9e80e8aa80c6ac0a5d7e63b0bd983642
+EBUILD odamex-0.8.1.ebuild 1814 BLAKE2B f536da171ffe7e9d65250883e8ee9bd01ce339429b97b5534c9be0b375e8d494c958542f96e978d167561395561930056a669f51a1a03f208d608e4dc580995e SHA512 81721c8b46961b3877afce97c8a53037c649958f12b5d4b85ee0d05f914c7f55cd08e6f8d0f9b4f8a1d42aba08aef9fac6abe27c0011f79dae332692045b6d1b
+MISC metadata.xml 1530 BLAKE2B 03aad8e7b52331b6b2c0be004c82459219661acbce414880cb9b223eff121f9cdfabe6404309d20191b2c64f68878dc617d370d93bb6aaf4ebf74203a4b04dea SHA512 dc325607fdc57449f4fb61f56f42837a7969965f4c09f43867fa83a20783fcb9dc926b770dc587ed9e4649080c89094efe4c32ea7b55f12ec230dadb09edc6fa
diff --git a/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch b/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch
deleted file mode 100644
index 618f9fd87c2c..000000000000
--- a/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 1352b633388dd9d82b8cb7e3d11932d0b569da4e Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:07:37 +0100
-Subject: [PATCH 1/4] make install destinations modifiable
-
----
- CMakeLists.txt           | 5 +++--
- client/CMakeLists.txt    | 2 +-
- master/CMakeLists.txt    | 4 ++++
- odalaunch/CMakeLists.txt | 2 +-
- server/CMakeLists.txt    | 2 +-
- 5 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 11e52d1..262e3db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,5 @@
- include(CMakeDependentOption)

-+include(GNUInstallDirs)

- 

- project(Odamex)

- cmake_minimum_required(VERSION 2.8)

-@@ -113,10 +114,10 @@ if(NOT APPLE)
-       set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)

-   else()

-     install(FILES odamex.wad LICENSE README

--      DESTINATION share/odamex

-+      DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex

-       COMPONENT common)

-     install(FILES ${CONFIG_SAMPLES}

--      DESTINATION share/odamex/config-samples

-+      DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex/config-samples

-       COMPONENT common)

- 

-     option(ODAMEX_COMPONENT_PACKAGES "Create several rpm/deb packages for repository maintainers." OFF)

-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 510b820..3f73ab5 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -228,7 +228,7 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
-       COMPONENT client)

-   else()

-     install(TARGETS odamex

--      RUNTIME DESTINATION bin

-+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

-       COMPONENT client)

-   endif()

- endif()

-diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
-index 7fc386b..5bdc048 100644
---- a/master/CMakeLists.txt
-+++ b/master/CMakeLists.txt
-@@ -14,3 +14,7 @@ if(WIN32)
- elseif(SOLARIS)

-   target_link_libraries(odamast socket nsl)

- endif()

-+

-+if(UNIX)

-+	install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} )

-+endif()

-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
-index 4ca5920..0b134ef 100644
---- a/odalaunch/CMakeLists.txt
-+++ b/odalaunch/CMakeLists.txt
-@@ -71,7 +71,7 @@ if(wxWidgets_FOUND)
-       COMPONENT odalaunch)

-   else()

-     install(TARGETS odalaunch

--      RUNTIME DESTINATION bin

-+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

-       COMPONENT odalaunch)

-   endif()

- 

-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index b046714..d33b974 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -73,6 +73,6 @@ elseif(WIN32)
-     COMPONENT server)

- else()

-   install(TARGETS odasrv

--    RUNTIME DESTINATION bin

-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

-     COMPONENT server)

- endif()

--- 
-1.9.1
-
diff --git a/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch b/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch
deleted file mode 100644
index 1de502711406..000000000000
--- a/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 851bc58a74eadd89838c924167f27df1b9d3be37 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:14:20 +0100
-Subject: [PATCH 2/4] add various cmake options
-
----
- CMakeLists.txt        | 26 ++++++++++++++++++++++----
- client/CMakeLists.txt | 34 ++++++++++++++++++++--------------
- 2 files changed, 42 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 262e3db..91d5c50 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,13 @@
- include(CMakeDependentOption)

- include(GNUInstallDirs)

- 

-+# options

-+option(BUILD_CLIENT "Build client target" 1)

-+option(BUILD_SERVER "Build server target" 1)

-+option(BUILD_MASTER "Build master server target" 1)

-+cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 )

-+cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

-+

- project(Odamex)

- cmake_minimum_required(VERSION 2.8)

- 

-@@ -73,10 +80,21 @@ if(USE_INTREE_PORTMIDI)
- endif()

- 

- # Subdirectories for Odamex projects

--add_subdirectory(client)

--add_subdirectory(server)

--add_subdirectory(master)

--add_subdirectory(odalaunch)

-+if(BUILD_CLIENT)

-+	add_subdirectory(client)

-+endif()

-+if(BUILD_SERVER)

-+	add_subdirectory(server)

-+endif()

-+if(BUILD_MASTER)

-+	add_subdirectory(master)

-+endif()

-+if(BUILD_ODALAUNCH)

-+	add_subdirectory(odalaunch)

-+endif()

-+if(NOT BUILD_CLIENT AND NOT BUILD_SERVER AND NOT BUILD_MASTER)

-+	message(FATAL_ERROR "No target chosen, doing nothing.")

-+endif()

- 

- # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET

- # This is only really useful when setting up a universal build.

-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 3f73ab5..7363c5a 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -107,17 +107,21 @@ include_directories(${PNG_INCLUDE_DIRS})
- add_definitions(-DUSE_PNG)

- 

- # PortMidi configuration

--if(USE_INTREE_PORTMIDI)

--  include_directories(../libraries/portmidi/pm_common/ ../libraries/portmidi/porttime/)

--  add_definitions(-DPORTMIDI)

-+if(ENABLE_PORTMIDI)

-+	if(USE_INTREE_PORTMIDI)

-+	  include_directories(../libraries/portmidi/pm_common/ ../libraries/portmidi/porttime/)

-+	  add_definitions(-DPORTMIDI)

-+	else()

-+	  find_package(PortMidi QUIET)

-+	  if(PORTMIDI_FOUND)

-+		include_directories(${PORTMIDI_INCLUDE_DIR})

-+		add_definitions(-DPORTMIDI)

-+	  else()

-+		message(WARNING "PortMidi not found, client will be built without PortMidi support.")

-+	  endif()

-+	endif()

- else()

--  find_package(PortMidi QUIET)

--  if(PORTMIDI_FOUND)

--    include_directories(${PORTMIDI_INCLUDE_DIR})

--    add_definitions(-DPORTMIDI)

--  else()

--    message(WARNING "PortMidi not found, client will be built without PortMidi support.")

--  endif()

-+	message(STATUS "Portmidi disabled.")

- endif()

- 

- # Find Mac frameworks

-@@ -147,10 +151,12 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
-   target_link_libraries(odamex ${ZLIB_LIBRARY})

-   target_link_libraries(odamex ${PNG_LIBRARY} ${ZLIB_LIBRARY})

- 

--  if(USE_INTREE_PORTMIDI)

--    target_link_libraries(odamex portmidi-static)

--  elseif(PORTMIDI_FOUND)

--    target_link_libraries(odamex ${PORTMIDI_LIBRARIES})

-+  if(ENABLE_PORTMIDI)

-+	  if(USE_INTREE_PORTMIDI)

-+		target_link_libraries(odamex portmidi-static)

-+	  elseif(PORTMIDI_FOUND)

-+		target_link_libraries(odamex ${PORTMIDI_LIBRARIES})

-+	  endif()

-   endif()

- 

-   if(WIN32)

--- 
-1.9.1
-
diff --git a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch
deleted file mode 100644
index 77fb4e48996e..000000000000
--- a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 9af4e992ff9fa10816beba36478c711ac2c8542a Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:17:21 +0100
-Subject: [PATCH 3/4] add odamex.wad install destination to wad search path
-
----
- CMakeLists.txt    | 9 +++++++++
- common/d_main.cpp | 2 ++
- config.h.in       | 6 ++++++
- 3 files changed, 17 insertions(+)
- create mode 100644 config.h.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 91d5c50..a06613e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,6 +13,15 @@
- 

- set(PROJECT_VERSION 0.7.0)

- set(PROJECT_COPYRIGHT "2006-2014")

-+

-+configure_file (

-+  "${PROJECT_SOURCE_DIR}/config.h.in"

-+  "${PROJECT_BINARY_DIR}/config.h"

-+  )

-+

-+include_directories(

-+	${PROJECT_BINARY_DIR}

-+)

- 

- # Default build type

- if(NOT MSVC)

-diff --git a/common/d_main.cpp b/common/d_main.cpp
-index 31d4f59..be0ffd2 100644
---- a/common/d_main.cpp
-+++ b/common/d_main.cpp
-@@ -23,6 +23,7 @@
- //-----------------------------------------------------------------------------

- 

- #include "version.h"

-+#include "config.h"

- 

- #include <sstream>

- #include <string>

-@@ -506,6 +507,7 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s
- 	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);

- 	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);

- 	D_AddSearchDir(dirs, getenv("HOME"), separator);

-+	D_AddSearchDir(dirs, CMAKE_WADDIR, separator);

- 

- 	// [AM] Search additional paths based on platform

- 	D_AddPlatformSearchDirs(dirs);

-diff --git a/config.h.in b/config.h.in
-new file mode 100644
-index 0000000..e91b3a6
---- /dev/null
-+++ b/config.h.in
-@@ -0,0 +1,6 @@
-+#ifndef CONFIG_H
-+#define CONFIG_H
-+
-+#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
-+
-+#endif
--- 
-1.9.1
-
diff --git a/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch b/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch
deleted file mode 100644
index acb2692e75fb..000000000000
--- a/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 672b2e61f3c0347c29746a4a22fe3ab912e88d62 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:19:48 +0100
-Subject: [PATCH 4/4] use CMAKE_BINDIR as default bin patch in odalauncher
-
----
- config.h.in                | 1 +
- odalaunch/src/dlg_main.cpp | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/config.h.in b/config.h.in
-index e91b3a6..7019a02 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -2,5 +2,6 @@
- #define CONFIG_H
- 
- #define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
-+#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@"
- 
- #endif
-diff --git a/odalaunch/src/dlg_main.cpp b/odalaunch/src/dlg_main.cpp
-index a95a5f6..abbfc0a 100644
---- a/odalaunch/src/dlg_main.cpp
-+++ b/odalaunch/src/dlg_main.cpp
-@@ -27,6 +27,7 @@
- #include "str_utils.h"
- 
- #include "md5.h"
-+#include "config.h"
- 
- #include <wx/settings.h>
- #include <wx/menu.h>
-@@ -42,6 +43,7 @@
- #include <wx/process.h>
- #include <wx/toolbar.h>
- #include <wx/xrc/xmlres.h>
-+#include <wx/string.h>
- #include <wx/cmdline.h>
- 
- #ifdef __WXMSW__
-@@ -205,10 +207,12 @@ dlgMain::dlgMain(wxWindow* parent, wxWindowID id)
-     }
-     #endif
- 
-+    const char *cmake_bindir_str = CMAKE_BINDIR;
-+    wxString cmake_bindir = wxString::FromAscii(cmake_bindir_str);
-     launchercfg_s.get_list_on_start = 1;
-     launchercfg_s.show_blocked_servers = 0;
-     launchercfg_s.wad_paths = wxGetCwd();
--    launchercfg_s.odamex_directory = wxGetCwd();
-+    launchercfg_s.odamex_directory = cmake_bindir;
- 
-     m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);
-     m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);
--- 
-1.9.1
-
diff --git a/games-engines/odamex/files/odamex-0.7.0-gcc6.patch b/games-engines/odamex/files/odamex-0.7.0-gcc6.patch
deleted file mode 100644
index 9e341b881ccd..000000000000
--- a/games-engines/odamex/files/odamex-0.7.0-gcc6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Bug: https://bugs.gentoo.org/610566
-Commit: https://github.com/odamex/odamex/commit/1d8121c78fe2db9befb05dd40ceb9b86062024e4
-
-From 1d8121c78fe2db9befb05dd40ceb9b86062024e4 Mon Sep 17 00:00:00 2001
-From: rice <russell@odamex.net>
-Date: Tue, 30 Aug 2016 08:37:15 +0000
-Subject: [PATCH] - Apply patch from bug 1177, thanks RjY!
-
-SVN r5444 (trunk)
----
- common/m_vectors.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/common/m_vectors.cpp b/common/m_vectors.cpp
-index b51e4e40..2eb48a04 100644
---- a/common/m_vectors.cpp
-+++ b/common/m_vectors.cpp
-@@ -541,16 +541,16 @@ void M_PerpendicularVec3(v3double_t *dest, const v3double_t *src)
- {
- 	// find the smallest component of the vector src
- 	v3double_t tempvec;
--	double minelem = src->x;
-+	double minelem = fabs(src->x);
- 	double *mincomponent = &(tempvec.x);
--	if (abs(src->y) < minelem)
-+	if (fabs(src->y) < minelem)
- 	{
--		minelem = abs(src->y);
-+		minelem = fabs(src->y);
- 		mincomponent = &(tempvec.y);
- 	}
--	if (abs(src->z) < minelem)
-+	if (fabs(src->z) < minelem)
- 	{
--		minelem = abs(src->z);
-+		minelem = fabs(src->z);
- 		mincomponent = &(tempvec.z);
- 	}
- 	
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch
deleted file mode 100644
index 34896e2a4e8b..000000000000
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Mar 27 21:16:02 UTC 2014
-Subject: unbundle miniupnpc
-
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -29,8 +29,7 @@
- set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)

- 

- # MiniUPnPc

--set(MINIUPNPC_DIR ../libraries/libminiupnpc)

--set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)

-+set(MINIUPNPC_DIR /usr/include/miniupnpc)

- 

- # Platform definitions

- define_platform()

-@@ -54,7 +53,7 @@
-   ${COMMON_SOURCES} ${COMMON_HEADERS}

-   ${SERVER_SOURCES} ${SERVER_HEADERS}

-   ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})

--target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})

-+target_link_libraries(odasrv -lminiupnpc)

- 

- if(WIN32)

-   target_link_libraries(odasrv winmm wsock32)

---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,7 +71,6 @@
- set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)

- set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)

- mark_as_advanced(FORCE UPNPC_INSTALL)

--add_subdirectory(libraries/libminiupnpc)

- 

- # PortMidi

- cmake_dependent_option(USE_INTREE_PORTMIDI "Compile with the version of PortMidi included in the source tree." ON "WIN32" OFF)

diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
deleted file mode 100644
index 377286220b11..000000000000
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: common/i_net.cpp
-===================================================================
---- a/common/i_net.cpp	(revision 5459)
-+++ b/common/i_net.cpp	(working copy)
-@@ -151,7 +151,11 @@
- 
- 	Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n");
- 
-+#if MINIUPNPC_API_VERSION < 14
- 	devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, &res);
-+#else
-+	devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, 2, &res);
-+#endif
- 
- 	if (!devlist || res != UPNPDISCOVER_SUCCESS)
-     {
-@@ -179,7 +183,11 @@
-       //      " desc: %s\n st: %s\n",
-         //    dev->descURL, dev->st);
- 
-+#if MINIUPNPC_API_VERSION < 16
-     descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0);
-+#else
-+    descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0, &res);
-+#endif
- 
-     if (descXML)
-     {
diff --git a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
new file mode 100644
index 000000000000..5fca5815162b
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
@@ -0,0 +1,48 @@
+From 656306d3e68f7f1f1441f03e1765530f34ea2611 Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu, 27 Mar 2014 21:16:02 +0000
+Subject: [PATCH] unbundle miniupnpc
+
+---
+ CMakeLists.txt        | 1 -
+ server/CMakeLists.txt | 5 ++---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0cafdbd5..00e033a9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -124,7 +124,6 @@ if (USE_MINIUPNP)
+   set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)

+   set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)

+   mark_as_advanced(FORCE UPNPC_INSTALL)

+-  add_subdirectory(libraries/libminiupnpc)

+ endif()

+ 

+ # Subdirectories for Odamex projects

+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index d8e57257..5badceef 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -35,8 +35,7 @@ set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)
+ 
+ # MiniUPnPc
+ if (USE_MINIUPNP)
+-  set(MINIUPNPC_DIR ../libraries/libminiupnpc)
+-  set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)
++  set(MINIUPNPC_DIR /usr/include/miniupnpc)
+ endif()
+ 
+ # git describe
+@@ -74,7 +73,7 @@ add_executable(odasrv
+   ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})
+ 
+ if (USE_MINIUPNP)
+-  target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})
++  target_link_libraries(odasrv -lminiupnpc)
+ endif()
+ 
+ if(WIN32)
+-- 
+2.23.0
+
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index 39562f87b323..608f36b8bc45 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -6,18 +6,19 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>mwoodj@knology.net</email>
-		<name>Mike Wood</name>
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="odalaunch">Build the wxwidgets based launcher.</flag>
+		<flag name="client">Build client target</flag>
 		<flag name="master">Build master server target (advertises odamex server list)</flag>
-		<flag name="portmidi">Enable portmidi support.</flag>
-		<flag name="server">Build server target.</flag>
+		<flag name="odalaunch">Build the wxWidgets based launcher</flag>
+		<flag name="portmidi">Enable PortMidi support</flag>
+		<flag name="server">Build server target</flag>
 	</use>
 	<upstream>
 		<changelog>http://odamex.net/changelog.php</changelog>
diff --git a/games-engines/odamex/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild
deleted file mode 100644
index 78af4a724d7e..000000000000
--- a/games-engines/odamex/odamex-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-inherit cmake-utils desktop gnome2-utils readme.gentoo-r1 wxwidgets
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="Online multiplayer, free software engine for Doom and Doom II"
-HOMEPAGE="https://odamex.net/"
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated master +odalaunch portmidi server"
-
-RDEPEND="
-	dedicated? ( >=net-libs/miniupnpc-1.8:0= )
-	!dedicated? (
-		media-libs/libpng:0=
-		>=media-libs/libsdl-1.2.9[X,sound,joystick,video]
-		>=media-libs/sdl-mixer-1.2.6
-		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-		portmidi? ( media-libs/portmidi )
-		server? ( >=net-libs/miniupnpc-1.8:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOC_CONTENTS="
-	This is just the engine, you will need doom resource files in order to play.
-	Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F
-"
-
-S="${WORKDIR}/src-${PV:2:3}"
-
-PATCHES=(
-	"${FILESDIR}"/1-${P}-install-rules.patch
-	"${FILESDIR}"/2-${P}-cmake-options.patch
-	"${FILESDIR}"/3-${P}-wad-search-path.patch
-	"${FILESDIR}"/4-${P}-odalauncher-bin-path.patch
-	"${FILESDIR}"/${P}-miniupnpc.patch
-	"${FILESDIR}"/${P}-miniupnpc20.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	rm -r libraries/libminiupnpc || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_INTREE_PORTMIDI=OFF
-		-DCMAKE_INSTALL_BINDIR="/usr/bin"
-		-DCMAKE_INSTALL_DATADIR="/usr/share"
-		-DBUILD_MASTER=$(usex master)
-	)
-
-	if use dedicated ; then
-		mycmakeargs+=(
-			-DBUILD_CLIENT=OFF
-			-DBUILD_ODALAUNCH=OFF
-			-DENABLE_PORTMIDI=OFF
-			-DBUILD_SERVER=ON
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_CLIENT=ON
-			-DBUILD_ODALAUNCH=$(usex odalaunch)
-			-DENABLE_PORTMIDI=$(usex portmidi)
-			-DBUILD_SERVER=$(usex server)
-		)
-	fi
-
-	append-cxxflags -std=c++11
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-
-	if ! use dedicated ; then
-		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
-		make_desktop_entry ${PN}
-
-		if use odalaunch ; then
-			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
-			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/odamex/odamex-0.8.1.ebuild b/games-engines/odamex/odamex-0.8.1.ebuild
new file mode 100644
index 000000000000..8cfa9cbee75a
--- /dev/null
+++ b/games-engines/odamex/odamex-0.8.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake-utils desktop 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"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~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
+		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+		portmidi? ( media-libs/portmidi )
+		X? ( x11-libs/libX11 )
+	)
+	server? (
+		upnp? ( net-libs/miniupnpc:= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-miniupnpc.patch
+)
+
+src_prepare() {
+	rm -r libraries/libminiupnpc odamex.wad || die
+
+	setup-wxwidgets
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_MASTER=$(usex master)
+		-DBUILD_ODALAUNCH=$(usex odalaunch)
+		-DBUILD_SERVER=$(usex server)
+		-DENABLE_PORTMIDI=$(usex portmidi)
+		-DUSE_MINIUPNP=$(usex upnp)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# Build odamex.wad
+	cd wad || die "cd failed"
+	deutex -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ../odamex.wad || die
+}
+
+src_install() {
+	if use client ; then
+		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
+		make_desktop_entry "${PN} -waddir /usr/share/doom" "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-utils_src_install
+}