gentoo resync : 02.09.2020

6 files changed, 36 insertions, 118 deletions

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 9226725e3078..525b872dabb8 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,7 +1,5 @@
-AUX odamex-0.8.1-SearchDir.patch 529 BLAKE2B d4c2e996f5f3489d344b385f86b9a1cbe534365715088cbd163d5232a29ff751e2bacf2241ca2bba5c13c6acd6ca39387323edd43311c128c8050c7ddbb82f4b SHA512 336560f2305af9d6eaab889ec644d63c4af10acfe53d05c94533f1e60b27e64b560cb3fe1bfcf8996283cd152666989e2525077918c83f44b7795b131eac979a
 AUX odamex-0.8.1-miniupnpc.patch 1378 BLAKE2B 06ea9b7154e574d487a2a241474e401951319c7dd0ce71135605d84c8b3442fce1e23fc30ec5b12c77521dff2215640faa4eb1b99484272a51b0ccf67e232cb2 SHA512 5bcf602ae484eed180dbd02c315e2a6bab38a5e90711466a5ba005fed6782ea6a7244b9e8b8ebea38df5875f1d4eced1e51aaaa98e1124710f11aaafe4480049
-AUX odamex-0.8.2-Fix-odamex.wad-build-flow.patch 2164 BLAKE2B 15ab9d66421f42baa14dbfd32c68385f3a99789bb6dd2f597db072f31f70ea70e43e25624ff277b0a52220a2879bdd89d79fb69a015882eeb05ad4f53cbaae52 SHA512 9992925b34041bbd90cadec4419da29c29df7623f8ae983bd3505142173c223f5e6f69c8cb6506d2ea819fcd56dcd781599126b6178a0c07a5d4d2a72b946891
-AUX odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch 908 BLAKE2B eabde2e3ee2f39c4883b8fb5c05e5bc9596fb45bd87c1947ed3b26c24a1fa869ded53ae59fd1dd610d2e4323258a3d5453f14b80bbc60c605f0614093668f3cc SHA512 7b67c190672c372eb348be9c36cad81f7cf958d4765adc32ddbd6b6a387efa0434ce09ce859ae24504de54881b9a6a040e704bc086ec56c8e97093b12dfcfa53
-DIST odamex-src-0.8.2.tar.bz2 8502115 BLAKE2B bf4acaea1c9ce81966886bdfef35d361f84dab02e32ec4fd11fe8d250b76c6ca86c0b2870f38382961949713059a2944eea50c6f4d05a41411799386ab3acc64 SHA512 bb3e2427ede7267afce8bb2b852eed3f8d2ed9cf17c5b15a264d6821d170c49dccea06ea0742d9dc7cfe42518701342572689b57ec6712f4b818bd0e25b436c8
-EBUILD odamex-0.8.2.ebuild 1846 BLAKE2B 84169335f81abbc2966678eefb9703db3026a1377b0b1c3c125b846f1853bb1272306b31719786a61cd0b52d6e4845e3e40d9ccf5dc7b48dd2c897f82305a31d SHA512 47d1eeee97794f1b431752e4bd4c56a1406a48d58e4d8311c21517c45b48e6b819777710a9acfc852ef49afe4882536e85eddd2c11ce6786e6a7251a3c268769
+AUX odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch 879 BLAKE2B ac627db089ddeab8d4c34601b44d70a54e5de0a3e7bfdb6eccf3c0798df81526df5e7be97323b5c33f8594c5f83be8d336cd23c6aadd34eb7046b0ad32eca028 SHA512 67a48daeb9774694ed957e4583deddb6e19e1bac965e823c5c165165013b987d5c0ec62e2272ab5e75694270b2c0f793d5bbef4f4946e98047a17c897ce45a77
+DIST odamex-0.8.3.tar.bz2 8532510 BLAKE2B 751d65dfe07a4c4c0cb5ff360e76a1291cf4ba289c459f15a0c277aca4d15b1e0989e1606cdc4e0f0bec56d6ae437027046302f5c55efb3b835a42df512fb18f SHA512 01a875973d43c87dde7953464e0e3c37fa088b00b6cc0ecbef1a8b3b9a87257ab24ef4e3c224ebcbc0e38cd3139c7adc56b12a03ae2528b66d6498bb8d84d720
+EBUILD odamex-0.8.3.ebuild 1801 BLAKE2B a96d8efba5ca414b51ac6a3d45e381ae6fc2ecd2dcaec437deab66338152c4f5bf056ea6cb4a3d6505266a0535a39019a4f9a65c8c4eb31e05af9ab7d9284d60 SHA512 3c443abd87b5599f74413020e4f84d5b273357117717dd32b7d8ac3a76dd2c6a33a977878f765a0a793a1994fade7e6ca11c2faba425322203a4258472218cd4
 MISC metadata.xml 1530 BLAKE2B c577ff15a5e7faf7d96eda89d9467c762851aeaf320ba2f42f8f767fcd68c8a78650ec39398cfb07e0d2804a7142ea1b90fb29e9af967ddbd57b5a1ba06fd395 SHA512 456673f333febcbedb51e65b690ddbf37b125ec90a05cdbb7b130a94668cc0b4e095879d8746255f0db342702da1d048a475d0736b8dadf196b399a65c9e237f
