gentoo resync : 22.05.2021

6 files changed, 18 insertions, 18 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 18a8730f749e..c413dca1ce9d 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index f07c8091fb2c..37269bb4004c 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,4 +1,4 @@
-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
+DIST FlightGear-2020.3.8-data.txz 1826816084 BLAKE2B 23ca8cc89662d120b21ac68f7d41fe47b1d17bfe3d23579e3a4ce44136e170682939002a5fe03223e9c92329ec737f0dd9e9f9d5d44604f4ff3ade8d957e5c17 SHA512 76f71873d9c017ef53cf8145886ae00163f95769dfe5b69a85d7a3f104358c3c96bd1e958762201716359097976a77a35b204eb0c78526bea3c50d85216b19bc
+EBUILD flightgear-data-2020.3.8.ebuild 409 BLAKE2B f818a83911a28b22811e65c4eb154ce1a23056a2c5a226954c461c0041df94fde90ccde3f8f0b3872b47c624943f071cb70c7534a689a68a036c2d7edd944e4c SHA512 4ae3615be1a1e0c96c27b6853f81315286295371f2481487b6aa42853cc573ebe71105832a322c8e70b90b56105aebbf6393a6e324a9c6777fab027538278128
 EBUILD flightgear-data-9999.ebuild 441 BLAKE2B abb508976894bf77fe2fa60c817920481a5dc0487a1379e71ff3104b9ca8cbe19953adc5f4a14ff5a74a0e6900fea89741b446137664104daf8eb119508225da SHA512 f0c40c5eff961a0d8680cf844a1fae4eff777469ae0fbbf9aed6ff088db1ae85a95b6494c7d06539b697d317a4567c534fd8bbe2173f6516e7747d58baded284
 MISC metadata.xml 445 BLAKE2B 4a12697a57d31ef9d6a709b28845bd9720c1de0450aca5e9fa0e3a1541b7f4fe33b0bd204f074c216fc1d7bb8608337af12e48c3d29f63cc21a6a389dffc8e43 SHA512 68fa64303853c5ba8aacbb4a430705acc7a16cb7ad872935990cb4264dabb878b9c317985ad40c3161396b9c2caa626738ba26f9a7c78c2b0261aa0d8957e723
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
index d5d9b4976641..f6a2970e8ba8 100644
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.6.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="FlightGear data files"
 HOMEPAGE="https://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 632b2c1efc3f..e518e704ce58 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,7 +1,7 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
