gentoo resync : 29.01.2021

12 files changed, 26 insertions, 197 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index e07540d33f3e..ca47dc3a6580 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index 3ea59dee6d5b..354fd9d8c98c 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,8 +1,4 @@
-AUX corsix-th-0.62-gcc-10.patch 241 BLAKE2B 78ab7aebd36fe16b63e111f459f324f3165a3df99f29771584c074fbd7fa29849e9e9d66b55592340b6292a48006ab003f2f09a767a58e5f40fe9630eae25075 SHA512 a85c8613ab94903db4b42f74c326620f81c6f9212a78b42e656b57e00c455fba7c457469e07c7ab9a144032e7d3aa244fdc269c3aa520fdbd9bf4c373fd766ed
 AUX corsix-th-0.64-cmake_lua_detection.patch 288 BLAKE2B 90673498871c16f48c752c5581dfec0a290966ef0ec79c977b69575b26a22843829679a7c0225caabe2b570b9b6a38e025115f3a2cf0597b0dad9dc78f01f36d SHA512 52dc61c7aa8c170da225801f2eb06140e9dc28c4d55853eac99b573475a21fb03b945de676898719927abd517b34ecce2aa5c4998ac6e6fcc673cf2aaf7cdb9e
-DIST corsix-th-0.63.tar.gz 4040119 BLAKE2B a700264c21377d53fb031c57428e5a50bbef426f32a3cd8bc4f83174a7f12b76d72050885ae257a6017a03f2f9611106cf9226c606ef726c1220b997eacbc5f1 SHA512 73a170bbf3da0e11ffe30fcbafb80f9e3852ce992dd6ecae2a2da332b9d4927a98efb0208e2056918a4100db54d1bdc564454cadae370cfab87625ca3f9889fd
 DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B 2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe SHA512 c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
-EBUILD corsix-th-0.63.ebuild 1314 BLAKE2B 7dbb0afc14be51a70fde1630be9c41249623019123d03008d65f2d163a884f4d81fcfb9738f51f34dafaef02d48566a08e6ffc23e82111746344109897c8abec SHA512 175d20ab2a78cec92982a4a337670243d1281ba0f5ce95e0c5f68240e3634fca20d4ccd9897739d87d46e821bee8e5e19f1ebbbb4bac0ef6231ad95cc7928f6b
 EBUILD corsix-th-0.64-r100.ebuild 1954 BLAKE2B 10cc84893f919fab0639b986956fc5ac503b15fb948549a71f581b96ab3c62f0deb163729c729d656aa9c868a6e0c33710836a0f02a98bb137782204347c06f0 SHA512 b46c422d3e28c50d416fefa5b0c9de5865fb2825c27306c9dc09eb570fbc363af8214710dd9a96713d20dfc740a012b1f99aafd8cefc35789ad0b86754a2e2e5
-EBUILD corsix-th-0.64.ebuild 1262 BLAKE2B dfc654c386e0fd18f4117c357d43652b75c2c152f59794d9ed20f84eb3604f51bd26503596819a26dfac31e3cda622bebe44c05a5733f31ef5220b64a09441e9 SHA512 5cc2438eb9a63d6ed3f2fb92d9a07f4587b3c3b187b9834edea1b2f3b4ce8bfe5e7538e8e839b23dc87be5af18253d4f6e1d8db079acd5be32dfcbe78b90cff9
 MISC metadata.xml 716 BLAKE2B 16fe66f9f3fce58b6b17df3906fdcf4e9b7a9a49be872ba69cd5deeb47bffca495ff3a8b8c89fc71cbe8b3960954a462aff8c10c6afd34c18acef95931c382f8 SHA512 643ef59451c07fd3e61b22fb9891cc2478dff78c1e2a50ed455b15bf1c01e49d384af177c687e48b2bd6590278ac121458a94760a25bdc064ce309ff5ab3b868
