gentoo resync : 20.06.2021

18 files changed, 215 insertions, 39 deletions

diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
index e8ce2ce4f62d..94bf17e4928a 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
 	"${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
 	"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+	"${FILESDIR}"/${PN}-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch
 )
 
 pkg_setup() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 7f5f50f2b666..b6f5c6f32f99 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,9 +1,10 @@
 AUX 0ad-0.0.24_alpha_pre20210116040036-build.patch 5971 BLAKE2B 968ab7cbfa2b84312937c1f317e15ad9165fd951995dba90eef9b262448a066dc0403f0acf5fb4d40e372455b47d6b0f79c7a078601a8172d185e35463b383ed SHA512 391dc3c02184c9e67c21460833d19e386c0cb53c0bed663df531cc0efecfbe4b9a85c75b8ca682b2cd40891dd0719603108d96a21f8e5ba989fb0951713a1571
+AUX 0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch 2594 BLAKE2B 05c84cf91c8da8258719bdacacf35e7c57e4b5dd867c76a0aa320d919b6a30d68f3334bf9fe3aaaaf13c462d5a2ddd051a610ebe7b100e2d55583a5d0871d1be SHA512 787dc9287c6856c8fa2aabbad0f996801fcf98b5447574893ffbfc39fa2c2b626e60fc48023ff9c39293977749da4841e8a44930bdfb909272ee727dab4215a1
 AUX 0ad-0.0.24b_alpha-respect-tc.patch 1095 BLAKE2B c7f2747ae832de76da3711687ce8e6d52039e23cbe31ca1114d27e93ec2b3ef150f4b241a0d869ec393c9f73e702f35ce5610f9b383bbe43e958989bbcfa0c17 SHA512 00c439a086da6553b09230cf57e76c9abcf8c13093a4d439ccb5724d6dee5474c46f924c5a0c5b43cdc8572445347dcf2a77eba3fcff17b16d492ca4bef90594
 AUX 0ad-0.0.24b_alpha-rust-1.50.patch 3529 BLAKE2B 0f354b806399f1cf9fc515a1f799d119fe5d53c6c48cc5de93cd3762c4df1f2e79b1d6fc34fe2c002b002c73ac2e259556d7464b665f4eb60a186820b9f40ae4 SHA512 71884811ed0c6acbc7fec4aa4f0c3700214fd325c28eb8149c9f65fe4018d968b1dfbe0746aea940aa08a0d656f866f40cfc67fcb62965fdc861583376256602
 DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B 03d6655f7aa1f2f91a87536a7f2afa465585856c4209ddc05e666e1e5596416883596331118ac4257ff314b04d8a5c08821eaa6ae76e5d3095146ab04f8c79ed SHA512 e1239a56b184a87708c87fc03ca41190a16d813e495c5d81ee073df98761f1524a23902e5d03a21a1b1f657b496fce6eeee4a5ef22eee30f70fbe3b0dbd44510
 DIST 0ad-0.0.24b-alpha-unix-build.tar.xz 75546740 BLAKE2B a724abba6bed4b580670588e9dcfe0f75f6cef0fbde6ad666356e96213c685932edd0a1daafb5dd04206870c2c8222340c9c51e83076ec2911cbb5377ca00666 SHA512 8173d393eb1bc57c38bef0076ba973ef46c877c06644365189c0887cd3152adba51d26b553e42221fd14343e9830a3a275bfcd9b28f66281e282ea3f247730ea
 DIST 0ad-0.0.24b-alpha-unix-data.tar.xz 828553992 BLAKE2B 2081225d88d475ed0899648994a900677bc3280bb2ba6cf92354ece82b90ddcefddb48458fa23e2de97100e58f4db8db408d4b50d0306a8c3efe47d263064bf0 SHA512 d7804d25ddf376028f230a31c6fc1201dfa366b3d5434569a1a7852bb4c400fb14e5c8934c5d6c6295320cf2e62c64be83b1e3c4c27fd116115bfe7d01106726
 EBUILD 0ad-0.0.24_alpha_pre20210116040036-r2.ebuild 6380 BLAKE2B c3baa01f84d1527b0ecff261db42ae84b32110896b98c853c7990c2a76af405ee169710dd3817ec139a31b02a2e97f8300789262849b040040fae4d81e5c17dc SHA512 7d70dc9d942c2956bda278949b0297496be4ecf44a352c5a429eb496884461048721ea42dc3ed2fa5c7b373280b556d1aa323dc8d4c668b3aefd3fad6f7088ac