diff --git a/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch
deleted file mode 100644
index 70bd476eb3f2..000000000000
--- a/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/common/d_main.cpp b/common/d_main.cpp
---- a/common/d_main.cpp	2019-07-22 19:11:28.000000000 +0100
-+++ b/common/d_main.cpp	2019-09-09 22:57:47.624246017 +0100
-@@ -459,6 +459,7 @@
- 	D_AddSearchDir(dirs, INSTALL_PREFIX "/" INSTALL_DATADIR "/games/odamex", separator);
- 	#endif
- 
-+	D_AddSearchDir(dirs, "/usr/share/doom", separator);
- 	D_AddSearchDir(dirs, "/usr/share/games/doom", separator);
- 	D_AddSearchDir(dirs, "/usr/local/share/games/doom", separator);
- 	D_AddSearchDir(dirs, "/usr/local/share/doom", separator);
diff --git a/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch b/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
deleted file mode 100644
index e90617c38ea7..000000000000
--- a/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 03581f45a3563d3d79075fe0e85e6fb52e864b76 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 4 Apr 2020 22:38:26 -0400
-Subject: [PATCH] Fix odamex.wad build flow
-
-The odamex.wad file should be built in the proper build directory;
-building in the source tree confuses CMake and causes it to attempt to
-rebuild a second time. This patch also removes odawad dependency for the
-Odamex client and server executables.
----
- wad/CMakeLists.txt | 40 ++++++++++++++++++++++------------------
- 1 file changed, 22 insertions(+), 18 deletions(-)
-
-diff --git a/wad/CMakeLists.txt b/wad/CMakeLists.txt
-index c09b0d1a..349ce0df 100644
---- a/wad/CMakeLists.txt
-+++ b/wad/CMakeLists.txt
-@@ -4,28 +4,32 @@ find_program(DEUTEX deutex)
- if(DEUTEX)
- 	message("Found DeuTex: ${DEUTEX}")
- 
--	file(REMOVE odamex.wad)
--	add_custom_command(OUTPUT odamex.wad
--		COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt odamex.wad
-+	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
-+		COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+		BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- 		VERBATIM)
- 
--	add_custom_target(odawad DEPENDS odamex.wad)
-+	add_custom_target(odawad ALL
-+		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad)
- 
--	if(BUILD_CLIENT)
--	  add_dependencies(odamex odawad)
-+	if(WIN32)
-+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
-+			DESTINATION .
-+			COMPONENT common)
-+	else()
-+		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
-+			DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
-+			COMPONENT common)
- 	endif()
--	if(BUILD_SERVER)
--	  add_dependencies(odasrv odawad)
--	endif()
--endif()
--
--if(WIN32)
--	install(FILES odamex.wad
--		DESTINATION .
--		COMPONENT common)
- else()
--	install(FILES odamex.wad
--		DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
--		COMPONENT common)
-+	if(WIN32)
-+		install(FILES odamex.wad
-+			DESTINATION .
-+			COMPONENT common)
-+	else()
-+		install(FILES odamex.wad
-+			DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
-+			COMPONENT common)
-+	endif()
- endif()
--- 
-2.26.0
-
diff --git a/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch b/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
deleted file mode 100644
index 1b1bcf55d9e6..000000000000
--- a/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2d80f79770f43d19e1af2c7b04a41078b860a46a Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Wed, 8 Apr 2020 11:47:45 -0400
-Subject: [PATCH] Remove duplicate build rule for odamex.wad
-
-The odamex.wad file shouldn't be listed in BYPRODUCTS because it's
-already listed as the OUTPUT of the add_custom_command.
----
- wad/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/wad/CMakeLists.txt b/wad/CMakeLists.txt
-index 349ce0df..7b948ea3 100644
---- a/wad/CMakeLists.txt
-+++ b/wad/CMakeLists.txt
-@@ -7,7 +7,6 @@ if(DEUTEX)
- 	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- 		COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--		BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- 		VERBATIM)
- 
- 	add_custom_target(odawad ALL
--- 
-2.26.0
-
diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
new file mode 100644
index 000000000000..935d43466c41
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
@@ -0,0 +1,29 @@
+From 9e3ae8538475e6f15757ce51e214f5cd29f223e7 Mon Sep 17 00:00:00 2001
+From: Michael Wood <mwoodj@huntsvegas.org>
+Date: Tue, 25 Aug 2020 02:34:37 -0500
+Subject: [PATCH] Use C++11 on odalaunch target for wx 3.0.4 and up
+
+This addresses bug #1311. wxWidgets 3.0.4 requires C++11 support.
+---
+ odalaunch/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
+index f68a4d4d..4abbe0d8 100644
+--- a/odalaunch/CMakeLists.txt
++++ b/odalaunch/CMakeLists.txt
+@@ -32,6 +32,11 @@ endif()
+ 

+ # Odalaunch target

+ if(wxWidgets_FOUND)

++  # wxWidgets 3.0.4 requires C++11

++  if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3)

