gentoo resync : 21.08.2021

14 files changed, 158 insertions, 16 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index e37bb2b2e921..30e3c805d8ce 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 5c9a1a38671e..e9e582c03a53 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,5 +1,6 @@
 AUX colobot-0.1.12-includes.patch 1283 BLAKE2B 0f1e402e770d57365d53488b86838f401815e0749065bf2581d228a566873b31d021a1486ce7cf4a051407b96c540c954ce56ef9efc168522f0ea94ec1606fcd SHA512 26c1bbbd9605482a5a6ffef4b3a919518224e3802bcf0d7248bba94227039bf69a5d6a41bcacdb1ec170e58e719f1cde722f869c4ec26cf20ecd7d1eae091cd0
+AUX colobot-0.1.12-sndfile-link.patch 2114 BLAKE2B 11aebe223c809301fd7851ed20ab0867f47ca6d41d198951a81dc4d23a80d203a6955bc4df06dd09f9131fc6ed5f5cb5c1c001503564e89dde3143f58fa7cb59 SHA512 c4f15073aa7f9f84ca369f56944d8c3daba67b419f7d1a4e886b23bd210f84268beddeb13bb9dcb88a86e9dd1bc24a4364ed4bd2065062eac771002f367150e1
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
-EBUILD colobot-0.1.12.ebuild 1529 BLAKE2B 10963bb2d419873121541c8beedb01c79309c25c210979cb1ecab20993233085fb5c93371102dc460af743cf9a0bdf7b3630382ac467af768bb8bc5506c1c1e2 SHA512 0505d423b3e9b3e076e88fbea3cd7a1a6d0a45b7216671d442b2fa4f49dae920d0b4dccd0ea9675b08853a0245a1b155540ca7be334bd60d429ad1c138827aaa
+EBUILD colobot-0.1.12.ebuild 1616 BLAKE2B 0044f75977deebfdd035bc6b0a0815613a2f9bc00aad6a5898737b8884089842d2d8d1185bbb0cfdb04356a431ee35aea37c53610daaf6276088a7d7f55d811a SHA512 58ffa32138e8f26109bbfcd8604bfa358db0fffb49949ae5efef9d3e638643b9edd1da7f972278e4285fcee0bbeaacd69dba82a828ad89accd1564d7dbfdf4fb
 EBUILD colobot-9999.ebuild 1377 BLAKE2B 98d1de0557f5edc06166bc191e5fe1beb4bf0f7f8975069d81f2a8aaf005c17348f649f477a3c16ab5aa5b35130a10607bb5395266c1c983816fed0b9f811bb2 SHA512 61b61b0cdb4c29348333c30a13c1986d69587164734bc2c52e07e63b1d5b795270bae19642055662155563b1cc91cd5cb7697b1172fecd1ae375702e879dcbe8
 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 56e82f5815b8..152ba200e160 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -40,6 +40,8 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	# https://github.com/colobot/colobot/pull/1300
 	"${FILESDIR}"/${P}-includes.patch
