gentoo resync : 25.08.2020

3 files changed, 4 insertions, 25 deletions

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;