gentoo resync : 21.06.2020

13 files changed, 78 insertions, 45 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 1aea1173ef50..e546fea44b1c 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/darwinia-demo/Manifest b/games-strategy/darwinia-demo/Manifest
index e6395578ea53..de976462695a 100644
--- a/games-strategy/darwinia-demo/Manifest
+++ b/games-strategy/darwinia-demo/Manifest
@@ -1,3 +1,3 @@
 DIST darwinia-demo2-1.3.0.sh 22470072 BLAKE2B 3169e6de1293eb8e62094e1773dbb871882a5f18d993dd495c27455525c178d02ce21a47425e070da01153eb8d0cdb764f6276da8919d6b0492718701ddf8fb9 SHA512 f561f3e741052888d8a23445f01e0c2a8d2b207b7786b25f297d76d0f4b4ef91bbf7d1ec842e5e2b1051f3f122af12058e2bcb2495478846713e49c2c7d7d92d
-EBUILD darwinia-demo-1.3.0-r1.ebuild 1057 BLAKE2B 16bf217d11584d7e2f4618ee509cfd29df34f1cfd6446ad3401a6d2fbea57f068828db923c1b6154555a78072c983e6782a92a395fc2c2ffcc10bbd37cb443bb SHA512 833d5f145cb9d3c9c93748b2f774d5efadb677ad43d4f21571d053a1e9e37982747f75cf5f61ba443572f280eccaafc88dd97bf09177bf1d08da0fefc8f60b95
+EBUILD darwinia-demo-1.3.0-r2.ebuild 1058 BLAKE2B 8927281b183d6ff4900f3cf8cd19ba00ab9388e51f0022c717d97f08d08e6570593ec0eb33f62f3ebc5034652dcbaabc63937d0bb7c58fe9e75898fa1142bb11 SHA512 1b24b60fb49116f88bca65ff6051bfdbf1514316bbe44faf4124fbe68d992462588c2d875f0b84d49fbb39c4ef085bd89dce64855ace97376d8b20041eabd5af
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r2.ebuild
index 7cda5fd981a6..fbd30a5970a4 100644
--- a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild
+++ b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r2.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=6
@@ -18,7 +18,7 @@ RDEPEND="
 	media-libs/libsdl[abi_x86_32(-)]
 	media-libs/libvorbis[abi_x86_32(-)]
 	virtual/glu[abi_x86_32(-)]
-	~virtual/libstdc++-3.3
+	sys-libs/libstdc++-v3:5
 	virtual/opengl[abi_x86_32(-)]"
 
 S=${WORKDIR}
diff --git a/games-strategy/darwinia/Manifest b/games-strategy/darwinia/Manifest
index 71402ead9471..9f08f65a7085 100644
--- a/games-strategy/darwinia/Manifest
+++ b/games-strategy/darwinia/Manifest
@@ -1,3 +1,3 @@
 DIST darwinia-full-1.4.0b9.sh 4228121 BLAKE2B f1cae61e3ad6802a1e04fc5306bfbb7194ad08df29a82a376dc7f1945ab8f1f99620653800bb2458941f2004488abf441c211bc3f6d7c65e4d3f47cb9155e5f6 SHA512 ed228943d4e70fc5799bbe7566b4fd862f2494f9d02bcd874f0d1b93d7bbc9a2c24a98fb5b8219fed20759bfe2af54d6ea33c60ddd8d8850e591a89822b41bb5
