gentoo resync : 25.08.2020

16 files changed, 30 insertions, 530 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 260707cb30a6..8d83deb36bac 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index ca5a36d394ea..4ba06daab522 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,23 +1,13 @@
-AUX s25rttr-0.8.1-cmake-3.patch 851 BLAKE2B 212aacf9ab7d37f41b0f1ade26fac67f015c62c02058874910af7d8e0123bd39a1f1301e0296ec906ce55f38e006bbdba6f30d9b98f35439639ea778f8272c22 SHA512 46f012e386854fbb7f21bbee98855849303501bf946b74a93c87ec9745cf5ec50b903ea3d35ecf9e84c1e4161c1876d43507c97d6bd9af8b5af2f6c9f4cb2805
-AUX s25rttr-0.8.1-cmake.patch 5706 BLAKE2B 5b9d796e1e6815336eb9a9006e321a66e6c733ebd514b5ff92ae542e6078a9dc2366dc7e01cc310ea758c903dceebb545a860fa09fe462fd5fa00bf2202c3647 SHA512 0a53ea20225d616686aff2ef2d98ae5dc5394e28db9be554102332705de5418cd5dd895075923924c7ada0e8bbcc2b9825203e531b3fffa531dc4232d9463fa3
-AUX s25rttr-0.8.1-format.patch 698 BLAKE2B f4ad85af1c05e4a6ace8da4a62e75673a773698170a430a716aef0219d08badfef01fb3b9d71b225549e541a3f7dc9be754c18f349c522c046f4ec8b83125385 SHA512 f0ba023f3d6fff3970cfcfc132c44e4dcff41ed91faee74b5ad513bce3bd625d6528511114fad70f6d3f5cdfc6e471ecef07a607be6a082ca7f3a0b71477d8cc
-AUX s25rttr-0.8.1-fpic.patch 1508 BLAKE2B f53042695c3fa65fb2ced0afb8307fd9e56d12d2b6ad0bef2c309720177d3466eb61a7bd0ed89c9f4c6ff3ff45faf9fab5e7e4b7d26f4a6dbb957f030805df31 SHA512 23c2f54864205c55bb7f18cb9b6e949640451b4b4de86b2c30a8721fd724c8ba00fd667bc8c07ea31ba8edfb92630afec08e1f52ab861d08887cf639f8cde7a9
-AUX s25rttr-0.8.1-gcc6.patch 1504 BLAKE2B 6cbb0fcd59ebedbb0e9faf49bc192944b70ceee9a0abdc3b5256717672da190a6337ed2ad4d52d28aedc1b0e29704c9fe36b6a67aafe9aceb28bd350895efb12 SHA512 3a10ee4c6329c1dcc514e2b4d5edec41b56ac72c08955b24eeced94d1c9757703fe0732d833718dd99a4e5d70857a8e84347d8036c683b9b82d37916bd2cf951
-AUX s25rttr-0.8.1-miniupnpc-api-14.patch 1385 BLAKE2B a5fe9c6937dfe154685ac1e0debab0b5ef3e6c3e27a792f947e1c5a93f772f2d9829602c87db76d9a421d723e652c01f3e015643801d0c136002164f366a5fca SHA512 163a83ac734ff2accca133c20c0e15f7f21140e41661add4229f2a878baebebf09eb82420b2d0b0a7a77042be35608bd00c30006265395e842ae28d64b8986f6
-AUX s25rttr-0.8.1-soundconverter.patch 767 BLAKE2B 7a3772caa5624ee18a73cff0fb41531798022ef845feb4e1bb7bae560207efe82fb084fec7c0d9dfdde02c293db6fe3c2ea9290a5a6fd59cc59fee37a32693b7 SHA512 e62de5e040e89d53b73a0b7202eab0b32382656978e6c4471b1f3b996c9c679c9de13a8db671d719a79b985b062be3e67e75dacd4d9b5efb58e63c30bde1c10c
-AUX s25rttr-loosen-libs.patch 491 BLAKE2B 78ac7fa85a5bbcf9151e1f3b0fc62a6e0a839ea60cf4a55367627ad8484fd8935e4286b1d6d2799ccc0583de70d918a170e2398e6d400dbd142c22f0ebe9f5e0 SHA512 dd77d491ae8689e5f5b652d9b1764d3076a0f1ccebc14baf9fd9affc93d8670daad829c3d505fffbafec52e21f0b4b8fd5952ecd48b732ab378ccbd08d63c1e8
-DIST s25client-784eb58fc1eb42751042d82f16cc92617fc6c2ae.tar.gz 20212703 BLAKE2B e7e73dda1f95d92578f17c68015ef71f58f4c3f96a45f0fc199a93852aa7a3efcd22d4d09ee3a2a9fcf054f2cda1f237f153ad5b1aa4f5d19b894a4f5d73e549 SHA512 f6634ad3b38530c537cd79e79a759228ff25cfad4552b07d9957a04dc29819e501c606dc9a9366da52102addf6c66e9eeaa92e8ebedbb0c8bea2fb6627068f86
-DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
+DIST s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz 20184306 BLAKE2B 4204a62e0a57a614c5ae1a947741f8f92fd7cd75b203467716483baa6f68a7c608033f403337e66b00bc8c2851b03f04c25bf84cda124548cfe09a110478fc54 SHA512 c4f0b59a68a0d5ece57f06f51e7a977be0b41ae85ff57821b317c2bb822a2533a192e1dfaa1a738c6738e65505a70ec34b3e7b22a8bd6effc95a4279d5eb19da
 DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a