-EBUILD 0ad-0.0.24b_alpha.ebuild 6580 BLAKE2B 9c2aaf06b4f5365facf6818abb06fdd602988a41567f9db236199a5cd4d5da7e246fd6555a560993954be81a2ea47678839d8210af05621e76527d7bbb6a15df SHA512 628e1d1af80bc0ff90d5cc727f6668d270028b5a8587a26d31109b2dfe21a98564ea40cbe13018e8f11cbe72963892e57781e9af3a6302f8f0982850511e7c31
+EBUILD 0ad-0.0.24b_alpha-r1.ebuild 6651 BLAKE2B 1ffbbda9751ada13ae5cdad2d243e1bba8a4039b083c92164b465013b795128b621fe9b4556f4f7a8f13894a96289aa643d03e7061443ab5f59623479bbfc8bd SHA512 345bda0d2d1ef18f327eb158dbce6aaa18f12cf06382c1e18a7e44585c62a51a9505b0b95616bae42a45c1786e8cb98509e9f3123926ce354f29fd09aecd8868
 MISC metadata.xml 715 BLAKE2B b611d7f5a8ad31e43b744dec6607293165c3e60a901b3598d62859a6d65852c9369429c090e557a970320947557ab5d3e418ecd0a39b0b1ae7a77384e6202b28 SHA512 43cd54bb88313ef72649034afbbde262917d6aa390eb7dd5b1369d851d9dcbed7d0c03169edf0d156ad0351ae7a8e485a20217e6c686b9c6b266303c8ce2b481
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch
new file mode 100644
index 000000000000..fe054eccac51
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch
@@ -0,0 +1,98 @@
+# Nils Freydank <holgersson@posteo.de> (2021-06-17)

+Apply the patch from upstream with minor adoption.

+

+Gentoo bug: https://bugs.gentoo.org/779757

+Upstream Bug: https://trac.wildfiregames.com/ticket/6107

+Upstream Patch: https://trac.wildfiregames.com/changeset/25766

+

+--- a/source/graphics/TextureConverter.cpp	(revision 25765)

++++ b/source/graphics/TextureConverter.cpp	(revision 25766)

+@@ -294,9 +294,8 @@

+ 	m_VFS(vfs), m_HighQuality(highQuality), m_Shutdown(false)

+ {

++#if CONFIG2_NVTT

+ 	// Verify that we are running with at least the version we were compiled with,

+ 	// to avoid bugs caused by ABI changes

+-#if CONFIG2_NVTT

+ 	ENSURE(nvtt::version() >= NVTT_VERSION);

+-#endif

+ 

+ 	m_WorkerThread = std::thread(Threading::HandleExceptions<RunThread>::Wrapper, this);

+@@ -304,8 +303,10 @@

+ 	// Maybe we should share some centralised pool of worker threads?

+ 	// For now we'll just stick with a single thread for this specific use.

++#endif // CONFIG2_NVTT

+ }

+ 

+ CTextureConverter::~CTextureConverter()

+ {

++#if CONFIG2_NVTT

+ 	// Tell the thread to shut down

+ 	{

+@@ -327,4 +328,5 @@

+ 	// Wait for it to shut down cleanly

+ 	m_WorkerThread.join();

++#endif // CONFIG2_NVTT

+ }

+ 

+@@ -477,8 +479,8 @@

+ 	return true;

+ 

+-#else

++#else // CONFIG2_NVTT

+ 	LOGERROR("Failed to convert texture \"%s\" (NVTT not available)", src.string8());

+ 	return false;

+-#endif

++#endif // !CONFIG2_NVTT

+ }

