gentoo resync : 30.05.2020

11 files changed, 40 insertions, 11 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index b7d1fc5abd15..549b770a4529 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 8587ed056b4b..8c72d47d9e59 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,4 +1,5 @@
+AUX colobot-0.1.12-includes.patch 690 BLAKE2B ab99d982dc57d4dddadae54faf6170268bab72ca4011b79fdc12e6197eec74209080a48f49e22d77c6b532d1e32e44d9cd2b62b225e02e78ac12586c23553eef SHA512 cb0c3eab9c5afab5e2ac8d3d10fc19fcb478a8dfa17d5231e33bbd4d322b375e028825daf739fa0cbeb9de95e04c2d4627a6d9e3f2740c54968903a497f11700
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
-EBUILD colobot-0.1.12.ebuild 1478 BLAKE2B a66d5c4aa584706868cfa8f76a368f6c614f48767a086946eafad83a44ae44d3c24a70650f4aa88971998495b70ff1122d02fded40193eda6f8fe07fb7de4080 SHA512 fcb8e33bccbf67cb835732630f1b84009202cce3a02dd7a497050f8fd91c3cb4ae54f62e3b24c62e1aa2687a4067aeced47cea1c7f5fe15a7707c451478bda83
+EBUILD colobot-0.1.12.ebuild 1574 BLAKE2B e75725e8752fe5daf1be82f6075dfc7c892a827eab53f5efed756572896635346303b856b644ee2767928f7b483e16d30917746ba146ce101330777e6c6982d0 SHA512 b4291c83da1895b78f13a3a6bedacb4a990337db6c1b489abb11436ab4ae64f331836fc41307ed303573b8dfef4fead127d71dda6694d76a0bd60ee6ddab81fd
 EBUILD colobot-9999.ebuild 1422 BLAKE2B 3c0d22a6df76aa3303567bff0b42c0e52aa765b0ec7e1dc6822125a949fcf94b89bc5957778e3aa2553a36c316105d96edcd9351629bb809b2a6187967ef1391 SHA512 791b6935cedfd32412d2fabf75cc388d7cc21bdd17262b713efbce5c1627e72fa78e152d305cc4b7aa59cdbed5b94f124b4a0e6cc7df6aa9081f3c2c9fa645de
 MISC metadata.xml 418 BLAKE2B b30194895d7f35dc6b2bf5ed2d6153ab03832eff44536e837058b4c5641760c55ea846a3ffe91027d8892ab7ccd4a36be688b89a5909c57ca57a18f8a610f022 SHA512 6ffc5220d200c722b0e7da2ee8734282ea0fabd7d319f8a21cd88da6743312c869f44bd3b14af7031ce970feb9b6c4349236db2a7aee69ea8041e3b000812e3c
diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 1611ef4a1d61..7f53954e4017 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,11 @@ DEPEND="
 RDEPEND="${DEPEND}
 	games-strategy/colobot-data"
 
+PATCHES=(
+	# https://github.com/colobot/colobot/pull/1300
+	"${FILESDIR}"/${P}-includes.patch
+)
+
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/games-strategy/colobot/files/colobot-0.1.12-includes.patch b/games-strategy/colobot/files/colobot-0.1.12-includes.patch
new file mode 100644
index 000000000000..1fb3a2730c44
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.1.12-includes.patch
@@ -0,0 +1,23 @@
+From 2cfab017938e1cf44f633647eec2ccc2ed1da38b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 14 May 2020 10:35:01 +0200
+Subject: [PATCH] Fix missing <limits> include
+
+Add missing <limits> include for std::numeric_limits.  This fixes
+build failure after boost stopped implicitly including it for us.
+---
+ src/script/script.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/script/script.h b/src/script/script.h
+index bc64dc232..dd4e02ff4 100644
+--- a/src/script/script.h
++++ b/src/script/script.h
+@@ -27,6 +27,7 @@
+ #include "CBot/CBot.h"
+ 
+ #include <memory>
++#include <limits>
+ #include <string>
+ #include <boost/optional.hpp>
+ 
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
index fb21a2c32ed9..604588d38dcb 100644
--- a/games-strategy/majesty-demo/Manifest
+++ b/games-strategy/majesty-demo/Manifest
@@ -1,3 +1,3 @@
 DIST majesty_demo.run 36582366 BLAKE2B f972f5d98eb0a907d7b34dd09c8a1eabb67ded08287e147f08125a6b6e833e4e7c18f8374873b532f765a6c121a6885a46f06645eddb4245db93e801f5a67328 SHA512 0573b29fa2635aeb0aa6ebaaa55c924322b3805e120f49fde51409cc6f101d7ae41d72ed0d086ffeac4d591ba75ee8bc190c46a3b71adb6b36d867df16be2c79
