gentoo resync : 30.05.2020

3 files changed, 16 insertions, 1 deletions

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 7c333f13facd..ce274b05c93e 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,6 +1,7 @@
 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
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
 DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2
@@ -10,5 +11,5 @@ DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997
 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 5878 BLAKE2B a1283a8344fe05b764b6ddc8ee98f1d0c63c06b5fdbcbcd5abe7000aebea2686a93d795b08e5847776547a8423367cbe10861b17220f2b6a6b12745b2894297d SHA512 ffb1be12c84b4c72027e91fad3282f43a05bad5060f04345189a2534db5b670d5866bdfe925bb080a619f31c63de28ed6c4c7e01939d7be21b677de781a7e872
+EBUILD eduke32-20200505.8904.ebuild 5925 BLAKE2B 6fd315457369a5c49d901a2dbe09538206527e62a5e50f88bbc4884f0a87a897658c3d25ef28f976df69078ef314f65701509d44f98fba84d4877ad53497cc2a SHA512 e13d53f4a0ed76f9e2dda25016f76be46cdcb9b6c051c007e4ad623c6ca603c65acc5caad43d1e8d510a874c9f1c71411f0f898d8f0688d6b4e47912f11b2816
 MISC metadata.xml 1608 BLAKE2B 73414a3516a4a690254e70ad071f160688ac11e8fe0634b0218565fc32e01d1e4b8ed0ce830ecd995e715552f23fd50f8c7cb0b0af95f6cdb07a35940639e779 SHA512 2392e18cc53663943341397d3a92f07b3dbbb04497b584739095bef5e9b2f60376115a2952e0d2eba524b3a678e7c205ad3e66a78709a2f4d36b3ea76d8b8c09
diff --git a/games-fps/eduke32/eduke32-20200505.8904.ebuild b/games-fps/eduke32/eduke32-20200505.8904.ebuild
index c0662991c699..c493f5f8a351 100644
--- a/games-fps/eduke32/eduke32-20200505.8904.ebuild
+++ b/games-fps/eduke32/eduke32-20200505.8904.ebuild
@@ -88,6 +88,7 @@ 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"
 )
 
 src_unpack() {
diff --git a/games-fps/eduke32/files/eduke32-20200505.8904-gcc10.patch b/games-fps/eduke32/files/eduke32-20200505.8904-gcc10.patch
new file mode 100644
index 000000000000..2795e999c8ee
--- /dev/null
+++ b/games-fps/eduke32/files/eduke32-20200505.8904-gcc10.patch
@@ -0,0 +1,13 @@
+This patch fixes compilation with GCC-10.
+
+diff -dru a/source/audiolib/include/music.h b/source/audiolib/include/music.h
+--- a/source/audiolib/include/music.h
++++ b/source/audiolib/include/music.h
+@@ -38,6 +38,7 @@
+ 
+ #ifdef __linux__
+ #include <vector>
++#include <string>
+ 
+ typedef struct
+ {