+ 

+@@ -529,22 +531,24 @@

+ 	return true;

+ 

+-#else // #if CONFIG2_NVTT

++#else // CONFIG2_NVTT

+ 	return false;

+-#endif

++#endif // !CONFIG2_NVTT

+ }

+ 

+ bool CTextureConverter::IsBusy()

+ {

++#if CONFIG2_NVTT

+ 	std::lock_guard<std::mutex> lock(m_WorkerMutex);

+ 	return !m_RequestQueue.empty();

++#else // CONFIG2_NVTT

++	return false;

++#endif // !CONFIG2_NVTT

+ }

+ 

+ void CTextureConverter::RunThread(CTextureConverter* textureConverter)

+ {

++#if CONFIG2_NVTT

+ 	debug_SetThreadName("TextureConverter");

+ 	g_Profiler2.RegisterCurrentThread("texconv");

+-

+-#if CONFIG2_NVTT

+-

+ 	// Wait until the main thread wakes us up

+ 	while (true)

+@@ -596,4 +600,4 @@

+ 	std::lock_guard<std::mutex> wait_lock(textureConverter->m_WorkerMutex);

+ 	textureConverter->m_Shutdown = false;

+-#endif

+-}

++#endif // CONFIG2_NVTT

++}

+

+--- a/source/graphics/TextureConverter.h	(revision 25765)

++++ b/source/graphics/TextureConverter.h	(revision 25766)

+@@ -208,7 +208,9 @@

+ 	bool m_HighQuality;

+ 

++#if CONFIG2_NVTT

+ 	std::thread m_WorkerThread;

+ 	std::mutex m_WorkerMutex;

+ 	std::condition_variable m_WorkerCV;

++#endif // CONFIG2_NVTT

+ 

+ 	struct ConversionRequest;

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index db624e2c2534..5fe000993d97 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
index 56829024e05e..499a6a7ec1af 100644
--- a/games-strategy/dopewars/Manifest
+++ b/games-strategy/dopewars/Manifest
@@ -1,3 +1,3 @@
 DIST dopewars-1.6.1.tar.gz 1024168 BLAKE2B 28d650e0d1eccdfa9aa799bb4b35e82facc800ed9cbde9778c7182bd615ad0b1ec7d3fd323473f381f3ed1902b8e305a7994a5e351728aa1028be2e0665bfa57 SHA512 fab27b483b5a24abd95ffe6a52fe92c7179d8ee3e7d27393f0e7c265202781ab6a58e3b3214ff84bbc0e8195644b5c2ec94616b5f63b3fa9dc2ad2f9216e37d1
-EBUILD dopewars-1.6.1.ebuild 1499 BLAKE2B 5630e1358aa39dcbe52df7f88ecd99e7d1f655f50c57d832cd137e0467cfb71a84dd9c5834f49bfc475b89f58f7674c0eabdbdf312bd3450692c6e6d70201dbd SHA512 2af517fff53cc61a802a9109b6ce5aa1dca32665e84143e841ed5f29c342f35ead91fe9c56ec0f4f7c42c8e9f4497ee7865391766f7378e540278d1d99342fa0
+EBUILD dopewars-1.6.1.ebuild 1508 BLAKE2B c57696df71eb48c9263e612676521cd3ce8cee5b5dcfa6ff4e1aaf9eee4c06e7269920de771cb951f7fe21db7166ad03c9ea4c17971fdb4d372779a496ae176d SHA512 c7b656eb2487eb30048e4476545aba4bca90fcb7e081ac1bdcef50c17065dce425fc4adc98dbc0a984a9e1209a32264cbeba2c58f5d293a0ca772e7fc5f14c84
 MISC metadata.xml 331 BLAKE2B af8487e0de1082dcc36415bf1216b7fcfdf35a3caf93fe3e5a0f40de32978b442eac43dfc7283a82a5403e5abfc73ff2b48ee6fce3b489a6fbc88529c4db28ab SHA512 26259f05b18c933c638d693805a106d26288c96ba220a719d8ec12d65b28c9abdb1d120694d31c07194282081e92dd83522e936771ab71e2ce86ea12d629d5b4