+	# https://github.com/colobot/colobot/pull/1453
+	"${FILESDIR}"/${P}-sndfile-link.patch
 )
 
 src_prepare() {
diff --git a/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch b/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch
new file mode 100644
index 000000000000..349bb91c487b
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch
@@ -0,0 +1,40 @@
+From f13ca0c15efc80da7034ae1d06224e31591cfc46 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 19 Aug 2021 09:11:16 +0200
+Subject: [PATCH] Fix missing linking to sndfile with OPENAL_SOUND=OFF
+
+Fix the CMake files to use sndfile even if OPENAL_SOUND is disabled.
+The package code (via sndfile_wrapper.cpp) uses sndfile unconditionally,
+and it currently fails to build with -DOPENAL_SOUND=OFF:
+
+    [293/293] Linking CXX executable colobot
+    FAILED: colobot
+    : && /usr/bin/c++ -std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations -Wno-error=deprecated-declarations -Wsuggest-override  -g -O0 -rdynamic src/CMakeFiles/colobot.dir/app/main.cpp.o -o colobot -L/tmp/colobot/src/CBot -Wl,-rpath,/tmp/colobot/src/CBot:/tmp/colobot/build/src/CBot:  src/libcolobotbase.a  src/CBot/libCBot.so  lib/localename/liblocalename.a  -Wl,-Bstatic  -lSDL2main  -Wl,-Bdynamic  -lSDL2  -lpthread  -lSDL2_image  -lSDL2_ttf  -lGL  -lGLU  -lpng  -lz  -lGLEW  /usr/lib64/libboost_system.so.1.76.0  /usr/lib64/libboost_filesystem.so.1.76.0  /usr/lib64/libboost_regex.so.1.76.0  -lphysfs && :
+    /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: src/libcolobotbase.a(sndfile_wrapper.cpp.o): undefined reference to symbol 'sf_close@@libsndfile.so.1.0'
+    /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib64/libsndfile.so.1: error adding symbols: DSO missing from command line
+    collect2: error: ld returned 1 exit status
+    ninja: build stopped: subcommand failed.
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90843488..95927733 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -303,10 +303,11 @@ find_package(Boost COMPONENTS system filesystem regex REQUIRED)
+ 
+ find_package(GLEW REQUIRED)
+ 
++find_package(LibSndFile REQUIRED)
++
+ if (OPENAL_SOUND)
+     find_package(OpenAL REQUIRED)
+     include_directories(${OPENAL_INCLUDE_DIR})
+-    find_package(LibSndFile REQUIRED)
+ endif()
+ 
+ 
+-- 
+2.33.0
+
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 2eeb59ecc9ad..40a5ecded797 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,3 +1,4 @@
+AUX s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch 548 BLAKE2B 0cd4b3cf3fb5b016c3ca01e21ff245042237efb47aa08e8f57fb0b861c7c325b97d0c699de39f2218343f7de3bb7cfc9eee4610a9d4c1d5c8430c77d35a7c649 SHA512 220642d300abd18efb2f69c7b41825341d0985f6d493f03311b557f0e5a81db5284bf4c0868ad8bb09edfa84100cb59309bea1baba94e0abf6b0d4b553336215
 AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
 AUX s25rttr-0.9.0_pre20200723-gcc11-include.patch 389 BLAKE2B d2e4dac3a4a1e291b9777bce8b2dbe6d0f984b952db1255b7cce783bfa118b9450a0249ac86f7d55c53562a7f7c913a93a426457fb63ccae60f19c1de48979f9 SHA512 47fe3ee7f8ab947fca612403b0daecfb2ab0aacf53bde10b2da51ffe6f49e198d325a4925d7776de08b2dabe45103625edec7f9c0860b02e6c9d3ebb885f4f3f
 DIST s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz 20184306 BLAKE2B 4204a62e0a57a614c5ae1a947741f8f92fd7cd75b203467716483baa6f68a7c608033f403337e66b00bc8c2851b03f04c25bf84cda124548cfe09a110478fc54 SHA512 c4f0b59a68a0d5ece57f06f51e7a977be0b41ae85ff57821b317c2bb822a2533a192e1dfaa1a738c6738e65505a70ec34b3e7b22a8bd6effc95a4279d5eb19da
@@ -11,5 +12,5 @@ DIST s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz 19270 BLA
 DIST s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz 198489 BLAKE2B 47ffced26f1cceb78c0137e31114e463f0f5ad15fdb47e6a2809080a7874ce484918a0527e97b33db98c4a0daa338712c1b1a8b4992ac47d96f4e3b7056ee5e8 SHA512 0f5b4a4eeb72a906c86dac74c1bb41f5d4756c58240f59403932e388e523bed7d841ffa1d18dfd87454ab8c60b33e74cef27aec93995e37539868148bbee9900
 DIST s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz 8013451 BLAKE2B 042ab804f4ec9babf7c975629fa3bd6856fb1fa4de0c4715420bca7e0f2dd72cc0909134750ba70c69344985bdd7a3a74576536cee80d6dfaf688c8cf82da8c0 SHA512 3339ced1fcca0fc9a37382d23c3c43f46c5e51d4c14b2657a79cd15dbd79ba8025bf8133dbbe45eb125b5c88370c90422faf21b65d95f471af3bb43de54a3210
 DIST s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz 98611 BLAKE2B 6187ab3109f1c9c20524752920e7b9f0e1de2c882bb09ce8c4d2d29899fbaf8a0e2627afc475f6c1527428d77e9a7a7c7332136ba5a79e33cad9c570fbc19042 SHA512 ba85c03cb3e857c501fcec0223ccb7dfccb99a961dd6594820640e133523f14275e764e196197ead05b739f490003b412e16ca2d0fcae8263ef4c256d252570a
-EBUILD s25rttr-0.9.0_pre20200723-r100.ebuild 4835 BLAKE2B 70627589f693e88565b5164a233de4037dd0dcbbeb01b35c7b2e5f573993c520a849c37f16cf98533a4daadc041ee41b9ef83fac7908806f1c2884c8394b985f SHA512 bfaf7f987ab7cbebef9c1907f318fb50c1e04e2720fbd838419573fa7541eb3bdad248ded311c7b1a7c9dfbeab980b63f17f45f186b66ab2ca65c25f37145467
+EBUILD s25rttr-0.9.0_pre20200723-r100.ebuild 4947 BLAKE2B 2ac85ebb3c9bec4eb024da734d99bc4cf22be6a955af964b7ecc7f39f0e3a28d15aecc8168b20583aecfd8b7fc7cfd892e0b5c509867f59f136851ca00bbb1ef SHA512 32e295fc34d4a6f58244eacb85b597488d32a1c2816ea71be5462ed76f48e5eda3607fd9858a7ca109117ce606df6b3514e6979fd51dd4c9fdbd529e1e2ba854
 MISC metadata.xml 347 BLAKE2B ca0f64b6265a6a9297cd7fb42b007f8d822298f52630bcc6b25bbcdf3854514ea865d3f8407f0754b66a720028b5059962af993c889707fdda4419d445e8d4f1 SHA512 d2602cf6ae2637800c4b1d6448cf557998311ee0e24ac621c221d99fd21ae3bbd4a08963d8185d2afa6c1a63c2cf94f95bd893b7fbe01e9c777266850747ee62
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
new file mode 100644
index 000000000000..9a69797ea27a
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
@@ -0,0 +1,17 @@
+https://github.com/Return-To-The-Roots/s25client/pull/1431
+
+From: Sam James <sam@gentoo.org>
+Date: Thu, 19 Aug 2021 02:41:42 +0100
+Subject: [PATCH] Fix build with Boost 1.77 (missing <algorithm> include)
+
+Closes: https://bugs.gentoo.org/808767
+--- a/libs/s25main/convertSounds.cpp
++++ b/libs/s25main/convertSounds.cpp
+@@ -20,6 +20,7 @@
+ #include <libsiedler2/ArchivItem_Sound_Wave.h>
+ #include <libsiedler2/loadMapping.h>
+ #include <s25util/StringConversion.h>
++#include <algorithm>
+ #include <cmath>
+ #include <samplerate.hpp>
+ #include <sstream>
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
index dc54ef2deafe..f15c62bc0c1d 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
@@ -60,6 +60,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
 	"${FILESDIR}"/${P}-gcc11-include.patch
+	"${FILESDIR}"/${P}-boost-1.77-missing-include.patch
 )
 
 S="${WORKDIR}/s25client-${COMMIT}"
