gentoo resync : 25.08.2020

15 files changed, 177 insertions, 46 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 11b909c8f035..ddd088486594 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index ce274b05c93e..5faaddb77ecc 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,4 +1,3 @@
-AUX eduke32-20190419.7615-wad2map-buildfix.patch 539 BLAKE2B 92fe0ec1c1d126eee7f48b4c403194e8b375f28dc9581cb20b393ea4e7464938aacea760075e6c845d45edcf98df476bb3254026d3304f3c52a98f32cf7f7b00 SHA512 983f847af630456ae61dfa65a6fcd890a04e2b14722efd11bc25a3f9e3ac33b9bd5559b6a1e3927471a45196c417a1e17c0b2dd7f177c44b7aa81aa7e224fa92
 AUX eduke32-20190820.8043-log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
 AUX eduke32-20190820.8043-search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 AUX eduke32-20200505.8904-gcc10.patch 294 BLAKE2B fe527a1a38b17731322dd5d7c9c1ea16dce86eb2c023966a28e87477c9b25001294fcda456fc2bdbfdfbbefb67991e67f9693db69ef18d8485035546e231e0cf SHA512 a79859e6f167203ee0d09db1740cfd223e0e196f2ed5f65e51830e27c8a7bf284ff9bd20d1527dfc2679a08f1ec2aa92a1e582599e656bd0e655bfda189608c7
@@ -10,6 +9,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20200505-8904-0b0e9923c.tar.xz 16569468 BLAKE2B 557a4547e13ff422dacf0885f8ddff8b62bb658bc63c2b70564b5f40cabaf55abd30103a28af474391cd3662641768bcec5f3338f882f82fc657cfa24a566436 SHA512 6b86b1fd16c0175c7dea1816e8d2b4f92f6d5a26c9f68bbbd5cf5ed7821524ef72ef646bc931d4d82773a33438f0de7a33b84429719e485f8cf05cd8ab92cb6b
-EBUILD eduke32-20200505.8904.ebuild 5925 BLAKE2B 6fd315457369a5c49d901a2dbe09538206527e62a5e50f88bbc4884f0a87a897658c3d25ef28f976df69078ef314f65701509d44f98fba84d4877ad53497cc2a SHA512 e13d53f4a0ed76f9e2dda25016f76be46cdcb9b6c051c007e4ad623c6ca603c65acc5caad43d1e8d510a874c9f1c71411f0f898d8f0688d6b4e47912f11b2816
+DIST eduke32_src_20200808-9208-16a4d06be.tar.xz 19787360 BLAKE2B 3344a660fd5dec951e27e74a0680ba506692991c96438af53901bd5c090ca4c14be90db37ad4cc454c7f0dc2b7628a9bb9abce4e55c4dd9713a1fe90af28c53d SHA512 0b88ed5a0c3a5134aaabe9c30eb2d9a2a17c4833388788c4e1d3bf6bc76aa0edb3b6189c503f614894d480d25a27d498df11fb13ea64c465253a9b564c43b78c
+EBUILD eduke32-20200808.9208.ebuild 5831 BLAKE2B e2f586a983d31679dc6287d7703b4c243134ed888c738ad244e3e66798f6a261f11f07fafc6bc0d6920e46a8f4a159fb347fa009326ae25bd5244c51e39a48d8 SHA512 a3bd85f958b3f398bce72f1f8a7602cc32b3018170f5ce7610e87b06c45f7e2aa239e6306c64b20734b899beb9de97f9bc53ed76102ed8530971bc044b8d6638
 MISC metadata.xml 1608 BLAKE2B 73414a3516a4a690254e70ad071f160688ac11e8fe0634b0218565fc32e01d1e4b8ed0ce830ecd995e715552f23fd50f8c7cb0b0af95f6cdb07a35940639e779 SHA512 2392e18cc53663943341397d3a92f07b3dbbb04497b584739095bef5e9b2f60376115a2952e0d2eba524b3a678e7c205ad3e66a78709a2f4d36b3ea76d8b8c09