diff --git a/games-strategy/dopewars/dopewars-1.6.1.ebuild b/games-strategy/dopewars/dopewars-1.6.1.ebuild
index 0ad7abd73123..d4b332bb8b2d 100644
--- a/games-strategy/dopewars/dopewars-1.6.1.ebuild
+++ b/games-strategy/dopewars/dopewars-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,9 +25,9 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS NEWS README.md TODO doc/example-cfg doc/example-igneous )
 
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index 4cfb3be024fd..39b3b81429df 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,5 +1,5 @@
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.10.1.tar.gz 124693099 BLAKE2B d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4 SHA512 b28a8bdc2428778480ff8404ad7d84153939f4f8b4a75f51775354e3e563f7f309d479e499ea1be8b57822d725cc57ece8dd14f2e40360ab6c07d70c917bc256
-EBUILD freeorion-0.4.10.1-r1.ebuild 1595 BLAKE2B c723ef7d4efe7f26f1516fc6c6752c8ed96a891934c5b24bfbf910627a0b147654e5acfa12605b837f6e9e04a67915f11320d96a3b3e3c49f93a7ce9d5f6b43a SHA512 457f66ea7edb98b78dfe305177ce8c5e5aec523bb8a0b06b37511d4510df9e9a0ff2fdcbe1f205eb9e62731be6b3ec915801138a44545f9bc4a372eb1d29ed75
-EBUILD freeorion-9999.ebuild 1595 BLAKE2B 832543a185b569a5d2934365cf679f6464130f04f85291b09707e61b867601fe6a71415751953d324d09beb71057bdc6530497326bedffb63ad16442d3c1595f SHA512 91aa00149560d25933d1927c7729bae86222f7471021dcad9ebede08cc862a4140f115c6adac966c6607d1c72f94128d2b9ae4a10a6daa7d7f6c1eabf7c0a343
+EBUILD freeorion-0.4.10.1-r2.ebuild 1600 BLAKE2B a3aaddeb51fbfd00d210107e51f6da08ebd24f78bc662c73c671d73667f82f098a978eccf8bdffcf602307c595f88ac6d837549cd18f83b827f8828539171f9d SHA512 b5cee9fc8f7977b711aba401829dcced27689bbaa0a27fba17d543725fce61eda3b6e1e1b0d2a19ff7c6ee5b0ca63c081a0225faa0752e0651e785124841b0bc
+EBUILD freeorion-9999.ebuild 1600 BLAKE2B 6ef0ea16fcf04c612b380f3e4a3a88f0086db93058588ea693a09ee17a9e8ec2284039a2b0e6ab6ea7af45c127897711d32f86d12ed88ad4905e655b0388b5aa SHA512 44f86c74c5db7814f9544e501df12473f169bf9fbbadf62159a25ac28e3108c23a043ccabd599d6f1f25ecb5dd8f72dc567adbca1a791037c84f28b7e1516251
 MISC metadata.xml 684 BLAKE2B a35a60f214e503d3338a2207ba7657734fe1dfdfb31b66af255148f0ac8ad83e4a2c70c5e8bed10f8e7cef22456d05b3def6ba1b48621cd0bdf2ab05faba68a2 SHA512 c672ca681068ddb098a09c2cdeea572b207cf7612008c909914b224c613e9152b2741533bf25d87c0d3fd0dc2fcb4817dea20bd132075f23b0482ec77f0bf18c