@@ -98,6 +99,8 @@ src_configure() {
 		-DRTTR_INCLUDE_DEVTOOLS=OFF
 		-DRTTR_LIBDIR="$(get_libdir)/${PN}"
 		-DRTTR_REVISION="${COMMIT}"
+		-DRTTR_USE_SYSTEM_LIBS=ON
+		# Just to be ultra explicit.
 		-DRTTR_USE_SYSTEM_LIBSAMPLERATE=ON
 		-DRTTR_VERSION="${PV##*_pre}" # Tests expect a date.
 		-DLUA_VERSION=$(lua_get_version)
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index e21ce24bf1b0..800ed0ccf31c 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,6 +1,7 @@
+AUX warzone2100-4.1.3-no-compress-manpages.patch 2317 BLAKE2B 00d67b7df0898b1a6343b38ffb7e1655d3f16a94bffe94894f3cff5e25f1e7f426046beda9983eea963bac5fb2a7e49aca473b8b78d141ac00baa250710093c1 SHA512 48b8c3f651bf7d504da88a6351799cc9cd19bf84191f52e9ca5b0c5c60b52a81587c8a03fde5e3d8d19e7770dc7b17dd60b59d8441b47221a7cda5a8008f9558
 DIST warzone2100-4.1.2.tar.xz 337480924 BLAKE2B 2042aedd43a3515bf6ccfc210dd02502bc20d487ff96ce763f573f0dd92ef08577ee21fd54237b4cf4f99c31ed33197febc70edd25d0e0a515e286167d815f9d SHA512 7218f98757e421d8ccf6c36de5e310060b52506d4e10c3cba6e32d1917da30b9deb52b8081026d8efc84ef44842a7db8604d4a86157409281a30bbcc52b556f6
 DIST warzone2100-4.1.3.tar.xz 337479212 BLAKE2B 07d1788fc2f8e5073a15231d5bf0c8c50dc0413522ea1589b064190144906fb58008faab66a295cec7759a1036f4d007ef8a42cffd9ef588fde1116b6cd7a38b SHA512 64126a1a5aab8b766cdfc70b8d96465ad451bd6a31e33be963eb89664b062dfe58e195ac3cbc087a9c008519c0e13003d9750bcb428b0e0ff12c82bf9940be3f
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-4.1.2-r1.ebuild 2527 BLAKE2B 5b30a48f1bfa0fa022120923698dac9054bd77b598d3d12015be911ee1fea198c28d46e4c9d0bc9a6438845dfd237b8e2f54d37089bb37f890edb9fbd279d841 SHA512 d251b0cdc1500dbb9befe2925a4c796d893d4659a5bd932ab45955a5ecce2772154937e1dd13f488891f011c161d35a47c78b6d14e956c89425f0c956224000b
-EBUILD warzone2100-4.1.3-r2.ebuild 2765 BLAKE2B b23e35e0912b3fe841aeecada4770d698e897f8e2de01d4f549d8d8ea9a6d491d5173bac4e3cfcce7cccb345d5e620c27e0b13f5c1e0ebd04f1746a57190f2a8 SHA512 4f16ef347548f8c88c1a9da413053da897530443fbc39e2c15561d5419e3fce342d3499ef146f8f86d1b3bce1c494db3241e4236a86e3ec8cbdfaa0cda755edc
+EBUILD warzone2100-4.1.2-r3.ebuild 2402 BLAKE2B 30851896517d6df07fa994ba6125af0e4d8ead4e0179158bbcb280b084f629675128117ab29927dc48fb22740921566d2dddb966a94ab649da7991907708ce25 SHA512 94ffadb25e4048d8c8a9b12e4f50cfea5884201d233033861b5a1c31029fe43222e36a0724bcd4b7bad3356a3555d86d59b76d7e2c3eef11573e1e43bb26a2d7
+EBUILD warzone2100-4.1.3-r4.ebuild 2686 BLAKE2B c66c3402d285cccfd2d33780605a22acf294564671e52ad6630d892d67e2d7d42f1b2ab7b3f84f735340892e78c38263186a0b9034f48fc44911b175b1255347 SHA512 5a2146eb1f1f201d830a40cc843df461cf16ac489d2b792d9977478db6a1d60a37af42d618c16be58fe0f556548986a8a8535b07808af2284165db5c40f06bd7
 MISC metadata.xml 811 BLAKE2B 3b34613b3eeec7f6f428f9e2c48561df6fecc03566d7b9b10618aba37fd53e2f1bd1d09e46804f2c87f2504e4d91d1a289a2a22afea8c7eac01820b779a77cf3 SHA512 af44da84a5578f11e6f01e0310a7aefedf29582c90d257eaa51e64a59fd85a5e60c2f56ca401c58fb40c079c556abc400586aa74dc49d1b5b9073bf750ce1845
diff --git a/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch b/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch
new file mode 100644
index 000000000000..b90ad05bc754
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/808120
+
+From e65b71cec99b2c3a4d0ed6aa448e7a2dc28fabac Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 17 Aug 2021 22:22:40 +0100
+Subject: [PATCH] Don't compress manpages
+
+---
+ doc/CMakeLists.txt | 34 ++++++----------------------------
+ 1 file changed, 6 insertions(+), 28 deletions(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 3d27a1a..f3c702b 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -236,35 +236,13 @@ install(FILES ${wz2100_doc_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}${WZ_OUTPU
+ if(UNIX)
+ 	# Man-page gzip and installation
+ 
+-	find_program(GZIP_BIN NAMES gzip PATHS /bin /usr/bin /usr/local/bin)
+-	if (GZIP_BIN)
+-		set(_warzone2100_6_uncompressed_orig "${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6")
+-		set(_warzone2100_6_uncompressed "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6")
+-		set(_warzone2100_6_compressed "${_warzone2100_6_uncompressed}.gz")
+-
+-		add_custom_target(wz2100_manpages ALL)
+-		set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc")
+-		add_dependencies(wz2100_manpages wz2100_doc)
+-
+-		if (NOT "${_warzone2100_6_uncompressed_orig}" STREQUAL "${_warzone2100_6_uncompressed}")
+-			add_custom_command(
+-				TARGET wz2100_manpages
+-				COMMAND ${CMAKE_COMMAND} -E copy "${_warzone2100_6_uncompressed_orig}" "${_warzone2100_6_uncompressed}"
+-				COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed}
+-				VERBATIM
+-			)
+-		else()
+-			add_custom_command(
+-				TARGET wz2100_manpages
+-				COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed}
+-				VERBATIM
+-			)
+-		endif()
++	set(_warzone2100_6 "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6")
+ 
+-		install(FILES "${_warzone2100_6_compressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
+-	else()
+-		message( WARNING "Unable to find gzip tool; skipping Unix man page generation" )
+-	endif()
++	add_custom_target(wz2100_manpages ALL)
++	set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc")
++	add_dependencies(wz2100_manpages wz2100_doc)
++
++	install(FILES "${_warzone2100_6}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
+ endif()
+ 
+ set(wz2100_doc_IMAGES_FILES ${wz2100_doc_IMAGES_FILES} PARENT_SCOPE)
+-- 
+2.33.0
+
diff --git a/games-strategy/warzone2100/warzone2100-4.1.2-r1.ebuild b/games-strategy/warzone2100/warzone2100-4.1.2-r3.ebuild
index 78e0c7a03746..db26399fb3a0 100644
--- a/games-strategy/warzone2100/warzone2100-4.1.2-r1.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.1.2-r3.ebuild
@@ -21,14 +21,10 @@ KEYWORDS="~amd64 ~x86"
 # upstream requested debug support
 IUSE="debug discord nls videos vulkan"
 
-# TODO: unbundle miniupnpc and quesoglc
-# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
 CDEPEND="
 	>=dev-games/physfs-2[zip]
 	>=dev-libs/libsodium-1.0.14:=
-	dev-libs/openssl:0=
 	media-libs/freetype:2
-	media-libs/glew:=
 	media-libs/harfbuzz:=
 	media-libs/libogg
 	media-libs/libpng:=
@@ -36,6 +32,7 @@ CDEPEND="
 	media-libs/libtheora
 	media-libs/libvorbis
 	media-libs/openal
+	net-libs/miniupnpc:=
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
diff --git a/games-strategy/warzone2100/warzone2100-4.1.3-r2.ebuild b/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild
index 3e39b944a707..1259fe012c7e 100644
--- a/games-strategy/warzone2100/warzone2100-4.1.3-r2.ebuild
+++ b/games-strategy/warzone2100/warzone2100-4.1.3-r4.ebuild
@@ -21,15 +21,11 @@ KEYWORDS="~amd64 ~x86"
 # Upstream requested debug support
 IUSE="debug discord nls videos vulkan"
 
-# TODO: unbundle miniupnpc and quesoglc, bug #477610
-# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
 CDEPEND="
 	>=dev-games/physfs-2[zip]
-	dev-db/sqlite
+	dev-db/sqlite:3
 	>=dev-libs/libsodium-1.0.14:=
-	dev-libs/openssl:0=
 	media-libs/freetype:2
-	media-libs/glew:=
 	media-libs/harfbuzz:=
 	media-libs/libogg
 	media-libs/libpng:=
@@ -37,6 +33,7 @@ CDEPEND="
 	media-libs/libtheora
 	media-libs/libvorbis
 	media-libs/openal
+	net-libs/miniupnpc:=
 	net-misc/curl
 	sys-libs/zlib
 	nls? ( virtual/libintl )
@@ -61,13 +58,15 @@ BDEPEND="
 HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
 DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.3-no-compress-manpages.patch
+)
+
 src_unpack() {
 	unpack ${P}.tar.xz
 }
 
 src_prepare() {
-	default
-
 	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
 
 	# Delete translations we're not using
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index d0b3d49008e9..bffd20352944 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,4 +1,5 @@
+AUX widelands-1.0-boost-1.77.patch 473 BLAKE2B c874688efafde34c19b9362b4a744c054076bbdb62ad4bddf3f3960774852fac514e768e20d78b1908b2d0274534304f6629ac2bbf87200f4f44f7730cd63981 SHA512 8b1d989c208f917bd26e9ab6000a1367f1dc9f6fa7dcdf681503541b1dd6d1a6433463c4f547ff387aeceb38156e7e8c73790f329746b6b55350f17b96289f9c
 DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
-EBUILD widelands-1.0.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
+EBUILD widelands-1.0.ebuild 1349 BLAKE2B 6a5e639c181d4e9b08590ed8d718c6f131858270120eefa36e745bebf99cccf1404d925198dce8638669ebf433bec2311be0d0705301a3042f16b2b09567d949 SHA512 c4775dc1e9eeb785ba0bd90bb1601de1cbc53f45d597d2fdbd62fc8c62025ca59cfcea2d1e574e36c92051c8504eea6f8951391a0d67182f10275644465a070e
 EBUILD widelands-9999.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
 MISC metadata.xml 389 BLAKE2B fe4a764c97dea6a413ad64f616b14f041d94682a5bbb92f02c07506f1c727c1c391fc1beae37c01bd16471a765d8ff5c96badfbfac2ab6647c88db4afa59499f SHA512 4192abec8b668283343c9066c80d89441f7a9491078589a792e9584ab1b9195f443313434350954979acdbfa23c8c048557e1884d18d7d0cac90d63919758dfd
diff --git a/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch b/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch
new file mode 100644
index 000000000000..69c1cb8caf43
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/808747
+
+https://github.com/widelands/widelands/commit/316eaea
+From: matthiakl <t-m.42@mailpost.spdns.org>
+Date: Sat, 14 Aug 2021 19:24:08 +0200
+Subject: [PATCH] Added missing direct incude (#5025)
+--- a/src/network/bufferedconnection.h
++++ b/src/network/bufferedconnection.h
+@@ -20,6 +20,7 @@
+ #ifndef WL_NETWORK_BUFFEREDCONNECTION_H
+ #define WL_NETWORK_BUFFEREDCONNECTION_H
+ 
++#include <map>
+ #include <memory>
+ #include <mutex>
+ #include <thread>
diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
index 6b04bc906390..1c8af8b6ba6c 100644
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gettext"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.77.patch
+)
+
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"