-AUX flightgear-2020.3.5-cmake.patch 2031 BLAKE2B 2e0bfefca54a43db8b1053d1798de84594fcc58bc442df7c3bf0347f5ed458cbe966ce35af3e57f2982f6f7bb23943e04c4c21d421ca076d101ee0dc223b764d SHA512 bc06cd08564032f88206acb5cabb1c07e666aee72c2a0d5e19aaa82ca49ff4347a3a17b3e2d0f158398d6fb0006a0ab8deb9eac38d4269e0bbd9ed9b2e7e2724
+AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2020.3.6.tar.bz2 8837251 BLAKE2B 28b8032bd2b6da91f72ae19d4c0c3a6d38122ec2ce7e2e8d1bc3022003551c6c5887711d67868fd9546d79eb6def6c0f0571e62361e73deb6f0edc9c3159c8fa SHA512 b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
-EBUILD flightgear-2020.3.6.ebuild 4298 BLAKE2B 76af01fdd27fe1f84d23b713e6cb169be2a38a28a47b92cb97505a5bb5e70cdecf128ed7919bdeef1d771cd042f5dc505afc8fcb059958fd99b2e1eacd37a997 SHA512 3da0fa2bc885a6f9e8a7d4c546e89c572233699b5f017e5453de8aee82e2b92c0e43b94ff9a5b1a6cdb982d4cd1bbe3d5e6c829065aad4826e19e4b9a2499634
+DIST flightgear-2020.3.8.tar.bz2 8922064 BLAKE2B b345e8a5e733d48c1e061feb11ed96f130ab2d4832c478e9251092862668007eb7e39b29720c7274b91d63eff34cb21597fa6384b6837a5949feeceb6db62331 SHA512 b2c5afeae65558bf086ce20b22a2802580b3ac177f049a8df3b70437adbc6fee067673372c19c14a1c10ffac81a4a77fb13c68d342094a84605190fd3f5442e9
+EBUILD flightgear-2020.3.8.ebuild 4298 BLAKE2B dc64fda8fc58eb226d3c7e61c3db1dbca204fda72c133e6ce8ec94b46cd87782df0b576c08f8706c144019af1dab58f59a6763219780eabe0c099d5b0fe5469f SHA512 f63f1bb890db65fc9df7461634f9ae395dadd5d14ece5569e6f87a3aa0c252e634c7ab890a12eb21efa5ba44fb5fcb59412454c89ccdc07d51a3f42d627d9e17
 EBUILD flightgear-9999.ebuild 4348 BLAKE2B 612e0e71deb278b5ccdcff04a815a8fb0813ee0680e76234bec5d55bb1c4368c24fc825a4775f6073423ba66ef02534200ef9d38ed5c24f64e211d8846e414b7 SHA512 ff32d8cf76d6f719b7469919cf3c441653208903b26557e6609871596e45429c4d3a15acd0a720a67e63f80df3bde198d56bc282a3a43a5ae800c72ed7f37f74
 MISC metadata.xml 867 BLAKE2B f628ff317f4137a90a6fc741a11e4afeea7110c9fae89e83371be80f6d0cf4ba25bb88449cc2136792a37f73c9f6fdbbab0103aec0a284193f1b3a72d8022e45 SHA512 a3912a3cd8eacae7a214dfddf9f7a857b88d16bedb7a40c3c464958a83690879e968085c99241146714962927a3adacbec1454eea1e310f8905718ff1f8bf42a
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch
index 0af961beacdf..d89a0df947d8 100644
--- a/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
+++ b/games-simulation/flightgear/files/flightgear-2020.3.8-cmake.patch
@@ -1,18 +1,18 @@
-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
+diff -ruN flightgear-2020.3.8/CMakeLists.txt fgfs-my/CMakeLists.txt
+--- flightgear-2020.3.8/CMakeLists.txt	2021-03-24 15:35:40.000000000 +0100
++++ fgfs-my/CMakeLists.txt	2021-05-15 00:47:36.801503634 +0200
 @@ -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 Gui Network Qml Quick Svg)
 +    find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick)
-     if (Qt5Widgets_FOUND)
+     if (Qt5Widgets_FOUND AND Qt5Quick_FOUND)
          message(STATUS "Will enable Qt launcher GUI")
          set(HAVE_QT 1)
-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
+diff -ruN flightgear-2020.3.8/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
+--- flightgear-2020.3.8/CMakeModules/SetupFGFSLibraries.cmake	2021-03-24 15:35:40.000000000 +0100
++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake	2021-05-15 00:47:36.801503634 +0200
 @@ -33,15 +33,8 @@
  
      # PkgConfig::DBUS target
@@ -31,9 +31,9 @@ diff -ruN flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMak
      endif()
  
      if(FG_HAVE_GPERFTOOLS)
-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
+diff -ruN flightgear-2020.3.8/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
+--- flightgear-2020.3.8/src/GUI/CMakeLists.txt	2021-03-24 15:35:40.000000000 +0100
++++ fgfs-my/src/GUI/CMakeLists.txt	2021-05-15 00:47:36.801503634 +0200
 @@ -142,7 +142,7 @@
  
      set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
diff --git a/games-simulation/flightgear/flightgear-2020.3.6.ebuild b/games-simulation/flightgear/flightgear-2020.3.8.ebuild
index 58c4fd7033ee..d985a68664d6 100644
--- a/games-simulation/flightgear/flightgear-2020.3.6.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.8.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2020.3.5-cmake.patch"
+	"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)