-EBUILD majesty-demo-1.0.0-r1.ebuild 1029 BLAKE2B 129421df38286b45c02fdafbbc4dac32b8f23ce76ee1c7c8a57fbe9383687f15341c2187ee9ec95259b4b550ac3f97ade3ea10a663af2509c89e65221d87b378 SHA512 e6c950304ea53be9627c53fbfbe37bfe57d4a3338375ee675cf5c4a5bc53cb9cd1c5f378f121ba102ba2d98d35370f0e50cf76c1ac9e7378ac880bb1be27d8c2
+EBUILD majesty-demo-1.0.0-r1.ebuild 1027 BLAKE2B e4f175d0ea4fb620e5d5dc20912d0c343cd001c34f8ccea6d8f00ac6004248002ee8c3f3cea4eeb801637fb98d7b961838c57a265ecd6bc3a4982a4afe601f13 SHA512 e0c92d128cd1a9ba809cc4bfc1e871177a0005eb0e440711b2dc075b921adfea0aa93504a46d53e764a22429c2b80bbd198fdad820596372ce2e085b690875b2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
index 7a9bb85b31a9..6f11eefbab83 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils unpacker
 
 DESCRIPTION="Control your own kingdom in this simulation"
-HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=8&"
+HOMEPAGE="https://www.linuxgamepublishing.com/info.php?id=8&"
 SRC_URI="http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run"
 
 LICENSE="MAJESTY-DEMO"
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 7a30d8819ab5..ca5a36d394ea 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -19,5 +19,5 @@ DIST s25rttr-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz 198454 BLAK
 DIST s25rttr-s25maps-11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz 8014338 BLAKE2B 793bbcf0f068c41585376990b9fe13137010f43fe3e91d82beda8c7fd8939f987d778a74de6695e4ebe86893234e419382e1e48d1737a144116de9cc63a212aa SHA512 099fd10ceabaf5284fdb686f1d281d8c3eb07351215bff9785323370b1c40101a9350c81f06f6c6592e63e5e680566777aa52559d8fe6087501c1eaafec43d8f
 DIST s25rttr-turtle-5f8421b1d270665347280d4cab1caf159d6858de.tar.gz 98238 BLAKE2B 854f765aee17328e818b806b69b529376f6f5a89a55b9d84dd7f41adc57314cbbd1844f3125ea750e7ac9ebcfeaa4c08d7c95fc8802bb4cc657ddd738a2370e8 SHA512 0b74b37ef28b1a2acf433491749d498e4de43567bc526faddb677953b5aa5e7ca74fab659d81a2cf4a29e440463150e7b5ac15d0e87f2ecad47523c44f629d25
 EBUILD s25rttr-0.8.1-r3.ebuild 2392 BLAKE2B 304edfe688991e36627395906f7002697107c34e3ff411db81bd03cac46246478d36b26ddd56ca216a9f8603dea6898f99a531a73a61a2a763c6e0b726a36c03 SHA512 3743f18cb7bdbe44a577e5decc660ff1a54fc7f26ca6c1958965eacd2222588ce8f91b60432121afa29f526aa2d3b7d6101e49ccd9f85ffc02a34012d7b73ccf