-EBUILD darwinia-1.4.0_beta9.ebuild 1471 BLAKE2B 794040745ef117b8542765b0fc8c7eef6d0512749056b93f80f7e6d79934efff248ccad4d8cb61457e4115745e5b3df2be0d1eae29e76a7d305dcdf84be37ce2 SHA512 b281ea36a07bf74b10f004c32733573d9673fea2f8ebd5edd15fdf08e550fa129c728f87e639a8d5a5b7029ac8ef015fc1888628b4e78a43e33d6bb0b8349403
+EBUILD darwinia-1.4.0_beta9-r1.ebuild 1472 BLAKE2B 6c7c37ee5fb93272893daf7805668de3452ff76106b902f6e5977c08545029242d5281cccea912cfb43faa75e08eaad70501a8394beb406c140907dcfa088a4c SHA512 5de21a6d608cfcd2a1b8196abeb60563518162c33476320072799726eab614272943f1fd73a68cf289f761c1194f9ff72edec621c6cf76c92e305fc12afaa2ac
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9-r1.ebuild
index ec9f3bc57fed..d1f5e9d5f83a 100644
--- a/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
+++ b/games-strategy/darwinia/darwinia-1.4.0_beta9-r1.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=5
@@ -17,7 +17,7 @@ IUSE=""
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
-	~virtual/libstdc++-3.3
+	sys-libs/libstdc++-v3:5
 	media-libs/libsdl[abi_x86_32(-)]
 	media-libs/libvorbis[abi_x86_32(-)]
 	virtual/glu[abi_x86_32(-)]
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 6a6adcf9a154..552bfe694959 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,6 @@
+AUX freeciv-2.6.2-qt515.patch 1069 BLAKE2B 36d66375826386961ef393385f987b146d812c2e9ee31db7545cc7eb79d48ad4ebabc26bcbc606db31c763b5583c359e0b26da1968ba1aa26ead03310d4699ba SHA512 6a35304cb1ef35ebce91cf80f46c1f602e782dba9da4c7a65bcc88ab0dcf1e4e9b59b0df7a90fc562b9448d0b073a25998cb4d4896b3c6853d052d162da95122
 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
 EBUILD freeciv-2.5.12.ebuild 4536 BLAKE2B 2673bcafd06b9c720d3aa62c57f281028ee5b796fa63535bf1ccfd90acaac744fd74c3cd14ce470f8b18f9920a09a7d33b54eb194a41e90af611d7ff3ba39712 SHA512 a6fdaa207990d2fd5521d627a54d24fd2fa62fbe42578e8176f35c598fb2a4149b8ab728f6ac516a63ce3b4923912a54096c87c65f5035a6b1e221e579a8e600
