games-simulation/flightgear: version bump, remove old

Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>

5 files changed, 15 insertions, 15 deletions

diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 7064a4008709..3572a6cdaff1 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1 @@
-DIST FlightGear-2020.3.6-data.tar.bz2 2009894075 BLAKE2B 5f8ed7c7290ede6c4b0a902d3d3ace515c2713ec237542c7f3537bfb48d99e480958344b8b5897e350ef800258408a2fe9c3058786c522402e4d88b18dfd5a72 SHA512 d29ff4feb72be167b57b9baae461c810aef537085084bfb0c0ffbb2d1575ced38a951478fa1fd395c219919528af7e050a6c5199c337592cf607da5a3c682017
+DIST FlightGear-2020.3.8-data.txz 1826816084 BLAKE2B 23ca8cc89662d120b21ac68f7d41fe47b1d17bfe3d23579e3a4ce44136e170682939002a5fe03223e9c92329ec737f0dd9e9f9d5d44604f4ff3ade8d957e5c17 SHA512 76f71873d9c017ef53cf8145886ae00163f95769dfe5b69a85d7a3f104358c3c96bd1e958762201716359097976a77a35b204eb0c78526bea3c50d85216b19bc
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 78a719620d54..223daa3527e8 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.3.6.tar.bz2 8837251 BLAKE2B 28b8032bd2b6da91f72ae19d4c0c3a6d38122ec2ce7e2e8d1bc3022003551c6c5887711d67868fd9546d79eb6def6c0f0571e62361e73deb6f0edc9c3159c8fa SHA512 b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
+DIST flightgear-2020.3.8.tar.bz2 8922064 BLAKE2B b345e8a5e733d48c1e061feb11ed96f130ab2d4832c478e9251092862668007eb7e39b29720c7274b91d63eff34cb21597fa6384b6837a5949feeceb6db62331 SHA512 b2c5afeae65558bf086ce20b22a2802580b3ac177f049a8df3b70437adbc6fee067673372c19c14a1c10ffac81a4a77fb13c68d342094a84605190fd3f5442e9
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)