gentoo Easter resync : 12.04.2020

5 files changed, 111 insertions, 18 deletions

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 00fe4b6d7cb5..9226725e3078 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,5 +1,7 @@
 AUX odamex-0.8.1-SearchDir.patch 529 BLAKE2B d4c2e996f5f3489d344b385f86b9a1cbe534365715088cbd163d5232a29ff751e2bacf2241ca2bba5c13c6acd6ca39387323edd43311c128c8050c7ddbb82f4b SHA512 336560f2305af9d6eaab889ec644d63c4af10acfe53d05c94533f1e60b27e64b560cb3fe1bfcf8996283cd152666989e2525077918c83f44b7795b131eac979a
 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-r1.ebuild 1855 BLAKE2B bdc225caefb90eaade4f17c01687662967654c568a9771ce4c46025c8642e01557f577241d1feb8b2c305aa9dfc604d43459e646c7b4749e2db4206a3af8962c SHA512 95f6f0238fd2adaa9066585ef70322593b847dbf44354881d124e4b37778fdc998b859020534dc56045f75b94716f0e3f5e2e837f323509b617e6fa0d7c203fa
-MISC metadata.xml 1530 BLAKE2B 03aad8e7b52331b6b2c0be004c82459219661acbce414880cb9b223eff121f9cdfabe6404309d20191b2c64f68878dc617d370d93bb6aaf4ebf74203a4b04dea SHA512 dc325607fdc57449f4fb61f56f42837a7969965f4c09f43867fa83a20783fcb9dc926b770dc587ed9e4649080c89094efe4c32ea7b55f12ec230dadb09edc6fa
+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
+MISC metadata.xml 1530 BLAKE2B c577ff15a5e7faf7d96eda89d9467c762851aeaf320ba2f42f8f767fcd68c8a78650ec39398cfb07e0d2804a7142ea1b90fb29e9af967ddbd57b5a1ba06fd395 SHA512 456673f333febcbedb51e65b690ddbf37b125ec90a05cdbb7b130a94668cc0b4e095879d8746255f0db342702da1d048a475d0736b8dadf196b399a65c9e237f
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
new file mode 100644
index 000000000000..e90617c38ea7
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
@@ -0,0 +1,71 @@
+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
new file mode 100644
index 000000000000..1b1bcf55d9e6
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
@@ -0,0 +1,26 @@
+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/metadata.xml b/games-engines/odamex/metadata.xml
index 608f36b8bc45..29a83742d57b 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vilhelm.gray@gmail.com</email>
 		<name>William Breathitt Gray</name>
@@ -13,6 +9,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="client">Build client target</flag>
 		<flag name="master">Build master server target (advertises odamex server list)</flag>
diff --git a/games-engines/odamex/odamex-0.8.1-r1.ebuild b/games-engines/odamex/odamex-0.8.2.ebuild
index 43af64e77527..572889edd825 100644
--- a/games-engines/odamex/odamex-0.8.1-r1.ebuild
+++ b/games-engines/odamex/odamex-0.8.2.ebuild
@@ -34,12 +34,14 @@ BDEPEND="games-util/deutex"
 S="${WORKDIR}/${PN}-src-${PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-miniupnpc.patch
-	"${FILESDIR}"/${P}-SearchDir.patch
+	"${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
 )
 
 src_prepare() {
-	rm -r libraries/libminiupnpc odamex.wad || die
+	rm -r libraries/libminiupnpc wad/odamex.wad || die
 	hprefixify common/d_main.cpp
 
 	use odalaunch && setup-wxwidgets
@@ -60,14 +62,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_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"