-EBUILD s25rttr-0.9.0_pre20200418.ebuild 4572 BLAKE2B 6d7a9a199d49611d60fec2f6af4876fc8de0b552a0cdbecf1e938a816b55a097641f0469a438e020bbb37eac2b36f9733e2e1dec027c0d866d47d68e520093a3 SHA512 98c71cadc9210a31c999159e3fe6bef0c3c1c4864f658266472deb0916b47ea6a9921f7ebaeb61e5e1ed8f7f4afb19f0331c76f6288216b01507a25bc90a61d7
+EBUILD s25rttr-0.9.0_pre20200418.ebuild 4585 BLAKE2B 824a9e816d8cdba3e2fb7b236595538070d2e5558e18579dd03396a6e95f6c120654d9677878ab9be4458d3638f6eaf65573c240627ebe4d708a7c648cdc4967 SHA512 ed7d97d228ff86daaa25eb10fa08bee38cef15d16e3a0e4a7227273beb7f1b0fbab67202caaab7534b6f6cd4a5427020c2d0835675972a1524b4a7700dd9a92e
 MISC metadata.xml 347 BLAKE2B ca0f64b6265a6a9297cd7fb42b007f8d822298f52630bcc6b25bbcdf3854514ea865d3f8407f0754b66a720028b5059962af993c889707fdda4419d445e8d4f1 SHA512 d2602cf6ae2637800c4b1d6448cf557998311ee0e24ac621c221d99fd21ae3bbd4a08963d8185d2afa6c1a63c2cf94f95bd893b7fbe01e9c777266850747ee62
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
index fb3053465056..01daa6e3ffc6 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop toolchain-funcs xdg cmake
+inherit desktop flag-o-matic toolchain-funcs xdg cmake
 
 DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)"
 HOMEPAGE="https://www.siedler25.org/"
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 86c00d70204d..f84ea958236b 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,6 +1,6 @@
 AUX widelands-0.20-glvnd.patch 780 BLAKE2B ec09d7624e9432e9adf339efc2ce0b094d7007834e34ed6be8620fa7e9ed91bd6c4963ea452e2e769abdd521d7f679c012a2f5c5ceee9ef9f7643af6b116ac5e SHA512 9c05d8744eeacc13ec84ffda49e055fe29420a4104e7628da3a0d1c0f4e4cc4740531879c7bd88b41cb5e7ef5827c132a33c795eefedd9a4718afc738b452f05
 AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3db2fc979ebfec370e3968da4f466873c92b523671b6e7193ae7bb1dc948b713901421586266e1837f34a19d50279f02224d9 SHA512 da3f5b9e5680c84d48740c202fd937aeb76465647b1a24e4eee5a6d3df44b2f4abda819606ff7294ee1d8fe27ceb3281e4a00ca7f03d944af933bcac0e490059
 DIST widelands-build20.tar.bz2 232364340 BLAKE2B 1d8e2cd28d2ac3e2425c91a9872a3f158d7063a2c6c669d95df347561ef35dfca479fd81252d61008a3282c99a2ce70c4d904622272dd86477a731fc711306b1 SHA512 25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5
-EBUILD widelands-0.20-r1.ebuild 1628 BLAKE2B acf5bc94c7b8134dc27df70ff0c21e2e3dd8ee2b3a112a00b61e84ff96c20ea11b7444a9b1a1b451c059e5d22b243b4ee355f788b9a9ce541c45cb8114a3542c SHA512 47a5d7362e30b7d2af157d0c95df4e084c80f17713232f5f678561b0d3d845fc90c36a7f631c9491967d0625e2150a1e8a118990b407b37112cb82b6ce1eb983
-EBUILD widelands-9999.ebuild 2147 BLAKE2B cbb3bebf0d529ff2c4e1abb9e880ca25f35f627651fda3c2e2ade59da3056affa43a844784f9d9fca53bfbc3938836bbdcbdfb1e17f7be6de4d655f3ba947c1d SHA512 2916a379a5feeeb1cf98c527f0fe514501c461c6777a086fd8710bf263915af08f5c8d266f0ece0b82fc2126571fcef210253e1f56dc98a54905b86a530a0a5b
+EBUILD widelands-0.20-r1.ebuild 1629 BLAKE2B bc2af07b2049223958b2f7618b82a8e6b97a06c64a0c5b8d6c998f2a5a3f1141b2be099815af57d0098301fe3f80e08a560de6311904838aec421892283008ea SHA512 16ec6134cc8de211ccde0e20c7ad9c05ece5612c9c04e73852c758991cd7aa1fa9ee61c14794bf36bea8acb9d9ea7ee7a867eb68cf4e0366741449527ae3de2b
+EBUILD widelands-9999.ebuild 2148 BLAKE2B e9be419865610425b050b75ef2007bcfa2bbee1726b63abf2ef375950080646249e7db9e4b9c60dd0309a84ca83efd3a91f0b04618312689596a6f7681f05e29 SHA512 f85d3a81e91b94e60db0a8a6ccdb59cdd43b599a6bb8b0469089c5404f37bc15e960913c9456a60cb39f9fae7ae022d5484b3d5971c398e5559b0da16f740ef7
 MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/widelands-0.20-r1.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
index 335598744fef..14a80be7f6ce 100644
--- a/games-strategy/widelands/widelands-0.20-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -11,7 +11,7 @@ MY_PV="build$(ver_cut 2-)"
 MY_P="${PN}-${MY_PV/_/-}"
 
 DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
+HOMEPAGE="https://www.widelands.org/"
 SRC_URI="https://launchpad.net/widelands/build$(ver_cut 2)/${MY_PV/_/-}/+download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 2c2694479039..157430929194 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -11,7 +11,7 @@ MY_PV="build$(ver_cut 2-)"
 MY_P="${PN}-${MY_PV/_/-}"
 
 DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
+HOMEPAGE="https://www.widelands.org/"
 
 if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3