-DIST s25rttr-languages-b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz 663317 BLAKE2B 71bb99b3ab6b4ce4bfbb97a7a5ceaf4fb9d1de561f62b42a14e0755d564b1fc7fff0ae66e25414f70fa92bb321e35c6088cd0366ecbef484f3eb598ba8357eb2 SHA512 ec21edcbd35ac3aa5935a19a1735b7af84230f0551850f15f16d40ea5d3409ef9f14a55fc665e203b267886290e2f158ae807bb51f87492004c4a81b22ee6bfe
+DIST s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz 698512 BLAKE2B 82bc98077ed18622083894a63044194f599375c93aa745e330ad8ba390e14d9829ebb7c8e62141758f41dff2b72d3afbe2a5b6ebb584c3293c244e6f0c88ff89 SHA512 47de2791a4d4707fa17344de8fff8a15dd4436dd6e8c75adbd95273739cf5022e39a1024edee228eb27294e4f1f0b2a91110a1249b3d4fe64641cace051e4544
 DIST s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz 17008 BLAKE2B 98486acff6e56581b5dd06bba9892da739bf1947151f036ade31354c340b6dd79e1b77cd42475bc38225515392062c4e5dbf9ab28349356368db0ca90a81ee65 SHA512 1827edf6470f20a4b6a1b991a31af411e2cc5ceae36a65d54dbd6927dcf46949c4ad729ac982242da9a8ec9d141531d6c99792af761370b2252872bdbb7da8f0