diff --git a/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.10.1-r2.ebuild
index 9cdce45d2d21..8fe0bd67b884 100644
--- a/games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.10.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.58:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.58:=[nls,python,threads(+),${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
@@ -46,7 +46,7 @@ RDEPEND="
 		media-libs/libsdl2[X,opengl,video]
 		>=media-libs/libvorbis-1.1.2
 		media-libs/openal
-		sci-physics/bullet
+		sci-physics/bullet:=
 		virtual/opengl
 	)
 	sys-libs/zlib
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index dc0896abe664..afe458a3f79f 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ BDEPEND="
 "
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.60:=[nls,python,threads,${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.60:=[nls,python,threads(+),${PYTHON_MULTI_USEDEP}]
 	')
 	!dedicated? (
 		media-libs/freealut
@@ -46,7 +46,7 @@ RDEPEND="
 		media-libs/libsdl2[X,opengl,video]
 		>=media-libs/libvorbis-1.1.2
 		media-libs/openal
-		sci-physics/bullet
+		sci-physics/bullet:=
 		virtual/opengl
 	)
 	sys-libs/zlib
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 06e1494dfd24..bbfd4df18049 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -4,9 +4,15 @@ DIST uqm-0.7.0-1-source.tgz 1591613 BLAKE2B 400309aced671a23bf325b95bb471db2e5b9
 DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56 SHA512 e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
 DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348 SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
 DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625 SHA512 693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80
+DIST uqm-0.8.0-3domusic.uqm 18980671 BLAKE2B 56e2eb59026fb039e068206d0490e2449e95500c78b7aad6bf2f0e639332bbc207eea6942d89b841f5cd96b506936fbd9070fb52f00bc7034a5eeddac07da235 SHA512 23704a1f2ee5818aed2fa6e7e69252d0f101b2e9ce03ce1f2904d3d3bd28397287e983baebffacec34d149b7e0427294c9e42fc003f3e32d2e760de67b557ab7
+DIST uqm-0.8.0-content.uqm 11547353 BLAKE2B f68f880e194390770dcec230c00053422cd9968486cd8918012c348e49ef925dca1cd4487fb426003d4be8e30966467603e8d57bf7e0c2269e1400e909e7e1c5 SHA512 52219d00cae79f0184119f6c1ec66c1e41539b40540b7e59baf225d42708a8b54b56368497129e5dbf20a77379fd36aa7d4f019cace90b40f3029e98b03eccd3
+DIST uqm-0.8.0-src.tgz 1611401 BLAKE2B aa7363e42c0d4cf0d3ed09e1fdb47b417dc440e22bffbb208d815f096975c95c7284aa222b3f55464b35df90894d59d5c571bbb4d3b9258c68b6043dbac22305 SHA512 7e964aaccd69e2d775f9e5f42a01b40b2b6d9188741330e56ecaf3888a664b33aa4271418081b7a9193a093e9fa466c947e08a6931c6b91797005a0093f19217
+DIST uqm-0.8.0-voice.uqm 115164704 BLAKE2B 957ea3bd0c4ab2b0d59af249faece5641dd763c219c56e73baf825f36cc09a5d72c9da1707ae3b43553577f3051527da013a494a580e73d2f673896e64936467 SHA512 5735087284931d593e76ef7429f0dd1da792f51d0c623574284795199c2a1ff3f2664ad931149a49bfdb756457e704dc6fefa08fcc6b9ffdc63f3916627abd10
 DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814de017700d7e6dcb1a065dff2a37d47239fdacbb2ba7639a788d795ac45579952aa7f78b760aa9dc8e3aa9d2ccde SHA512 fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
+DIST uqm-remix-disc4-1.uqm 87927958 BLAKE2B e1a603b07bb4d0535ff69fd7ef5f85f71cacf4fe4c95d559228ecac0a925ff4fa5f2117955e3477fd14facbfd0881994929a3f3cfdd8f62eb70d9e4314728fa6 SHA512 93030505d7dfc0f9de1f5d8c2a26c07b67540d67202ccfb71f6223730fbe92285011bd76dba8ff751d3e28025489a51d4804947164f9118a8e0bb742fd7803e3
 DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
 EBUILD uqm-0.7.0.1.ebuild 3025 BLAKE2B 32b12b00bc7b779279d8e776035261ced811dea61e3a6b8494a5034234622060c8c23bd527dba58f9cd5af3fe761986e54716f2879153c12c4dd96125a15eef1 SHA512 269799cf4839bf20eca5ee277f26de944dcf28cd6cd37c5b2c8143db54cb3bf4e53b8e8e2a72e365cc1b2ceb4a047a4822a40c3a398d8121adc918b93af1b443
-MISC metadata.xml 572 BLAKE2B 154cfbc9c11b74fb658a2e8b494e394f1924291e2273e0fef3346471c9059adf42e819dbf795aad3fdf4296a272e149cf46a8502a195b6bb97287c7b0c548409 SHA512 cd21d5260e39857374bcd1795f2cb2c158104ce865cd9c091202bab404f8133b547d0ba8e7a2580a0177ee1b97de31bdf1b0658f0b20860d70585ecb85bd49b1
+EBUILD uqm-0.8.0.ebuild 2147 BLAKE2B 9cf1cc895dd9cf18f889a08578844a3c61af81a929e74fb3a6b3fc892e094cfb90ac8fe6cdeed562e94a0db26d1849a85c3dde05c6cb0f4ece6a6449e28d27f3 SHA512 d3e0df25b779f746384421f4da3e656a9904e9f8d5b0129f143c09e9757e12438d47717a17e93eb38bdc05a0b8d60a6c5335a527e3e14a0144bd1f9d51ec8fa8
+MISC metadata.xml 561 BLAKE2B e68a86e394ef6ff93af35c4742528507522ed95426a86a327a24771ba05e899c4abab41fe0cb7d0461bfeac2212bc402a043d9348b245fc64f092ac8e2fdd8a5 SHA512 430cc397d8246de7a25da2b75953806d24505e8f9abd388491ecedb1d53f6d198b4dcd302de9a2603b9486ec70f85f5a57ac94833ac02dd772fb2cda9287a99e
diff --git a/games-strategy/uqm/metadata.xml b/games-strategy/uqm/metadata.xml
index 0a1a6fc92acb..9695c0c1152f 100644
--- a/games-strategy/uqm/metadata.xml
+++ b/games-strategy/uqm/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="music">download and install music files (large)</flag>
-    <flag name="remix">download and install music remix files (large)</flag>
-    <flag name="voice">download and install voice files (large)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">sc2</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="music">download and install original 3DO music files</flag>
+		<flag name="remix">download and install remixed music files (large)</flag>
+		<flag name="voice">download and install voice files (large)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sc2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/uqm/uqm-0.8.0.ebuild b/games-strategy/uqm/uqm-0.8.0.ebuild
new file mode 100644
index 000000000000..084f28188da4
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.8.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multiprocessing toolchain-funcs
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/sc2/${P}-src.tgz
+	mirror://sourceforge/sc2/${P}-content.uqm
+	music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
+	voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
+	remix? (
+		mirror://sourceforge/sc2/${PN}-remix-disc1.uqm
+		mirror://sourceforge/sc2/${PN}-remix-disc2.uqm
+		mirror://sourceforge/sc2/${PN}-remix-disc3.uqm
+		mirror://sourceforge/sc2/${PN}-remix-disc4-1.uqm
+	)"
+
+LICENSE="CC-BY-2.0 CC-BY-NC-SA-2.5 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="music remix voice"
+
+RDEPEND="
+	media-libs/libmikmod
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,sound,video]
+	media-libs/libvorbis
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat > config.state <<-EOF || die
+		CHOICE_accel_VALUE='plainc'
+		CHOICE_debug_VALUE='nodebug'
+		CHOICE_mikmod_VALUE='external'
+		INPUT_install_prefix_VALUE='${EPREFIX}/usr'
+	EOF
+	#CHOICE_sound_VALUE='$(usex openal{,} mixsdl)' # experimental and segfaults
+
+	sed -i "/^PROG_gcc_FILE/s|=.*|='$(tc-getCC)'|" \
+		build/unix/config_proginfo_build || die
+	sed -i 's/-O3//' build/unix/build.config || die
+
+	# use ${T} not to leave build files behind (bug 576098)
+	sed -i "/^TEMPFILE=/s|=.*|='${T}/uqm'|" build/unix/config_functions || die
+}
+
+src_compile() {
+	echo | MAKE_VERBOSE=1 ./build.sh -j$(makeopts_jobs) uqm || die
+}
+
+src_install() {
+	dobin uqm
+	doman doc/users/uqm.6
+
+	insinto /usr/share/${PN}/content
+	doins content/version
+
+	insinto /usr/share/${PN}/content/packages
+	doins "${DISTDIR}"/${P}-content.uqm
+
+	insinto /usr/share/${PN}/content/addons
+	use music && doins "${DISTDIR}"/${P}-3domusic.uqm
+	use voice && doins "${DISTDIR}"/${P}-voice.uqm
+	use remix && doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4-1}.uqm
+
+	dodoc AUTHORS BUGS ChangeLog README WhatsNew doc/users/manual.txt
+
+	doicon src/symbian/uqm.svg
+	make_desktop_entry uqm "The Ur-Quan Masters"
+}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 776060ae499c..2cde56868807 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -2,6 +2,6 @@ AUX wesnoth-1.14.14-ar.patch 576 BLAKE2B 5cc3995992f9e92f1179e502d8cb3981191953d
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
 DIST wesnoth-1.15.12.tar.gz 509770568 BLAKE2B 6bdbbb132938ff1fd8c47fee8fd7311176e442c96261fafa4a2ba75798a87422f38dd1e6b9547828d5c86332473d03a82f923bc5070e65777ccc60046d949b27 SHA512 a8e104154cf91cb3c2d0d053cbb56f1b59f71b6a05510d49d1ee81368f2b8782ceceef37dc3961925c7d54b5bca6c649c8993cca0d4b9dc179fa3309827b7a59
