gentoo resync : 28.04.2019

3 files changed, 23 insertions, 2 deletions

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index d0e25809f0ce..8fdec2507e98 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,3 +1,4 @@
+AUX eduke32-20190419.7615-wad2map-buildfix.patch 539 BLAKE2B 92fe0ec1c1d126eee7f48b4c403194e8b375f28dc9581cb20b393ea4e7464938aacea760075e6c845d45edcf98df476bb3254026d3304f3c52a98f32cf7f7b00 SHA512 983f847af630456ae61dfa65a6fcd890a04e2b14722efd11bc25a3f9e3ac33b9bd5559b6a1e3927471a45196c417a1e17c0b2dd7f177c44b7aa81aa7e224fa92
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
 AUX log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
 AUX search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
@@ -8,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_20190304-7392.tar.xz 14730992 BLAKE2B f10702e820e72d03a6f909e3f908cc705877908fc5455aa2060deaed3ff485e26b8fef56fde89e30d066af4663e8eb7ccfa42e71c99a15d99326199c24edd04a SHA512 e63d31e406f2a62559ad6c88c3c54d64397319bf701e6fba0df31574ff124d8378239fc849d10af91544fcdcb437ab853b83222d0f753017fa8e94d4620d7dbf
-EBUILD eduke32-20190304.7392.ebuild 5914 BLAKE2B 0fc6329d7677e0dd658ecb70e4b373f298c39326c179eb05a5d9cde3fc88b96297c1603bcbb32268e15614e28960930f0decc0831f9fcf55e70c686a1b721779 SHA512 1b1e918f7dcffbfae470f1eed6e7e404ee6cedb18004d183099b3d60282900d4d6ddce29edaaacaa1cf467e0ae062620977b392bc03eb3a442f355cf4493a938
+DIST eduke32_src_20190419-7615.tar.xz 14740500 BLAKE2B 462a93789c0c096f85f889769ca3bf642c33cd997e1b2cfb821060aa2dbd0040b0dbd910d33da09e2be8b6610d62fbb06fed2dd62aeaa619fa23c17b6a538feb SHA512 ca496c0f6478cb246e0746de1ecf171e46762d65fdb6906c8174f610b8f52362d84c48e0f4095fe00a41e4c73cbb7298ec3446d4bc0be68ed0f9a52a768183fe
+EBUILD eduke32-20190419.7615.ebuild 5957 BLAKE2B 49af6fbf6756aec89f74bf6f9440ffaf1a8971e3fcaee05c3bcf6491401fd2a1f7000ac286d3bab3ccf13015b28d158bc6802ce3b2aeb0d3d33e3f4e8d843c32 SHA512 175743bbd23da4afb7558ded6d8c3db78a3867cd34484c5db45396b8669af3ffb934f3770a63d3a27971954094c5b435436cc1bd00df4a0141a3202beea96ac8
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20190304.7392.ebuild b/games-fps/eduke32/eduke32-20190419.7615.ebuild
index b4a97498c3e4..d70f5ef8c30e 100644
--- a/games-fps/eduke32/eduke32-20190304.7392.ebuild
+++ b/games-fps/eduke32/eduke32-20190419.7615.ebuild
@@ -78,6 +78,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/${P}-wad2map-buildfix.patch"
 	"${FILESDIR}/log-to-tmpdir.patch"
 	"${FILESDIR}/search-duke3d-path.patch"
 )
diff --git a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
new file mode 100644
index 000000000000..611f7a9d1ee0
--- /dev/null
+++ b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
@@ -0,0 +1,19 @@
+--- 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;