-DIST s25rttr-liblobby-7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz 23394 BLAKE2B d3ed80917665165d839a5b607d8793b238335b1b6afabe9eaa403188797ba821b949699b58126d50619820f694104b005f92b948ce09e18d6629b9b6dff85baa SHA512 c2cc34c78acf04f0e0eee7a9a9a11564cb49d98cdaaa0bf36f3adda980beefa1831ec70dd1b0b0cf10841325f3ac0fc7e9a0564255156c76b8c98b1ffded34ae
-DIST s25rttr-libsiedler2-800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz 490533 BLAKE2B f71a5d19b9aa2ae268c3b658d96c1efc4784c223cfa050962df4b9fc75b96d939769e72391f9d2354887e3aba106043be3f365b2d695ffd66df2d2877ada01c5 SHA512 38629c532332b257f1c09e8a592c937d795ae39c16696614d50ec2cfd212d35db0110a8d1d561f0f17c875228e4de4e6f2b83cd2c8c00fc7c9320c75f88e13b3
-DIST s25rttr-libutil-c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz 112761 BLAKE2B 47d563877960f234a5d5547d08b426f9c97f234d09a5def11b67c578f734afeeb0309e40b1b5d2d9a11080dd2f10ad9d73d41481bf0f1489db9d785a02513966 SHA512 1b2480d84cd00a40c7f6df0162505c123859b350d8c241631046e5a91bde6d668667af64803e015234ae13a69e7f0e97aff5c08858396c0d298a2bd033262d35
-DIST s25rttr-mygettext-7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz 18869 BLAKE2B 63cf0ab2f62ab17b9078aaa7ab9f6f56326cf21b4292de5086de053f1e6ba62e23931eb63bb4494855a61a5e8d971b067a42819c12d4363a5c0ad624f9dabfaa SHA512 f049f9a4500f00b0e1159f1110ddfde752055de09d62a0d07a466cdfe5cfd0e564b89f2b9dd8f2a9adc30e619690008e8dda9fe1cd4f7ec1d541018f9fe680b4
-DIST s25rttr-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz 198454 BLAKE2B 9fb488a03ddd3ca5b476cc48b8629935f41c41b1b0bd2674adc048e674c1102d5e74dc8232df01956fb6db6451697e1d9bc5a4da4825dd9ce2c83608c366fd39 SHA512 ca5d79bdaeac08334aa47a08f8a550f09a8cc6507f86a05e0e90d49b6c181247e9d6cc880d5c05a926da82562e946d7fbd3abc339e178cab32891474e42bef60
-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 4585 BLAKE2B 824a9e816d8cdba3e2fb7b236595538070d2e5558e18579dd03396a6e95f6c120654d9677878ab9be4458d3638f6eaf65573c240627ebe4d708a7c648cdc4967 SHA512 ed7d97d228ff86daaa25eb10fa08bee38cef15d16e3a0e4a7227273beb7f1b0fbab67202caaab7534b6f6cd4a5427020c2d0835675972a1524b4a7700dd9a92e
+DIST s25rttr-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz 24127 BLAKE2B 841ddec14b88cb057978bad87a710bafe9a358bd31614f0c855343f148ff52485894771c5fde85e4f31a769e679307e5608db71e2365e5205de2b72ea5429ffd SHA512 5334e84ff0f7aecd666b4f3832131c9d82767304d705fd51ac1a1d90beb68e65f7d9b16d89c8af682960f6639aa5c3e61403278685dc7f240c5c94c6148a8100
+DIST s25rttr-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz 495357 BLAKE2B ef421becde207866e3d88a3978e56e2ba289dbe86d83b682051dd8776f865eb7ce57a4fc7af42ef581fddd1d816be0d087e282ea1ec27eca9f5d1be429c6adc6 SHA512 9c4fa600d89d859a8336b672f56b697538a6ca6f6fa411236e53b6d0d2972487feba5c0ba024242dc8be2e65464290f95926224d74fa3b75e1531e798561ebf4
+DIST s25rttr-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz 92326 BLAKE2B 3245cd7d6e5828b6b69dc99b920d8682d1e33a5d32b0ff21ae9f20fa31f2f6019245f7919ba4c9d1da30b166c56c903e8aafca77da4216338c612b5b812fc252 SHA512 afdda736dcf4f848df171b806a9cc4f667187f5ce525894471791ab6bebe004a589865654c973df71788019c0a2ac4621bf47d7202b772e895e51df628f494d6
+DIST s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz 19270 BLAKE2B 76cacab478205f45897a75a868114211d4cfcc08cbfa9fa694ac0011dc9e6272d9d0e63b34d60264e6923038f830c06dd32279233f9d0ca42732b3963152f6e3 SHA512 22ce4169feb5fa7e5567c66a245e71d98a02dd6eee9214b2387b70ff5a592cca8445fc4e95b5403b33215fe418ed3cfeee9fe6a7d96ecddc7661556cb718cc35
+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.ebuild 4566 BLAKE2B 2ca3291033523a758c8d997346bb8baa19e1f357c67a21d6a49d5a9e1e908b162923b2f7ff5db3c0e9c80d576703a713324a6102f02b438bd85d140196073c35 SHA512 941c2b06f585caa1fb553dffd419a2d4e57526e0aa7ca79295f951cd756f51b2fc539175b8509c8ea92fa1802cf79d386f7bae117890390255920c7b0a5a3d4a
 MISC metadata.xml 347 BLAKE2B ca0f64b6265a6a9297cd7fb42b007f8d822298f52630bcc6b25bbcdf3854514ea865d3f8407f0754b66a720028b5059962af993c889707fdda4419d445e8d4f1 SHA512 d2602cf6ae2637800c4b1d6448cf557998311ee0e24ac621c221d99fd21ae3bbd4a08963d8185d2afa6c1a63c2cf94f95bd893b7fbe01e9c777266850747ee62
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
deleted file mode 100644
index b7e9e424eb08..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcbfb02..ae1c5f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,12 +2,12 @@
- ### $Id: CMakeLists.txt 8341 2012-09-30 12:09:04Z FloSoft $
- ################################################################################
- 
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
--CMAKE_POLICY(SET CMP0003 OLD)
--
--IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND ${CMAKE_PATCH_VERSION} GREATER 0)
--	CMAKE_POLICY(SET CMP0015 OLD)
--ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND ${CMAKE_PATCH_VERSION} GREATER 0)
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
-+CMAKE_POLICY(SET CMP0003 NEW)
-+CMAKE_POLICY(SET CMP0015 NEW)
-+IF(NOT CMAKE_VERSION VERSION_LESS 3.1)
-+	CMAKE_POLICY(SET CMP0053 NEW)
-+ENDIF()
- 
- SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
- 
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
deleted file mode 100644
index 14f2edb52df5..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Oct  5 13:33:05 UTC 2012
-
-make build system gentoo-compatible
-provide options for SDL and GLFW video drivers
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,12 +19,19 @@
- 
- ################################################################################
- 
--INCLUDE(cmake/crosscompile.cmake)
--
- PROJECT(s25client)
- 
- ################################################################################
- 
-+# options
-+OPTION(BUILD_GLFW_DRIVER "Build the GLFW video driver" 0)
-+OPTION(BUILD_SDL_DRIVER "Build the sdl video driver" 1)
-+IF (UNIX)
-+	IF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
-+		MESSAGE(FATAL_ERROR "No video driver selected! Either use SDL or GLFW.")
-+	ENDIF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
-+ENDIF (UNIX)
-+
- SET(PREFIX ${PREFIX} CACHE STRING "Path prefix")
- SET(BINDIR ${BINDIR} CACHE STRING "Directory for the binaries")
- SET(DATADIR ${DATADIR} CACHE STRING "Data directory")
-@@ -106,38 +113,6 @@
- 			   build_paths.h)
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build_version.h.cmake"
- 			   build_version.h)
--CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/preinstall.sh.cmake"
--			   preinstall.sh @ONLY)
--CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/postinstall.sh.cmake"
--			   postinstall.sh @ONLY)
--
--################################################################################
--
--ADD_SUBDIRECTORY(version)
--
--ADD_CUSTOM_TARGET(updateversion ALL
--				  COMMAND "${CMAKE_BINARY_DIR}/version/src/version" "${CMAKE_SOURCE_DIR}"
--				  DEPENDS version
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--ADD_CUSTOM_TARGET(mrproper
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/build/cleanup.sh"
--				  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
--)
--
--ADD_CUSTOM_TARGET(create_nightly
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "nightly" "${CMAKE_SOURCE_DIR}"
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--ADD_CUSTOM_TARGET(create_stable
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "stable" "${CMAKE_SOURCE_DIR}"
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--# preinstall script
--INSTALL(SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/preinstall.cmake")
- 
- ################################################################################
- 
-@@ -148,7 +123,6 @@
- ADD_SUBDIRECTORY(libutil)
- ADD_SUBDIRECTORY(liblobby)
- ADD_SUBDIRECTORY(s-c)
--ADD_SUBDIRECTORY(s25update)
- ADD_SUBDIRECTORY(src)
- 
- ################################################################################
-@@ -157,7 +131,6 @@
- INSTALL(CODE "INCLUDE(driver/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(libsiedler2/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(s-c/cmake_install.cmake)")
--INSTALL(CODE "INCLUDE(s25update/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(src/cmake_install.cmake)")
- 
- # and then dont let him install anything
---- a/driver/video/CMakeLists.txt
-+++ b/driver/video/CMakeLists.txt
-@@ -3,7 +3,11 @@
- #################################################################################
- 
- ADD_SUBDIRECTORY( WinAPI )
--ADD_SUBDIRECTORY( GLFW )
--ADD_SUBDIRECTORY( SDL )
-+IF(BUILD_GLFW_DRIVER)
-+	ADD_SUBDIRECTORY( GLFW )
-+ENDIF(BUILD_GLFW_DRIVER)
-+IF(BUILD_SDL_DRIVER)
-+	ADD_SUBDIRECTORY( SDL )
-+ENDIF(BUILD_SDL_DRIVER)
- 
- #################################################################################
---- a/driver/video/SDL/src/CMakeLists.txt
-+++ b/driver/video/SDL/src/CMakeLists.txt
-@@ -30,9 +30,9 @@
- 	ADD_CUSTOM_COMMAND(TARGET videoSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
- 	
- 	INSTALL(TARGETS videoSDL 
--		RUNTIME DESTINATION ${LIBDIR}/driver/video 
--		LIBRARY DESTINATION ${LIBDIR}/driver/video
--		ARCHIVE DESTINATION ${LIBDIR}/driver/video
-+		RUNTIME DESTINATION ${LIBDIR} 
-+		LIBRARY DESTINATION ${LIBDIR}
-+		ARCHIVE DESTINATION ${LIBDIR}
- 	)
- ELSE (SDL_FOUND)
- 	MESSAGE(WARNING ": SDL library not found: Not building SDL videodriver")
---- a/driver/video/GLFW/src/CMakeLists.txt
-+++ b/driver/video/GLFW/src/CMakeLists.txt
-@@ -2,7 +2,7 @@
- ### $Id$
- #################################################################################
- 
--IF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
-+IF ("${COMPILEFOR}" STREQUAL "linux" )
- 	FIND_LIBRARY(GLFW_LIBRARY glfw) 
- 	
- 	IF (GLFW_LIBRARY)
-@@ -21,6 +21,6 @@
- 	ELSE (GLFW_LIBRARY)
- 		MESSAGE(WARNING ": GLFW library not found: Not building GLFW videodriver")
- 	ENDIF (GLFW_LIBRARY)
--ENDIF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
-+ENDIF ("${COMPILEFOR}" STREQUAL "linux" )
- 
- #################################################################################
---- a/driver/audio/SDL/src/CMakeLists.txt
-+++ b/driver/audio/SDL/src/CMakeLists.txt
-@@ -34,9 +34,9 @@
-         ADD_CUSTOM_COMMAND(TARGET audioSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
- 
-         INSTALL(TARGETS audioSDL 
--            RUNTIME DESTINATION ${LIBDIR}/driver/audio 
--            LIBRARY DESTINATION ${LIBDIR}/driver/audio
--            ARCHIVE DESTINATION ${LIBDIR}/driver/audio
-+            RUNTIME DESTINATION ${LIBDIR} 
-+            LIBRARY DESTINATION ${LIBDIR}
-+            ARCHIVE DESTINATION ${LIBDIR}
-         )
-     ELSE (SDLMIXER_FOUND)
-         MESSAGE(WARNING ": SDL_mixer library not found: Not building SDL audiodriver")
---- a/build_paths.h.cmake
-+++ b/build_paths.h.cmake
-@@ -41,6 +41,7 @@
- 
- //	set game directory (normal $(datadir)/s25rttr/S2)
- //#define GAMEDIR DATADIR"/S2"
-+#cmakedefine GAMEDIR "${GAMEDIR}"
- 
- //	set driver directory (normal $(libdir)/driver)
- //#define DRIVERDIR LIBDIR"/driver"
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
deleted file mode 100644
index 3d50543b9c0e..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
-+++ b/src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
-@@ -1349,7 +1349,7 @@
- 			snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str());
- 			break;
- 		default:
--			snprintf(text, sizeof(text), _("Team victory!"));
-+			snprintf(text, sizeof(text), "%s", _("Team victory!"));
- 			break;
- 	}
- 	messenger.AddMessage("", 0, CD_SYSTEM, text, COLOR_ORANGE);
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
deleted file mode 100644
index 4a1d11ef1704..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2b4f956263864cebb1b9c5ce120c7cd30f512bdb Mon Sep 17 00:00:00 2001
-From: nE0sIghT <ykonotopov@gmail.com>
-Date: Sat, 18 Jul 2015 19:03:05 +0300
-Subject: [PATCH] Fixed build of sdl drivers
-
----
- driver/audio/SDL/src/CMakeLists.txt | 1 +
- driver/video/SDL/src/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/driver/audio/SDL/src/CMakeLists.txt b/driver/audio/SDL/src/CMakeLists.txt
-index 5ad3f02..5a91cd5 100644
---- a/driver/audio/SDL/src/CMakeLists.txt
-+++ b/driver/audio/SDL/src/CMakeLists.txt
-@@ -20,6 +20,7 @@ IF (SDL_FOUND)
-         
-         ADD_LIBRARY(audioSDL SHARED SDL.cpp SDL.h main.h SoundSDL_Music.cpp SoundSDL_Music.h SoundSDL_Effect.cpp SoundSDL_Effect.h ${PROJECT_SOURCE_DIR}/build_version.cpp ../../../src/DriverInterface.cpp ../../../src/tempname.cpp ../../../src/tempname.h)
-     
-+    	ADD_DEFINITIONS(-fPIC)
-         ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
-         ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
- 
-diff --git a/driver/video/SDL/src/CMakeLists.txt b/driver/video/SDL/src/CMakeLists.txt
-index 83d10cf..ca67573 100644
---- a/driver/video/SDL/src/CMakeLists.txt
-+++ b/driver/video/SDL/src/CMakeLists.txt
-@@ -16,6 +16,7 @@ IF (SDL_FOUND)
- 
- 	ADD_LIBRARY(videoSDL SHARED SDL.cpp SDL.h main.h ../../../../build_version.cpp ../../../src/DriverInterface.cpp)
- 
-+	ADD_DEFINITIONS(-fPIC)
- 	ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR})
- 	ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR})
- 
--- 
-2.3.6
-
-
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
deleted file mode 100644
index 957ecf4ddf50..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Bug: https://bugs.gentoo.org/610972
-Commit: https://github.com/Return-To-The-Roots/mygettext/commit/3b902a46322b7e88e9d2cdf85ee0912c6565f9a2
-
---- a/driver/audio/SDL/src/SDL.cpp
-+++ b/driver/audio/SDL/src/SDL.cpp
-@@ -175,23 +175,23 @@
- 	
- 	char file[512];
- 	if(!tempname(file, 512))
--		return false;
-+		return NULL;
- 
- 	strncat(file, ".wav", 512);
- 	
- 	FILE *dat = fopen(file, "wb");
- 	if(!dat)
--		return false;
-+		return NULL;
- 
- 	if(fwrite(data, 1, size, dat) != size)
--		return false;
-+		return NULL;
- 	
- 	fclose(dat);
- 
- 	switch(data_type)
- 	{
- 	default:
--		return false;
-+		return NULL;
- 
- 	case AudioDriver::AD_WAVE:
- 		{
-@@ -233,12 +233,12 @@
- 
- 	char file[512];
- 	if(!tempname(file, 512))
--		return false;
-+		return NULL;
- 
- 	switch(data_type)
- 	{
- 	default:
--		return false;
-+		return NULL;
- 
- 	case AudioDriver::AD_MIDI:
- 		{
-@@ -266,10 +266,10 @@
- 
- 	FILE *dat = fopen(file, "wb");
- 	if(!dat)
--		return false;
-+		return NULL;
- 
- 	if(fwrite(data, 1, size, dat) != size)
--		return false;
-+		return NULL;
- 
- 	fclose(dat);
- 
---- a/src/VideoDriverWrapper.cpp
-+++ b/src/VideoDriverWrapper.cpp
-@@ -481,7 +481,7 @@
- 	if(videodriver == NULL)
- 	{
- 		fatal_error("Kein Videotreiber ausgewaehlt!\n");
--		return false;
-+		return NULL;
- 	}
- 
- 	return videodriver->GetFunction(extension);
---- a/mygettext/src/mygettext.h
-+++ b/mygettext/src/mygettext.h
-@@ -21,6 +21,9 @@
- 
- #pragma once
- 
-+// necessarily here
-+#include <locale>
-+
- const char *mysetlocale(int category, const char *locale);
- 
- #undef gettext
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
deleted file mode 100644
index d2ff0ee1fe39..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3b08b907235c09ab84e3bb23d1e05fe5a1d1c00e Mon Sep 17 00:00:00 2001
-From: Manuel Zeise <mail@manuel-zeise.de>
-Date: Sun, 3 Jan 2016 16:54:05 +0100
-Subject: [PATCH] Switch for miniUPnPc API version 14 and above
-
-API version 14 of miniUPnPc has introduced a new TTL argument to
-upnpDiscover() with a recommended default value of 2. A new preprocessor
-statement evaluates the API version and selects the correct version of
-upnpDiscover() based on the API version.
-
---- s25rttr-0.8.1/libutil/src/UPnP.cpp
-+++ s25rttr-0.8.1/libutil/src/UPnP.cpp
-@@ -210,7 +210,11 @@
- 	UPNPDev* devicelist = NULL;
- #ifdef UPNPDISCOVER_SUCCESS
- 	int upnperror = 0;
-+#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
-+	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
-+#else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
-+#endif
- #else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
- #endif
-@@ -276,7 +280,11 @@
- 	UPNPDev* devicelist = NULL;
- #ifdef UPNPDISCOVER_SUCCESS
- 	int upnperror = 0;
-+#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
-+	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
-+#else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
-+#endif
- #else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
- #endif
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
deleted file mode 100644
index 1cc7686b850d..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: hasufell <julian.ospald@googlemail.com>
-Date: Mon Apr 30 20:42:28 UTC 2012
-
-relocate executables sound-convert and s-c_resample which get installed
-into datadir by default
-
---- a/libutil/src/files.h
-+++ b/libutil/src/files.h
-@@ -140,7 +140,7 @@
- 	/* 54 */RTTRDIR "",                               // unbenutzt
- 	/* 55 */SETTINGSDIR "/LSTS/SOUND.LST",            // Die konvertierte sound.lst
- 	/* 56 */RTTRDIR "/sound.scs",                     // Das konvertier-script
--	/* 57 */RTTRDIR "",                               // Basispfad fürn Soundconverter
-+	/* 57 */DRIVERDIR "",                             // Basispfad fürn Soundconverter
- 	/* 58 */GAMEDIR "/DATA/MIS0BOBS.LST",
- 	/* 59 */GAMEDIR "/DATA/MIS1BOBS.LST",
- 	/* 60 */GAMEDIR "/DATA/MIS2BOBS.LST",
diff --git a/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch b/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch
deleted file mode 100644
index 421cde2cd74f..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libs/libGamedata/CMakeLists.txt b/libs/libGamedata/CMakeLists.txt
-index b09569530..3d908226c 100644
---- a/libs/libGamedata/CMakeLists.txt
-+++ b/libs/libGamedata/CMakeLists.txt
-@@ -12,7 +12,7 @@ FILE(GLOB SOURCES_OTHER *.cpp *.h)
- SOURCE_GROUP(other FILES ${SOURCES_OTHER})
- 
- # CMake < 3.2 treats version 5.2.x as not equal to 5.2 but we want to allow all 5.2 versions
--find_package(Lua 5.2 EXACT REQUIRED)
-+find_package(Lua 5.1 REQUIRED)
- 
- include(GatherDll)
- gather_dll(Lua)
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
deleted file mode 100644
index 01cef6dff65e..000000000000
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
-HOMEPAGE="https://www.siedler25.org/"
-# no upstream source tarball yet
-# https://bugs.launchpad.net/s25rttr/+bug/1069546
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/bzip2
-	media-libs/libsamplerate
-	media-libs/libsdl[X,sound,opengl,video]
-	media-libs/libsndfile
-	media-libs/sdl-mixer[vorbis]
-	net-libs/miniupnpc
-	virtual/libiconv
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-DOCS=( RTTR/texte/{keyboardlayout.txt,readme.txt} )
-
-DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-soundconverter.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-format.patch
-	"${FILESDIR}"/${P}-miniupnpc-api-14.patch
-	"${FILESDIR}"/${P}-cmake-3.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILEFOR="linux"
-		-DCMAKE_SKIP_RPATH=YES
-		-DPREFIX="/usr/"
-		-DBINDIR="/usr/bin"
-		-DDATADIR="/usr/share"
-		-DLIBDIR="/usr/$(get_libdir)/${PN}"
-		-DDRIVERDIR="/usr/$(get_libdir)/${PN}"
-		-DGAMEDIR="~/.${PN}/S2"
-		-DBUILD_GLFW_DRIVER=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# work around some relative paths (CMAKE_IN_SOURCE_BUILD not supported)
-	ln -s "${CMAKE_USE_DIR}"/RTTR "${CMAKE_BUILD_DIR}"/RTTR || die
-
-	cmake-utils_src_compile
-
-	mv "${CMAKE_USE_DIR}"/RTTR/{sound-convert,s-c_resample} "${T}"/ || die
-}
-
-src_install() {
-	cd "${CMAKE_BUILD_DIR}" || die
-
-	exeinto /usr/"$(get_libdir)"/${PN}
-	doexe "${T}"/{sound-convert,s-c_resample}
-	exeinto /usr/"$(get_libdir)"/${PN}/video
-	doexe driver/video/SDL/src/libvideoSDL.so
-	exeinto /usr/"$(get_libdir)"/${PN}/audio
-	doexe driver/audio/SDL/src/libaudioSDL.so
-
-	insinto /usr/share
-	doins -r "${CMAKE_USE_DIR}"/RTTR
-	dosym ./LSTS/splash.bmp /usr/share/RTTR/splash.bmp
-
-	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
-	dobin src/s25client
-	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
index 01daa6e3ffc6..32b5d9271a89 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723.ebuild
@@ -10,18 +10,18 @@ HOMEPAGE="https://www.siedler25.org/"
 
 # To generate from git repo:
 # echo -e "COMMIT=\"$(git rev-parse HEAD)\"\nSRC_URI=\"\n\thttps://github.com/Return-To-The-Roots/s25client/archive/\${COMMIT}.tar.gz -> s25client-\${COMMIT}.tar.gz" && git submodule --quiet foreach --recursive 'url=$(git remote get-url origin); gh=${url#*github.com[:/]}; gh=${gh%.git}; echo -e "\thttps://github.com/${gh}/archive/${sha1}.tar.gz -> \${PN}-${gh##*/}-${sha1}.tar.gz"' | egrep -v "/(dev-tools|libsamplerate|s25update)/" | sort && echo '"'
-COMMIT="784eb58fc1eb42751042d82f16cc92617fc6c2ae"
+COMMIT="f0b97b120140c96bbeacae9c22633f899931db69"
 SRC_URI="
 	https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz
-	https://github.com/mat007/turtle/archive/5f8421b1d270665347280d4cab1caf159d6858de.tar.gz -> ${PN}-turtle-5f8421b1d270665347280d4cab1caf159d6858de.tar.gz
-	https://github.com/Return-To-The-Roots/languages/archive/b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz -> ${PN}-languages-b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz
+	https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> ${PN}-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz
+	https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> ${PN}-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz
 	https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> ${PN}-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz
-	https://github.com/Return-To-The-Roots/liblobby/archive/7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz -> ${PN}-liblobby-7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz
-	https://github.com/Return-To-The-Roots/libsiedler2/archive/800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz -> ${PN}-libsiedler2-800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz
-	https://github.com/Return-To-The-Roots/libutil/archive/c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz -> ${PN}-libutil-c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz
-	https://github.com/Return-To-The-Roots/mygettext/archive/7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz -> ${PN}-mygettext-7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz
-	https://github.com/Return-To-The-Roots/s25edit/archive/04b5e725036a0568e8da15447167c240563dbaba.tar.gz -> ${PN}-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz
-	https://github.com/Return-To-The-Roots/s25maps/archive/11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz -> ${PN}-s25maps-11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz
+	https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> ${PN}-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz
+	https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> ${PN}-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz
+	https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> ${PN}-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz
+	https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> ${PN}-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz
+	https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> ${PN}-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz
+	https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> ${PN}-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz
 	https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> ${PN}-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
 "
 
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	app-arch/bzip2
 	>=dev-lang/lua-5.1:=
-	>=dev-libs/boost-1.64:0=[nls]
+	>=dev-libs/boost-1.73:0=[nls]
 	>=media-libs/libsamplerate-0.1.9
 	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
 	media-libs/libsndfile
@@ -55,10 +55,6 @@ BDEPEND="
 
 S="${WORKDIR}/s25client-${COMMIT}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-loosen-libs.patch
-)
-
 # Build type is checked but blank is valid.
 CMAKE_BUILD_TYPE=
 
@@ -93,8 +89,8 @@ src_configure() {
 		-DRTTR_INCLUDE_DEVTOOLS=OFF
 		-DRTTR_LIBDIR="$(get_libdir)/${PN}"
 		-DRTTR_REVISION="${COMMIT}"
-		-DRTTR_USE_SYSTEM_SAMPLERATE=ON
-		-DRTTR_VERSION="${PV}"
+		-DRTTR_USE_SYSTEM_LIBSAMPLERATE=ON
+		-DRTTR_VERSION="${PV##*_pre}" # Tests expect a date.
 	)
 
 	if use test && tc-is-gcc; then
diff --git a/games-strategy/warmux/Manifest b/games-strategy/warmux/Manifest
index 822667f27489..28d64f782d6e 100644
--- a/games-strategy/warmux/Manifest
+++ b/games-strategy/warmux/Manifest
@@ -5,5 +5,5 @@ AUX warmux-11.04.1-gentoo.patch 1543 BLAKE2B 23c3cb85c720c0df37ed274dfe824f94ffc
 AUX warmux-11.04.1-stat.patch 1746 BLAKE2B 886a8dc439e1546d823e27bbe2313aeff913d02f754abf4355221b99f504d8408ad1c652a3e61abd4fae10e832284f929c7d31767eca317174619f54eaf5f7db SHA512 f0af67d2109585e6cc02621a9ff249cfe5154783216d46d2c7641ec825a8e30d34767122d12ced8bfd916c3c966cadad49eeb43b44aa1954905950272c0c9902
 AUX warmux-11.04.1-zlib.patch 416 BLAKE2B a41b14d70de3c828368835825a240d8708b7d81cbd64fa0cc06540eee60e4f4bced5d7dd6566d4cec49e9e8ed2f2b03ec9578a334c7223d2b43e8c844f1b950a SHA512 09ccc426514cf96d07fc3b05b7f248b0b77d2e61991afe530cb61b9c5ebf5c9222d2d4716861beed95607653ca4c617c03f244a957c4c6369925bd531ab73d3c
 DIST warmux-11.04.1.tar.bz2 110083622 BLAKE2B 50d575986d780e9e1bde2740297e11d3e720afe8396106ff05cd6051ed57315b8cd94d946b85956981743455c1013c8da91e5db0874db1e226b13bd72b3516eb SHA512 99501ea186e091b55a6e45935de83440be02ae4fc12ee6def5ec24e213c829230b4f6017043be6afbc7188e442b0e1128cfd27c290fbe0e49b6597f927fd1e2d
-EBUILD warmux-11.04.1-r1.ebuild 1465 BLAKE2B 266e0cbed986da4ee8ccfcd6982eead0627e1f6d90fbdf4cbe1e4a9c915149ccf0d7a7f289436c4abce4a331325bc2b4977af5268b95e5dfdaba1246e20377e9 SHA512 2e0d118e1a9fbb86fdaeaaa6504629c0ab3d569b90609f7bba13b39476b3a042aa9dad73ae66fd40508af4ee8a5f7bd31d3cf3e21161deb4f48054a51861eeee
+EBUILD warmux-11.04.1-r1.ebuild 1449 BLAKE2B d8a4f647f40761553c03f64cdb19592c67ead7f74ff0c7d87994cf8e01075b6256f0313f0c7a034a81019f522e8c454d32a78fcc7aac49bb721d986007f7e75e SHA512 14d19386fca2e32c2e39a76fbaaa2a77f59a40eb8b691cb5a4c5d9156970bc85d18c87b1e7ee68b9a4920effa41ba1d1393e325f27cf9d052ad4706c01679d96
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
index c62645eee128..f143ac0a47c5 100644
--- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls unicode"
 
 RDEPEND="
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index d673f31c604f..1743ea4d9f05 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,8 +1,8 @@
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.14.11.tar.gz 500178610 BLAKE2B 27af594bc86845eedb8cd8e45c814c3583e35bd94942947f91b6fa888018ae203dbd100e01ab26b5cd59712895151049105ff446d8ad3a8b2d86133d913a92cc SHA512 3c878f679e51d3657dd4d76205bdeadd6a1a95d0771cd7ab0e29f33f36e32f1963e4a96f4529dbc4b860183b3cb5a4219e86108e0e26194b8a32d3d08a5fd469
-DIST wesnoth-1.14.9.tar.gz 497393449 BLAKE2B b5235de6ce84164ef97a105339549a8a1009d7b7ed243ae355994610e56afc584b8a37b1275e0b929729a24cd2eb94d4c208e7bd22e79b76113a1e1b91c8f92d SHA512 b3e93956a40ffc48dd02e118be1d46854a2eed34ad0dca3fb34a28d0b58b4b563cb5cca588208f3525300bf075786bebe95a25c045c8098a0bdfe531a2d81e4f
+DIST wesnoth-1.14.13.tar.gz 502959933 BLAKE2B 48f2e4340e9ae015c2e45f75f419ddfbb95a436a4ffbebbe417fdcf322e162ed0ad799680757adb88e19cba717cc48ec0e3d83c4c170e3502fea7be73a39a0c7 SHA512 ee1b7a93e2ae49698ec185cf6385cd93a49116315ebdec474bd5d5b73ab6af59db92ee5621fab68581edd81c74d8584237d5068fd30362054377d84a3dcb5ea0
 DIST wesnoth-1.15.3.tar.gz 495645949 BLAKE2B aa6b8636ff1b134af5e6e9cfbefefee3189a46ccd20c2a3a3f361d77d3de48d1ae38bf8376087b6292bcacc465ad72bd60ab7aa16b3ca536ce963b6f644b8ff1 SHA512 2a5993c2c2f41939346f88104722e31a1bd0f68b39c84bdf657a7156c1348e6c65089e2766c088a2b5a2c2df8c3cd8c5cf736d66538c87cf175585634e31adbb
 EBUILD wesnoth-1.14.11.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d
-EBUILD wesnoth-1.14.9.ebuild 2601 BLAKE2B 861704b67dbf714eb632a12150d10feb7ea9bc0b041c076ca62622d51aa4a63c609f5b9c77d6389fbaab6138c7e61c38fbf954e6fbbd3daa15a424e446aa8436 SHA512 854af8bb697930e58c8a67fdfd65b69f7ba75ca6d0f2a7bfe97f54b19a6b322d8b131a6ddc3181028341de7a88beab62501539b97f34d64bbff235ac6c2d52df
+EBUILD wesnoth-1.14.13.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d
 EBUILD wesnoth-1.15.3.ebuild 2563 BLAKE2B 86fd39282046e0bccf76a23e341e0a96b5f991d44cae79f2e1d4eec898aae187d02e08f5a3765e70069ceabad69db4befd0b2dd39488e4d6147a6cc2c0153aa4 SHA512 9dbeca625bf5b13aa2d1978b7aece2c01501b07fa84a51c8811b203ba4583bf223ad61082b188923f3a328739cdd0ac771b1ea080cee41f4c4cfd0409e3a344d
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild b/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
index dd0a982c833b..407e3840468a 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.9.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs user xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -19,6 +19,8 @@ fi
 IUSE="dbus dedicated doc fribidi libressl nls server"
 
 RDEPEND="
+	acct-group/wesnoth
+	acct-user/wesnoth
 	>=dev-libs/boost-1.50:=[nls,threads,icu]
 	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
 	!dedicated? (
@@ -44,11 +46,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
 src_prepare() {
 	cmake_src_prepare