-EBUILD wesnoth-1.14.14.ebuild 2521 BLAKE2B eed169278bb7feb737d6997615bfab6a4abbf183e43c7f59bf4b7667f2b4cd70a5857f7bb8bff57fb082ed17f4aa9b4b2f2dff802d08536eb99c550149d4190a SHA512 a3e85f6b21a0476e804cee297bab2453a23d312bc6781e4d3b0f8e0e869cf1899674d0219c323f20d5e93505923b774fcf57e22e488425b00c924ee1afea9731
-EBUILD wesnoth-1.15.12.ebuild 2395 BLAKE2B 26b68f327f794595c02550569cb5a2b0c3913edd9561c7e7541f82a0ab4033d029476badece44eb16de69beae97d8c04241db31f49d84b3197d0d35bd12c0d8b SHA512 18d9aedebb8c0831c0974e9195007c0c0ab24579362358bc3017fe5f0791eecf997c5b389835eccd926dc30f2397ccbcbab52ad13758fa715b974186f762d5c6
+EBUILD wesnoth-1.14.14-r1.ebuild 2524 BLAKE2B e53ddf2cac6ffd8d95edd0708e00c595e2ab9f015ff98fb314e85683d1f2a42b76ceff356095ae70d010694baa6343dc8c99341c38ea260c624a20f7b847e321 SHA512 dc3e7c29bb2273d175b899b82c95499dfb44e9f167bf1e1990fc5da4fe8c27b4e409534efbb3217267c581c9453ecacc9a3fee8e1c1ee704a550136a9a2a0f27
+EBUILD wesnoth-1.15.12-r1.ebuild 2398 BLAKE2B abb84a62f80cf5d3626bc746b3aa4a979adf861000fdfa0febfb770d5e02cd18f2ba29e65fe0ce2216dea4bef2f0182729e291d3aafd15ce82897145ecdea8f4 SHA512 60a332db8e75b1a1b6a6a0bc5d2640d0fa433432963bc96f6507a2af5865718a73ed70993ac58dcf4d5d419bf9e64cc4476369196d4e5eb661a9692b1b18f7ef
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild b/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild
index 925a360324cb..4350dcbc1a9b 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="dbus dedicated doc fribidi nls server"
 RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