-EBUILD freeciv-2.6.2.ebuild 4743 BLAKE2B a2c22a679a1f38f4cb4014be58c91498e03d13d18caf3a3b00d8ff6cd6f82dbb735cd90c52ad8fa9e7931cef724e58b96b14230337d4f6199e3f59b4aa3dc121 SHA512 10f48189feb3bb70e78e1962f5106a3f63b157526f29a31c0980c9d0f07569179a05a2904dbdc08d085abe64edae1c08fb8b5742b2f427de41351b426be76fae
+EBUILD freeciv-2.6.2.ebuild 4796 BLAKE2B 17e1a8e02ec8605652c624a70c35f3aec2091cbb6d22021527797ec68f6d963178e39eada22e654ef27a943cb53b83abd90fc67bd0f01612dc52119c8a37f76a SHA512 466fe54dcee64f844b234b3cb22fd59d09037b855c285fb84e5c06c1c84ef14f787da4ec2020bd3e2fafb245b0884270a75a3e61d579b3d609a65d4bb5e54733
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
new file mode 100644
index 000000000000..db5e657a5850
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
@@ -0,0 +1,39 @@
+From 87f4abf81d530b825d0af772d95fd1ea78503e64 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Tue, 7 Apr 2020 13:22:14 +0300
+Subject: [PATCH] Include <QPainterPath> where needed
+
+This fixes Qt-client build on OpenEmbedded
+
+See hrm Bug #868060
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+---
+ client/gui-qt/canvas.cpp  | 1 +
+ client/gui-qt/dialogs.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp
+index 24291bc183..00fa1b8f52 100644
+--- a/client/gui-qt/canvas.cpp
++++ b/client/gui-qt/canvas.cpp
+@@ -18,6 +18,7 @@
+ // Qt
+ #include <QFontMetrics>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ // qt-client
+ #include "canvas.h"
+diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp
+index e0f9de31d4..4b3254c496 100644
+--- a/client/gui-qt/dialogs.cpp
++++ b/client/gui-qt/dialogs.cpp
+@@ -24,6 +24,7 @@
+ #include <QMessageBox>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QRadioButton>
+ #include <QRect>
+ #include <QSignalMapper>
diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild b/games-strategy/freeciv/freeciv-2.6.2.ebuild
index e81667668342..2b5d791692c3 100644
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.2.ebuild
@@ -70,6 +70,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-qt515.patch" #728254
+)
+
 pkg_setup() {
 	if use !dedicated && use !server ; then
 		ewarn "Disabling server USE flag will make it impossible"
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 039ff9e2424f..25c3a867cf4f 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,4 +1,3 @@
-AUX freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch 1030 BLAKE2B d0b4a58e85fd878fc5d332ca0f552889aff752fd8198f66d217cc54aad1ddb83cf24108d978bd0155b13a6db9d7f11f35f2b76f76456acd9ab38b1e28dbc5332 SHA512 ffd493373ccb0051aa2b41d0bd740865fa13db3ed50fbf95e83c6d97fe81e3ff04c24e865d73b011dbd0085c45a0b1a915c62eaa103ecf29a3264030d1d9ae4e
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.9_p20200409.tar.gz 124663848 BLAKE2B 7468a386829498c9ca971e686bda216002b6f263fbc0f3784e7898854ad91278441579c1a3e0d1ef2d92b46747d14a17463e46d7ba16f06633e9a5d474ce3b9c SHA512 09fe8db818c3f22bac94577461d9ada082a2c8365cb524948bf13650ea368fcc55043f4df2f9701075011c890a08197e7f7bb13d8884cb41cc8e1346b8538345
 EBUILD freeorion-0.4.9_p20200409-r1.ebuild 1663 BLAKE2B fb14a6e5665df5714126609d25c91d4caf34e5f6b602472b72a070c58f548a4d64c1876b7e9060edce0df5f2fcd7c4fdd2a0b915a6830e9de628f0a5e45b4091 SHA512 c8db259b18db09ae42b4fe2f2b2f2eb6ed08a219563d8a2fa03c5516c4762f16ea6b9e9c8805ca7df7c9767642e759adc484785db6a18cd01c1f5a1069f6fc7b
diff --git a/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
deleted file mode 100644
index f7ccdba126bb..000000000000
--- a/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 77bdc407d0760a529e40914d16248dce01fd4778 Mon Sep 17 00:00:00 2001
-From: O01eg <o01eg@yandex.ru>
-Date: Wed, 8 Nov 2017 16:07:57 +0300
-Subject: [PATCH] Fix #1843
-
----
- CMakeLists.txt    | 2 +-
- GG/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/CMakeLists.txt	2018-06-03 11:36:04.631832409 -0400
-+++ b/CMakeLists.txt	2018-06-03 11:36:20.678821846 -0400
-@@ -484,7 +484,7 @@
-         ${Boost_INCLUDE_DIRS}
-         ${OPENGL_INCLUDE_DIR}
-         ${GLEW_INCLUDE_DIRS}
--        ${SDL_INCLUDE_DIRS}
-+        ${SDL_INCLUDE_DIR}
-         ${OPENAL_INCLUDE_DIR}
-         ${OGG_INCLUDE_DIRS}
-         ${VORBIS_INCLUDE_DIRS}
-diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt
-index 5d3c157362..c5bf3825d8 100644
---- a/GG/CMakeLists.txt
-+++ b/GG/CMakeLists.txt
-@@ -184,7 +184,7 @@ target_include_directories(GiGiSDL SYSTEM
-         ${Boost_INCLUDE_DIRS}
-         ${OPENGL_INCLUDE_DIR}
-         ${GLEW_INCLUDE_DIRS}
--        ${SDL_INCLUDE_DIRS}
-+        ${SDL_INCLUDE_DIR}
- )
- 
- target_link_libraries(GiGiSDL
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index f84ea958236b..3421201ac921 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,6 +1,7 @@
+AUX widelands-0.20-boost-1.73.patch 854 BLAKE2B 2132909f12c366c3ddb21661a96d7131574f0cd6e05a1079d8499cd0239737d7b003b342519facd4e0b6d0d3bd88f5b9b39da547e9fe6522df35203bb95db016 SHA512 1df70918c8d7e010dc5e7d2cc2b0bc67ec8cf9117bac40c6f7d870c6c09dea9dc8447683065b2b45a523695316acd9b8719bab9aaeb58cd5171771efdee95a71
 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 1629 BLAKE2B bc2af07b2049223958b2f7618b82a8e6b97a06c64a0c5b8d6c998f2a5a3f1141b2be099815af57d0098301fe3f80e08a560de6311904838aec421892283008ea SHA512 16ec6134cc8de211ccde0e20c7ad9c05ece5612c9c04e73852c758991cd7aa1fa9ee61c14794bf36bea8acb9d9ea7ee7a867eb68cf4e0366741449527ae3de2b
+EBUILD widelands-0.20-r1.ebuild 1672 BLAKE2B 2074826806e80b8c7de048d6919bf4e663e3e0c46c74bc62952cf60c88f698e5d0e6b1249492de66c35c29b0cfa71d9109a04c790301aab0abba259c8155caaa SHA512 58223c2563b901a0c134d4f149ae1224c9c9a6b83ed0477bfa73a19fc69250571b294a23864df98b7e75827b4c7841dcf8e6310646a418d51913bca62520e2cc
 EBUILD widelands-9999.ebuild 2148 BLAKE2B e9be419865610425b050b75ef2007bcfa2bbee1726b63abf2ef375950080646249e7db9e4b9c60dd0309a84ca83efd3a91f0b04618312689596a6f7681f05e29 SHA512 f85d3a81e91b94e60db0a8a6ccdb59cdd43b599a6bb8b0469089c5404f37bc15e960913c9456a60cb39f9fae7ae022d5484b3d5971c398e5559b0da16f740ef7
 MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch b/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch
new file mode 100644
index 000000000000..99a8c51190b2
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch
@@ -0,0 +1,22 @@
+--- a/src/editor/ui_menus/categorized_item_selection_menu.h
++++ b/src/editor/ui_menus/categorized_item_selection_menu.h
+@@ -124,7 +124,7 @@
+ 
+ 			UI::Checkbox* cb = create_checkbox(horizontal, descriptions_.get(i));
+ 			cb->set_state(tool_->is_enabled(i));
+-			cb->changedto.connect(boost::bind(&CategorizedItemSelectionMenu::selected, this, i, _1));
++			cb->changedto.connect(boost::bind(&CategorizedItemSelectionMenu::selected, this, i, boost::placeholders::_1));
+ 			checkboxes_[i] = cb;
+ 			horizontal->add(cb);
+ 			horizontal->add_space(kSpacing);
+--- a/src/ui_basic/box.cc
++++ b/src/ui_basic/box.cc
+@@ -104,7 +104,7 @@
+ 	int maxbreadth = mindesiredbreadth_;
+ 
+ 	for (uint32_t idx = 0; idx < items_.size(); ++idx) {
+-		int depth, breadth = 0;
++		int depth = 0, breadth = 0;
+ 		get_item_desired_size(idx, &depth, &breadth);
+ 
+ 		totaldepth += depth;
diff --git a/games-strategy/widelands/widelands-0.20-r1.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
index 14a80be7f6ce..c0629174bc75 100644
--- a/games-strategy/widelands/widelands-0.20-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -43,8 +43,9 @@ CMAKE_BUILD_TYPE="Release"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
-	"${FILESDIR}/${PN}-0.20-glvnd.patch"
+	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
+	"${FILESDIR}"/${PN}-0.20-glvnd.patch
+	"${FILESDIR}"/${PN}-0.20-boost-1.73.patch
 )
 
 src_prepare() {