diff --git a/games-fps/eduke32/eduke32-20200505.8904.ebuild b/games-fps/eduke32/eduke32-20200808.9208.ebuild
index c493f5f8a351..e1fadcfdc493 100644
--- a/games-fps/eduke32/eduke32-20200505.8904.ebuild
+++ b/games-fps/eduke32/eduke32-20200808.9208.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop toolchain-funcs xdg-utils
 
-EGIT_COMMIT="0b0e9923c"
+EGIT_COMMIT="16a4d06be"
 MY_BUILD="$(ver_cut 2)"
 MY_DATE="$(ver_cut 1)"
 MY_PV_HRP="5.4"
@@ -85,7 +85,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20190419.7615-wad2map-buildfix.patch"
 	"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
 	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
 	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
@@ -208,7 +207,7 @@ src_install() {
 	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
 	make_desktop_entry mapster32 Mapster32 eduke32 Game
 
-	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
+	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
 	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
 	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
 	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
diff --git a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
deleted file mode 100644
index 611f7a9d1ee0..000000000000
--- a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/source/tools/src/wad2map.cpp	2019-04-08 08:29:24.000000000 +0200
-+++ b/source/tools/src/wad2map.cpp	2019-04-20 15:07:38.684542190 +0200
-@@ -7,6 +7,7 @@
- 
- #include "compat.h"
- #include "pragmas.h"
-+#include "vfs.h"
- 
- #define MAXWADS 4096
- #define MAXPOINTS 8192
-@@ -313,7 +314,7 @@
-         Bprintf("Could not find %s\n",scriptname);
-         exit(0);
-     }
--    filpos = 0; fileng = filelength(filhandle);
-+    filpos = 0; fileng = buildvfs_length(filhandle);
-     while (readline() != 0)
-     {
-         i = 0; j = 0; lasti = 0;
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 0ee989d42d26..3dfeaf5fb157 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,4 +1,5 @@
 AUX prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch 2501 BLAKE2B 66496503315613582a99c89bcf53afcc96fd4749a352dcf285461d3a528d34523e2fbb83134b42ce8391749c29b5d68e0adc5acd2344bdc79ea3716135c806cb SHA512 e18e732c53207a6658f24d17ca68feb4b78930c83e5b55f370d4a63f05d190301a81a5f11a3dc9df9bcdcd73fd803713a8fd37e9529e7399b3d0974e1dcc2055
+AUX prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch 1799 BLAKE2B 45f55771db27a741d50b7fce2027000e2b2227cdc9cfdda574c1eda7afa98b1af9a1d792428e145507c5e4bcdeda4aba97b7030b88259dc6a7584c9f03cc8dd3 SHA512 744c15e5164ecca8d622fae408f6bcff0e50bc07c57733b0bab9e8a447da18b9403095ca813c1158b345f118ceaf62d6e2f6db28b7177cd8dacc6bb3e61dc7fa
 DIST prboom-plus-2.5.1.7.82.tar.gz 1541604 BLAKE2B 7c10754aa5f85879b63a3778d87e8e2fcd21fcd5092f96a31dc087e878ca080b9ce48d2e7d8f5cac9aa05c8a69cf5f6e9661a5b581de7afe21d59a18af2e57e9 SHA512 55f0ec4edcbac80174aadc63f1f77f3b868a6d1e8efc309ed6f71898d486a3c31d18e08130c9b4a6afd63185003bfd11e6b5940b550071f60168b3c716845f0f
-EBUILD prboom-plus-2.5.1.7.82.ebuild 1884 BLAKE2B 1c87336788e315490930d65ad9c5c1d211dc2843ac5de81a1db0c825db670fa502eb4ac354d77f77d867cefef7a8a37119d32d953591a9ced2a720b6ba6889c5 SHA512 900e15e9c5a8bc9699f254ec579b9c9430f294f470ef00e08c40b932a45447704ea46c990ef9b5edd2c15093cb1803b8a0c72090309d57050d71791e77d6033c
+EBUILD prboom-plus-2.5.1.7.82.ebuild 1987 BLAKE2B 365193abb83471e9ce41f714defbd36c638c50aeec9995cc692f68ac9ad027ec0022091497eb830c7f3993e357548879aed72f81fb6330f32f8c42e51adf6de7 SHA512 c3f398a6dc7a5390d86e8a5781f93b1bf7fefcb2a81d87ea6e60ae0bb3676043e82f90332b658b5da73642413e30af82999337129315252ed1d59bcae493d548
 MISC metadata.xml 1897 BLAKE2B 11935d4ca429c123e759fbe7e32ab94a8f8783fdba95d0c65bbd2780f8f86110007c897f0530407647e5aed1603bf962a171234298676779b1e32042aa4c8258 SHA512 e5d67ba4b226cf843fb473bc08727c4431382a8fede6c43f4699b702bff0dd6747306a3abf205d2fd00f11bd421493cf2c8967726bfcb5c18314ee6fd35d1417
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
new file mode 100644
index 000000000000..dee4306a4378
--- /dev/null
+++ b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
@@ -0,0 +1,63 @@
+From 3be21f1964d1446962adc15acf1e5d993708780f Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Tue, 11 Aug 2020 20:25:46 -0400
+Subject: [PATCH] Add install rules for prboom-plus documentation
+
+---
+ prboom2/CMakeLists.txt     |  3 +++
+ prboom2/doc/CMakeLists.txt | 24 ++++++++++++++++++++++++
+ 2 files changed, 27 insertions(+)
+ create mode 100644 prboom2/doc/CMakeLists.txt
+
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index ec1885a5..52d91e19 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -9,6 +9,8 @@ include(TargetArch)
+ include(TestBigEndian)
+ TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
+ 
++include(GNUInstallDirs)
++
+ # Automated dependencies discovery, mostly needed for MSVC
+ target_architecture(TARGET_ARCH)
+ if(${TARGET_ARCH} MATCHES "i386")
+@@ -184,4 +186,5 @@ set(WAD_DATA prboom-plus.wad)
+ set(WAD_DATA_PATH "${PRBOOM_OUTPUT_PATH}/${WAD_DATA}")
+ 
+ add_subdirectory(data)
++add_subdirectory(doc)
+ add_subdirectory(src)
+diff --git a/prboom2/doc/CMakeLists.txt b/prboom2/doc/CMakeLists.txt
+new file mode 100644
+index 00000000..9f9b96c8
+--- /dev/null
++++ b/prboom2/doc/CMakeLists.txt
+@@ -0,0 +1,24 @@
++set(DOC_FILES
++    boom.txt
++    DeePBSPV4specs.txt
++    MBFFAQ.txt
++    MBF.txt
++    prboom-plus-history.html
++    prboom-plus-history.txt
++    prboom-plus-usage.txt
++    README.command-line
++    README.compat
++    README.demos
++    umapinfo.txt
++)
++set(MAN5_FILES
++    prboom-plus.cfg.5
++)
++set(MAN6_FILES
++    prboom-plus.6
++    prboom-plus-game-server.6
++)
++
++install(FILES ${DOC_FILES} TYPE DOC COMPONENT "Documentation")
++install(FILES ${MAN5_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man5" COMPONENT "Manpages")
++install(FILES ${MAN6_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT "Manpages")
+-- 
+2.28.0
+
diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild b/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
index ec37137ed260..5736a368a569 100644
--- a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
+++ b/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
@@ -34,6 +34,7 @@ S="${WORKDIR}/${PN}-master/prboom2"
 
 src_prepare() {
 	eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
+	eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
 	cmake_src_prepare
 }
 
diff --git a/games-fps/redeclipse/Manifest b/games-fps/redeclipse/Manifest
index 8238f6d4a88e..491ed5be018a 100644
--- a/games-fps/redeclipse/Manifest
+++ b/games-fps/redeclipse/Manifest
@@ -1,4 +1,6 @@
 AUX redeclipse 400 BLAKE2B e2f26d4883194948f32a68e1c7ebe0967b41f8cd7678aa282d1647beeefdd44952af9588ece5f7dddd2e4b6ea2ef51faac614eb88f435e382518ca82c01838de SHA512 da4deee6f5ffbc54bfeb501b3a3b4377a0cd04a2dca4284e51113d5073c9f267fb7d1a2b7b59095a200eeff17abff66d60de9b28106259aa0b2ce5b726912768
 DIST redeclipse_1.6.0_nix.tar.bz2 898467399 BLAKE2B 85b4d02ea95cc44d902f6512ec5ce512583353107deb690ec24608d9b96fd4a6b7fd720250413a192cf7229b2f66294ddeb81230e5ace06abdcd4f6f3dc8d92f SHA512 e944aed8155b5e89e8df000516d4a019a63d38d7ad9c3982b2e111f8a20bc848a98e30c1b60f4fdaf006c2ff9e2cb04647c07778eb2562eaf7db733dbce11233
+DIST redeclipse_2.0.0_nix.tar.bz2 948705751 BLAKE2B 00cb03320f80433db1cc5bb9b895cdc829453e64e32d0e481eeac6c5dec9332b2e763f511bee4e9917b334d3f383c2c2a2605dfbd07cc73ffeb3f8efb90278fc SHA512 179a8177ddafefb09de38629c7cc15e8843cd49ad3580093c9f4243dd0d2d2fe095e8df770c2a8f3996d4e273822d6bc955acca73f8191266adb95a34beaf6dd
 EBUILD redeclipse-1.6.0-r2.ebuild 2014 BLAKE2B 57d781179e4f91ca1fa637251978af63deeecab6a09b959bfc001ae32f39fa26bf1aab184d53e9ca87e01de3c8738626602fd4f5c0e0c5f6003d6367af6fc897 SHA512 e460594124b265f6c1db43411488d7b8453127ca7cba35a132065f56c3b21055e8a8f0cc5b9d1e290b53cc41ab2697564b2b63c8e972045cd177b68f844270a6
+EBUILD redeclipse-2.0.0.ebuild 1999 BLAKE2B 67b61cc421d256a06601e630ba53efd2f9f802aec973f18580ec96f987a2a516c6066f770c51ddd31d1a2be5dcb2de4618499f90e52b06471ae0c368e9c7e52b SHA512 e3bc02c9685512894258effa8697cb0a544a0a23e18a2994c3c71f425aa0e754336001021de60754e79332dc9d89741304d111c6bad654b5fd9eff987b6d10be
 MISC metadata.xml 574 BLAKE2B 6a74f40eb547d6ebcc8ca987609c22ebf171cde9286351e2f459f8eb95e8545399dcce6107540c249bdfc0a431f3282a50ae8a1fbe6239cb1b372755dd638c36 SHA512 1f78ab3ec83d4c8887f2f15addf8935f0026a8494340b346ae4c694fd7bf753962830274c572036490d514b2683df8164f9943b6714cff8cebaba896d70d549d
diff --git a/games-fps/redeclipse/redeclipse-2.0.0.ebuild b/games-fps/redeclipse/redeclipse-2.0.0.ebuild
new file mode 100644
index 000000000000..8af7b5e88911
--- /dev/null
+++ b/games-fps/redeclipse/redeclipse-2.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
+HOMEPAGE="https://www.redeclipse.net"
+SRC_URI="https://github.com/${PN}/base/releases/download/v${PV}/${PN}_${PV}_nix.tar.bz2"
+# According to doc/license.txt file
+LICENSE="ZLIB CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated"
+
+DEPEND="!dedicated? (
+		media-libs/freetype:2
+		media-libs/libsdl:0[opengl]
+		media-libs/sdl2-image:0[jpeg,png]
+		media-libs/sdl2-mixer:0[mp3,vorbis]
+		virtual/opengl
+		x11-libs/libX11
+	)
+	>=net-libs/enet-1.3.9
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "s:@APPNAME@:${PN}:" \
+		src/install/nix/redeclipse.desktop.am \
+		> src/install/nix/redeclipse.desktop || die
+
+	if ! use dedicated; then
+		sed -e "s:@LIBEXECDIR@:/usr/libexec:g" \
+			-e "s:@DATADIR@:/usr/share:g" \
+			-e "s:@DOCDIR@:/usr/share/doc/${PF}:" \
+			-e "s:@CAPPNAME@:${PN^^}:g" \
+			-e "s:@APPNAME@:${PN}:g" \
+			doc/man/redeclipse.6.am \
+			> doc/man/redeclipse.6 || die
+	fi
+
+	sed -e "s:@LIBEXECDIR@:/usr/libexec:g" \
+		-e "s:@DATADIR@:/usr/share:g" \
+		-e "s:@DOCDIR@:/usr/share/doc/${PF}:" \
+		-e "s:@CAPPNAME@:${PN^^}:g" \
+		-e "s:@APPNAME@:${PN}:g" \
+		doc/man/redeclipse-server.6.am \
+		> doc/man/redeclipse-server.6 || die
+
+	default
+}
+
+src_compile() {
+	if ! use dedicated; then
+		emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src client server
+	else
+		emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src server
+	fi
+}
+
+src_install() {
+	insinto /usr/share/redeclipse
+	doins -r config data
+
+	dobin src/redeclipse_server_linux
+
+	if ! use dedicated; then
+		dobin src/redeclipse_linux
+		newicon "src/install/nix/${PN}_x128.png" "${PN}.png"
+		domenu "src/install/nix/${PN}.desktop"
+		doman doc/man/redeclipse.6
+	fi
+
+	doman doc/man/redeclipse-server.6
+	dodoc readme.txt doc/examples/servinit.cfg
+
+	dobin "${FILESDIR}/redeclipse"
+	dosym redeclipse /usr/bin/redeclipse_server
+}
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 032a6f57ee44..4bed29e1bcae 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,4 +1,4 @@
 AUX urbanterror-4.3.4_p20180708-fix-build_system.patch 2736 BLAKE2B 1feaa3012915877abfc2b10b3ab602f9047d16ae7c69a234558aac286548eb91d9e49dcdc41cd51e7c0c9d28b1545a66e0b54a1cf996a370515bbba811715853 SHA512 9afd32a706d6c5de39b6fc1a7d3831873e2fbaa3e13ae41046b6e7a1e639c22bcfc7e2e61cff8d0fb87094b4dc31157c7f4d6f9ea7b1b97504bf40a61acb0906
-DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227 SHA512 97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58
-EBUILD urbanterror-4.3.4_p20180708.ebuild 4472 BLAKE2B 43cdee7cb52cf419d35ce8b6718fb8855004dbc0afd9f953e76bf403232dafdffdb281018ac6eab3554a2881905e1fe7adf204c840ae4229fd123b06f74f4859 SHA512 1e0744d75bc10592a850da07b86e6c64b7da54093fe5d2cbd6ee5d2f22b021bcb94833a1dee6c2a01023dafeb24c0097fb9199cf199674947cb2f37aac5ad7a9
+DIST urbanterror-4.3.4_p20200519.tar.gz 6188257 BLAKE2B 931bc1c1f5b29dfc57c104400a5ea35fc2741ec1e2187ddd33e77a55aeb1580ec7dd21aa9670f0c94ee033b869ce2e6be05e9342e87d1a9707b9874f59c5cf06 SHA512 f555586cbef8c0baa70baaa0de4ef380c72c98990940cec2b1050201c6878f7ababfb2ef44c37766519f25990badcb12c89c61aa7a7b123c44cc151ac0ef8d56
+EBUILD urbanterror-4.3.4_p20200519.ebuild 4472 BLAKE2B fe77d9bb3c979251cd764a2750735c3a729fcbd524f7a2efe32be59139d3af692c88fcd358b6ba118e67b947194e133051bee3770da0613087088c87a2d6e423 SHA512 2e8a1757c120fe2c217c532932db5bfc776ae74606cc509b004581c3dc712dcad48e5ea3dba6e43d40c86177e33155e318fc5f0ec7f85d1ea05b1939d780912a
 MISC metadata.xml 1058 BLAKE2B 7e000518ec710f0a6d93d7bdaf28a512e60412bb63bccc7ed9f5d40585eb03ead1515ee26d97068c33dcf41fb45ab15b8296e40ed522fceba1a50958cc488690 SHA512 7bbd3c72cd0fe48c428fd27979289dc8ad68a743cc6e73fdf5c9286007fbfa5d0529e68495af0679c47c6e4b367d3801cec625d07a688ec15269db30d4d51ae2
diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20200519.ebuild
index 2eed0405afcc..902878edb277 100644
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20200519.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
 	EGIT_BRANCH="urt"
 else
-	COMMIT_ID="167cb6b611ad27f30787a2fe204a7c65ec1fa18e"
+	COMMIT_ID="58d8e9942101e0ca28a434b92e1d45d42eb2bd9a"
 	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/ioq3-${COMMIT_ID}"
 	KEYWORDS="~amd64 ~x86"
diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest
index 5021861e3bcb..e1ee5bac0717 100644
--- a/games-fps/xonotic/Manifest
+++ b/games-fps/xonotic/Manifest
@@ -1,3 +1,3 @@
 DIST xonotic-0.8.2.zip 991045679 BLAKE2B 3005473da954492bb7387f9e0e13c2415e638877fa8b83e14872f3b04ed0fc21b82e18f51aa6c68e8bf02d09d4a73f290cbcaebdfa8c0a12ceb6582309baee8a SHA512 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5
-EBUILD xonotic-0.8.2.ebuild 2315 BLAKE2B 5f54f8c0de24a305b9035761dd4cf1aac7f785558c6c5e79d7897ce2a85390372fce5942966e08960d376fa14466769050bf9034465ec1f903f95c36d1809c57 SHA512 ef80a84c48a1fa55373e99519eec4e7da391a0ad54865b7733a9ebb5a047bee85b1e573849ef4dd8e446fc9136506b52bd1e20c229f2535240c453dcc4b4d50f
+EBUILD xonotic-0.8.2.ebuild 2391 BLAKE2B 4efc6189bb1654a8a219050bc61bf2b0f0695425dd0594e9a6ed6b1a40dadedbe1e3556e7f009fa77d6af6b220ef1fc8cd0cdd326068c74613039b1bdf0b3fad SHA512 5eecf5415b7c55967b7fb6f80ed2fa5c0c21fc095788425d0ffb43bc9ac821ddced3df156cc2af1713fd344157b4212384d538dcb621433ee2ff4cae25914610
 MISC metadata.xml 351 BLAKE2B a5005814468014cf93d7f807b7f1c5d9252aecf20584267cdef61547d109727230f14c3f21297e202c4876e0534fac7d5ab86022c3741d582115c04b1bcf18f9 SHA512 14665ca256c368cbf80a08aaff18c005a25a4197eae82b559e934fbe6a3b17ef6f1fbd323621e38af5725f3e61ff750c72bb8fe650fb76eeed818070d411e3f6
diff --git a/games-fps/xonotic/xonotic-0.8.2.ebuild b/games-fps/xonotic/xonotic-0.8.2.ebuild
index 32b2eab5bb41..41f326a13222 100644
--- a/games-fps/xonotic/xonotic-0.8.2.ebuild
+++ b/games-fps/xonotic/xonotic-0.8.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils check-reqs toolchain-funcs
+EAPI=7
+
+inherit desktop check-reqs toolchain-funcs
 
 MY_PN="${PN^}"
 DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
-HOMEPAGE="http://www.xonotic.org/"
-SRC_URI="http://dl.xonotic.org/${P}.zip"
+HOMEPAGE="https://www.xonotic.org/"
+SRC_URI="https://dl.xonotic.org/${P}.zip"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dedicated doc ode sdl"
@@ -42,6 +43,9 @@ RDEPEND="
 	!dedicated? ( ${UIRDEPEND} )"
 DEPEND="${RDEPEND}
 	!dedicated? ( ${UIDEPEND} )"
+BDEPEND="app-arch/unzip"
+
+DOCS="Docs/*.txt"
 
 CHECKREQS_DISK_BUILD="1200M"
 CHECKREQS_DISK_USR="950M"
@@ -60,15 +64,15 @@ src_prepare() {
 	default
 
 	sed -i \
-		-e "/^EXE_/s:darkplaces:${PN}:" \
-		-e "s:-O3:${CFLAGS}:" \
-		-e "/-lm/s:$: ${LDFLAGS}:" \
-		-e '/^STRIP/s/strip/true/' \
+		-e "/^EXE_/s|darkplaces|${PN}|" \
+		-e "s|-O3|${CFLAGS}|" \
+		-e "/-lm/s|$| ${LDFLAGS}|" \
+		-e '/^STRIP/s|strip|true|' \
 		source/darkplaces/makefile.inc || die
 
 	if ! use alsa; then
 		sed -i \
-			-e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
+			-e "/DEFAULT_SNDAPI/s|ALSA|OSS|" \
 			source/darkplaces/makefile || die
 	fi
 }
@@ -102,8 +106,8 @@ src_install() {
 	fi
 	dobin source/darkplaces/${PN}-dedicated
 
-	dodoc Docs/*.txt
-	use doc && dohtml -r Docs
+	use doc && local HTML_DOCS=( Docs/htmlfiles Docs/faq.html )
+	einstalldocs
 
 	insinto "/usr/share/${PN}"
 	doins -r key_0.d0pk server data
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 23030a2e574b..94635a4728f5 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -12,5 +12,5 @@ DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9
 DIST quake2-xatrix-2.07.tar.xz 192404 BLAKE2B 54772f1158af82211a5c925676e1399bd9debfa8f336a566dd7c22c6f50eb488030c871a7952b9eb00a7a8498560aed332dfd388074bb5a733ed5e979d59d9dc SHA512 72400afa98faf38559dfbc6dcfd01a16902adc782065bc1bbae4d773b5c139543d79f465195db72f0dbaf33999c667c65fd3582a8029db5b50ea5295d278b2a7
 DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9
 EBUILD yamagi-quake2-7.42.ebuild 3636 BLAKE2B 50b15d9a17697e8191fd9ead2575162536b9c08f56d098a6e45c41093a9c20804cce9e2f0a09e4a623edb119d675d161c3e4141b07523347592ca4fc3cc6088f SHA512 e9707a7b71e4937d9a717c02005e76e9a10bddad7860983b96df5d3e17ea036196125984f9c2900df71fbc8adf6d8f9779085b9a5c9b77f7810351e7da857443
-EBUILD yamagi-quake2-7.43.ebuild 3550 BLAKE2B bdd1943a6d914525462edfc92d57ba9420c8a356c09036cc267f2eeaf7f1705d1893e8d3f9ab0e62690d30298297ae7667114a900fc1a28e9ee219b241fd19ee SHA512 4db94adbbe9521d39dfe6dc96274786684251c1799f058afcf4d813415a94bf543d92b12bcf3bbdb301b4be67b20a57c80fa52ef6a2bea62b92c1afd8baa3fd3
+EBUILD yamagi-quake2-7.43.ebuild 3557 BLAKE2B c2c91c9acb5f74d6b814d14cf32220f0187936bdf8e3c59faacfbe7a9b827a418faf5f32bc795d346ca53ce9add23242ad1d65b8666597cf9c1afd012cc29716 SHA512 8dc27738707ce59720a9685d926ed92df1995c772264a45c3bc5de2b6057253a992e3b3aa4e01a7baec792662e1f3fd8be7ef702c7c9c719cc7dee380e0b0d7b
 MISC metadata.xml 902 BLAKE2B 5431861cde41e065d91af512cbac3e1f41c8c28dc253d54124eef822a38a021be9e9fd6b000bf6571ae242fc87009ea2a4c5045a568adaa37a99302eb1fe8e7f SHA512 7303da58e949237b5d1c6a6fe83c597c4e5dd955ce07368876ee03114cb124cedc44c8d4c51bb4e530c3194ed7041c694167a4495a698fb3b8a6beaf4b8b6f77
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
index e9db574e8b51..335ae177e9f9 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/quake2-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
 REQUIRED_USE="
 	|| ( client dedicated )