diff --git a/games-simulation/corsix-th/corsix-th-0.63.ebuild b/games-simulation/corsix-th/corsix-th-0.63.ebuild
deleted file mode 100644
index 9a427ca8e030..000000000000
--- a/games-simulation/corsix-th/corsix-th-0.63.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="CorsixTH"
-MY_PV="$(ver_rs 2 -)"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="http://corsixth.com"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +midi +sound +truetype +videos"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0
-	>=dev-lua/luafilesystem-1.5
-	>=dev-lua/lpeg-0.9
-	>=dev-lua/luasocket-3.0_rc1-r4
-	media-libs/libsdl2[opengl,video]
-	sound? ( media-libs/sdl2-mixer[midi?] )
-	truetype? ( >=media-libs/freetype-2.5.3:2 )
-	videos? ( >=media-video/ffmpeg-2.2.3:0= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		 app-doc/doxygen[dot]
-		 >=dev-lang/lua-5.1:0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.62-gcc-10.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AUDIO=$(usex sound)
-		-DWITH_FREETYPE2=$(usex truetype)
-		-DWITH_MOVIES=$(usex videos)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-	dodoc {changelog,CONTRIBUTING}.txt
-
-	docinto html
-	use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
diff --git a/games-simulation/corsix-th/corsix-th-0.64.ebuild b/games-simulation/corsix-th/corsix-th-0.64.ebuild
deleted file mode 100644
index 78a3d26cfd7a..000000000000
--- a/games-simulation/corsix-th/corsix-th-0.64.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="CorsixTH"
-MY_PV="$(ver_rs 2 -)"
-
-DESCRIPTION="Open source clone of Theme Hospital"
-HOMEPAGE="http://corsixth.com"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +midi +sound +truetype +videos"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0
-	>=dev-lua/luafilesystem-1.5
-	>=dev-lua/lpeg-0.9
-	>=dev-lua/luasocket-3.0_rc1-r4
-	media-libs/libsdl2[opengl,video]
-	sound? ( media-libs/sdl2-mixer[midi?] )
-	truetype? ( >=media-libs/freetype-2.5.3:2 )
-	videos? ( >=media-video/ffmpeg-2.2.3:0= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		 app-doc/doxygen[dot]
-		 >=dev-lang/lua-5.1:0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AUDIO=$(usex sound)
-		-DWITH_FREETYPE2=$(usex truetype)
-		-DWITH_MOVIES=$(usex videos)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-	dodoc {changelog,CONTRIBUTING}.txt
-
-	docinto html
-	use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
diff --git a/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch b/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch
deleted file mode 100644
index ff820f44946b..000000000000
--- a/games-simulation/corsix-th/files/corsix-th-0.62-gcc-10.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CorsixTH/Src/th_lua_map.cpp
-+++ b/CorsixTH/Src/th_lua_map.cpp
-@@ -26,6 +26,7 @@ SOFTWARE.
- #include <cstring>
- #include <string>
- #include <exception>
-+#include <stdexcept> /* std::out_of_range */
- 
- static const int player_max = 4;
- 
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 1630764b69a1..c35350ffd3ec 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,4 +1,4 @@
-DIST FlightGear-2020.1.2-data.tar.bz2 1954932485 BLAKE2B e3f06ed6a36d2cfc6518f4a1cac4aaf28df2b7e1fb4720488dd38f3df7dfccb1cc9b48e0f216fa79db5fc3b380dcdd1161325ba0195cc14aadbc2d79fab39031 SHA512 16329d230f8cfd35dbd60aad0afc66225134e5c2f98abb89ca271837f04917f6aa876fc35868783a3a3d56c4ba1d25f429436de516a8086f4b7e296a0d352e03
-EBUILD flightgear-data-2020.1.2.ebuild 413 BLAKE2B f6358e3875cf11848406d92c0c5c98b1934ec83ba2decc9c67696328c7315b114cec9e6f06336662555b22aec7bca4ca5d971fe5968ea8a8dc7b74e0b01aec0a SHA512 9c596b8da0064d9758533fc8625901acea96cf16fa387a620ffe5e58455886c784a9c8586a5cdcd996180f3874e2a2319ebe37f555beaf0c5901fa275a98a033
+DIST FlightGear-2020.3.6-data.tar.bz2 2009894075 BLAKE2B 5f8ed7c7290ede6c4b0a902d3d3ace515c2713ec237542c7f3537bfb48d99e480958344b8b5897e350ef800258408a2fe9c3058786c522402e4d88b18dfd5a72 SHA512 d29ff4feb72be167b57b9baae461c810aef537085084bfb0c0ffbb2d1575ced38a951478fa1fd395c219919528af7e050a6c5199c337592cf607da5a3c682017
+EBUILD flightgear-data-2020.3.6.ebuild 413 BLAKE2B f6358e3875cf11848406d92c0c5c98b1934ec83ba2decc9c67696328c7315b114cec9e6f06336662555b22aec7bca4ca5d971fe5968ea8a8dc7b74e0b01aec0a SHA512 9c596b8da0064d9758533fc8625901acea96cf16fa387a620ffe5e58455886c784a9c8586a5cdcd996180f3874e2a2319ebe37f555beaf0c5901fa275a98a033
 EBUILD flightgear-data-9999.ebuild 441 BLAKE2B abb508976894bf77fe2fa60c817920481a5dc0487a1379e71ff3104b9ca8cbe19953adc5f4a14ff5a74a0e6900fea89741b446137664104daf8eb119508225da SHA512 f0c40c5eff961a0d8680cf844a1fae4eff777469ae0fbbf9aed6ff088db1ae85a95b6494c7d06539b697d317a4567c534fd8bbe2173f6516e7747d58baded284
 MISC metadata.xml 445 BLAKE2B a66be5a62283a2a7c8c086ad4d0cfbce8e1c7bdcd890e39fef504821b8eb01facc32f36afcdc4c62544bbc1b5c5b49e8a752f8b42dcbcf7adeb50b0cb5fd7afc SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild
index d5d9b4976641..d5d9b4976641 100644
--- a/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 0762a32699de..45cdf91389eb 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,8 +1,7 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
-AUX flightgear-2020.1.2-boost.patch 302 BLAKE2B 8abe7fc003ec905ed15983ab68672235ffd5f69a411ad4dd62f2f02dea9a72144d4e807e770fee6108bee865f5020da7e21c1b4a683a197e7f18072932347dfb SHA512 62ff4c8b77ea006ea881e8ff1b691a0f67c564859db52ab213ae833d41ae1fb71b73982a5ccc3ff0aa8d37b57679c70cae6521200b0432489471c151769b9538
-AUX flightgear-2020.1.2-cmake.patch 2064 BLAKE2B ca5f3e0f2aae4b8ccc3ec6504826a045ada095db234cf98e593b0303b530d18d5c6199fd128702b72ec7b94fff3714ee567744b928fe4a02fb195fba6a0d66d8 SHA512 fd208f009d81827108dd2f0488152c63a7d1e4f53bdacd5b6ac29f6c4b8bcfac5a22bcb49bd88a21daf61cccf2cc3362072d0f98be41a59f29239fed3b3f3e0a
+AUX flightgear-2020.3.5-cmake.patch 2031 BLAKE2B 2e0bfefca54a43db8b1053d1798de84594fcc58bc442df7c3bf0347f5ed458cbe966ce35af3e57f2982f6f7bb23943e04c4c21d421ca076d101ee0dc223b764d SHA512 bc06cd08564032f88206acb5cabb1c07e666aee72c2a0d5e19aaa82ca49ff4347a3a17b3e2d0f158398d6fb0006a0ab8deb9eac38d4269e0bbd9ed9b2e7e2724
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c
-EBUILD flightgear-2020.1.2.ebuild 4408 BLAKE2B fe573ff0479c98b739f0c36e9fb6b4ef6a8fa40ef5fbc5224cfe2b36a206b1e9a049c78c27a088c50adb40f88932823fb9b7156ac91a2a78db63b48dcbbc7d86 SHA512 a498f4fffd802ee58f2dab0fcefa6813c8b347a7d1fcbdabf727a6d8890d39d908a5472de751e7b0cac5cf8ca515e65489e9d271ac462f195e14369db1b53aa2
-EBUILD flightgear-9999.ebuild 4427 BLAKE2B d4d37beab755c928663f8c162a4b2bf46027f020e18507eddfc1038b93ac90f1419f125694acd619d106213f484d978f38e54be5e5f5e601544c4ed9bee18a0e SHA512 528945be4b75b80b297850b1b160e45568271183ca463d0794ad21060c69b5715b1c92d5406f84e0b00998247bb90cd37dc45b152a7408951ef8c7e0e6ee4be9
+DIST flightgear-2020.3.6.tar.bz2 8837251 BLAKE2B 28b8032bd2b6da91f72ae19d4c0c3a6d38122ec2ce7e2e8d1bc3022003551c6c5887711d67868fd9546d79eb6def6c0f0571e62361e73deb6f0edc9c3159c8fa SHA512 b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
+EBUILD flightgear-2020.3.6.ebuild 4311 BLAKE2B 3541b75b3207f3797731eb34b4e66c58ecc91dc9c0032f2bc87df8229699fad84cb05716d974b11dc52013ca745ac03971346ac3dba3a595047db765a44569fa SHA512 fb000a0b52607725a1036ef4b934c013fd96a2c3391bf71fbda89fd3004fb4676d4920839fbefee0b00b6e2c159ae8599688dedffe9583146586092b739546f3
+EBUILD flightgear-9999.ebuild 4361 BLAKE2B 280da54950e30e196699998d2e7476463c456f0a8856b73a49fce5c72635c5d3c526d5dfdbc9f8cda98cba27328609cb7382aca9f60ecaae768d023728cee84e SHA512 c77ef924e0c401183ec31993bc6556ee515526147cbfc316250d9eef0f17fac4600b0221a9a4b6db88c7ba68920536dd4e9b5e74da6b6660610f86056626c571
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
deleted file mode 100644
index 43e2a7d0cb13..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -515,7 +515,7 @@
-     set(NOMINMAX 1)
- endif(WIN32)
-
--set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
-+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
-
- # append the SIMD flags if requested
- if (ENABLE_SIMD)
diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
index f463c458b5a0..0af961beacdf 100644
--- a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
+++ b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
@@ -1,18 +1,18 @@
-diff -ruN flightgear-2020.1.2/CMakeLists.txt fgfs-my/CMakeLists.txt
---- flightgear-2020.1.2/CMakeLists.txt	2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/CMakeLists.txt	2020-05-31 13:56:41.745941586 +0200
-@@ -367,7 +367,7 @@
+diff -ruN flightgear-2020.3.5/CMakeLists.txt fgfs-my/CMakeLists.txt
+--- flightgear-2020.3.5/CMakeLists.txt	2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/CMakeLists.txt	2021-01-24 01:36:57.547695230 +0100
+@@ -373,7 +373,7 @@
  ## Qt5 setup setup
  if (ENABLE_QT)
      message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
--    find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg)
-+    find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
+-    find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick Svg)
++    find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick)
      if (Qt5Widgets_FOUND)
          message(STATUS "Will enable Qt launcher GUI")
          set(HAVE_QT 1)
-diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
---- flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake	2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake	2020-05-31 13:55:33.484421108 +0200
+diff -ruN flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
+--- flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake	2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake	2021-01-24 01:35:31.298263659 +0100
 @@ -33,15 +33,8 @@
  
      # PkgConfig::DBUS target
@@ -31,15 +31,15 @@ diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMak
      endif()
  
      if(FG_HAVE_GPERFTOOLS)
-diff -ruN flightgear-2020.1.2/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
---- flightgear-2020.1.2/src/GUI/CMakeLists.txt	2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/src/GUI/CMakeLists.txt	2020-05-31 13:56:41.745941586 +0200
-@@ -137,7 +137,7 @@
-                             ${qml_sources})
+diff -ruN flightgear-2020.3.5/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
+--- flightgear-2020.3.5/src/GUI/CMakeLists.txt	2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/src/GUI/CMakeLists.txt	2021-01-24 01:40:02.008618256 +0100
+@@ -142,7 +142,7 @@
  
      set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+     target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
 -    target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
 +    target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore)
-     target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
  
-     add_library(fgqmlui QQuickDrawable.cxx
+     if (ENABLE_QQ_UI)
+       set(QQUI_SOURCES 
diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild b/games-simulation/flightgear/flightgear-2020.3.6.ebuild
index c472dcc0fa53..23f6c894ed34 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.6.ebuild
@@ -64,8 +64,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2020.1.2-cmake.patch"
-	"${FILESDIR}/${P}-boost.patch"
+	"${FILESDIR}/${PN}-2020.3.5-cmake.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -95,7 +94,7 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=OFF # see CPU_FLAGS
+		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
 		-DENABLE_TERRASYNC=$(usex utils)
@@ -118,9 +117,6 @@ src_configure() {
 		-DUSE_DBUS=$(usex dbus)
 		-DWITH_FGPANEL=$(usex utils)
 	)
-	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse
-	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
 	else
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 2eea53f95a81..551102d90c57 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -66,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-#	"${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+	"${FILESDIR}/${PN}-2020.3.5-cmake.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -96,7 +96,7 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=OFF # see CPU_FLAGS
+		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
 		-DENABLE_TERRASYNC=$(usex utils)
@@ -119,9 +119,6 @@ src_configure() {
 		-DUSE_DBUS=$(usex dbus)
 		-DWITH_FGPANEL=$(usex utils)
 	)
-	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse
-	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
 	else