++    set(CMAKE_CXX_STANDARD 11)

++  endif()

++

+   add_custom_command(

+     OUTPUT ${XRCRES_HEADER}

+     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res

+-- 
+2.28.0
+
diff --git a/games-engines/odamex/odamex-0.8.2.ebuild b/games-engines/odamex/odamex-0.8.3.ebuild
index 572889edd825..ff1b19128574 100644
--- a/games-engines/odamex/odamex-0.8.2.ebuild
+++ b/games-engines/odamex/odamex-0.8.3.ebuild
@@ -8,7 +8,7 @@ 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"
+SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2+ MIT"
 SLOT="0"
@@ -34,10 +34,8 @@ BDEPEND="games-util/deutex"
 S="${WORKDIR}/${PN}-src-${PV}"
 
 PATCHES=(
-	"${FILESDIR}"/odamex-0.8.1-miniupnpc.patch
-	"${FILESDIR}"/odamex-0.8.1-SearchDir.patch
-	"${FILESDIR}"/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
-	"${FILESDIR}"/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
+	"${FILESDIR}/${PN}-0.8.1-miniupnpc.patch"
+	"${FILESDIR}/${P}-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch"
 )
 
 src_prepare() {
@@ -51,6 +49,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
 		-DBUILD_CLIENT=$(usex client)
 		-DBUILD_MASTER=$(usex master)
 		-DBUILD_ODALAUNCH=$(usex odalaunch)