+	>=dev-libs/boost-1.50:=[nls,threads(+),icu]
 	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
diff --git a/games-strategy/wesnoth/wesnoth-1.15.12.ebuild b/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
index 420f1980fb1c..8c511175a73b 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.12.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="dbus dedicated doc nls server"
 RDEPEND="
 	acct-group/wesnoth
 	acct-user/wesnoth
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
+	>=dev-libs/boost-1.50:=[nls,threads(+),icu]
 	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
 	!dedicated? (
 		dev-libs/glib:2
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index f4575b612cc8..da2f807de937 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -2,6 +2,6 @@ AUX widelands-0.20_rc1-cxxflags.patch 1060 BLAKE2B 1cc356c615037ab293877a2f65a3d
 DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
 DIST widelands-build21-source.tar.gz 381374149 BLAKE2B 17f0491bf7bcd10449bcc274be94aec4a0a64625c19f52426a0d460c3356e04a59b51683e72b4492ba1f62bd6ea510250c3cedda89a7588b88a0071abb1cf0cf SHA512 8d36bd0407a72e4e221155121f9ab4ce7fdfb6d81ca70a2772baf12c3397fc6abbcad5006336adb471d2c5127a90b4cda735e941d69cf779be1f923d4a38960e
 EBUILD widelands-0.21.ebuild 1294 BLAKE2B 83dd55f08b40846aa9ccbe6ae4a1a77fe70e4e700978922b2642d5ed1cc19b03300fb5b1ff4046a5c30a1f58b5b799201b93aa5799517099bec4d4d0b642fc8f SHA512 d056e4c495b2279d1d95bdb5e3cfaf141b949c5db661783c08b204e7214e6a73cc780b00c04e93fe813350da3d70dc9b961e71f924a07a2439aca952cb82a475
-EBUILD widelands-1.0.ebuild 1357 BLAKE2B 569d0090f1af86933decd1a94000198ebee6249cc9540ed6a29a969df400cb212cb3bf78b4ef47e98dc64269b369073885ed886183ca8762425c1ab53c4cc671 SHA512 3cb9ee60a48c922e1584a75ff255f97ea91c829c0be012c99ed857fb09deb1c7254c4bc2644249df8622a2a1c8c161c1dab28c35591b9347d967889e21a8e3a7
-EBUILD widelands-9999.ebuild 1357 BLAKE2B 569d0090f1af86933decd1a94000198ebee6249cc9540ed6a29a969df400cb212cb3bf78b4ef47e98dc64269b369073885ed886183ca8762425c1ab53c4cc671 SHA512 3cb9ee60a48c922e1584a75ff255f97ea91c829c0be012c99ed857fb09deb1c7254c4bc2644249df8622a2a1c8c161c1dab28c35591b9347d967889e21a8e3a7
+EBUILD widelands-1.0.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
+EBUILD widelands-9999.ebuild 1299 BLAKE2B 1e8aabd7763e7956e7fcc6cd6526d698e463c563d18f0ce333b40a1230d05b92eec849837dad41fb303b4711ce1dbe115fe83bdd200578a0b2af10e4d0b7b82a SHA512 6f39ef1467065f4430fd66c3dc7350fe242150e34eec238dd9f19fcc3ab93e5a7a1f7f2d04b15694d0d4603caf503fb29d02c76852fe0b201185f6b5f1b05e3c
 MISC metadata.xml 389 BLAKE2B fe4a764c97dea6a413ad64f616b14f041d94682a5bbb92f02c07506f1c727c1c391fc1beae37c01bd16471a765d8ff5c96badfbfac2ab6647c88db4afa59499f SHA512 4192abec8b668283343c9066c80d89441f7a9491078589a792e9584ab1b9195f443313434350954979acdbfa23c8c048557e1884d18d7d0cac90d63919758dfd
diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
index 180526607235..6b04bc906390 100644
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ b/games-strategy/widelands/widelands-1.0.ebuild
@@ -42,10 +42,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
-)
-
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"
 
diff --git a/games-strategy/widelands/widelands-9999.ebuild b/games-strategy/widelands/widelands-9999.ebuild
index 180526607235..6b04bc906390 100644
--- a/games-strategy/widelands/widelands-9999.ebuild
+++ b/games-strategy/widelands/widelands-9999.ebuild
@@ -42,10 +42,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20_rc1-cxxflags.patch
-)
-
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"