gentoo resync : 06.08.2019

7 files changed, 36 insertions, 5 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 46ea90dc4cc2..e2b49cba4e49 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index fb97b3cc53ee..8402d7d24450 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -2,5 +2,5 @@ AUX crrcsim-0.9.13-buildsystem.patch 2183 BLAKE2B 2f1fb768f93e7d3db1fbd7a2a30c82
 AUX crrcsim-0.9.13-gcc6.patch 461 BLAKE2B 7e2016db5781e0158e27d999fb1d88d07dc6294740466c736a2e42eb46547fdb35ac112b6c8e93a5571103d28d6037a6acdb2be752bfb2650cc349538e72c3f4 SHA512 34bda65c0791622adb8436d08b60e6a877c2a3bbb12f93379686c39c2c572364c0fa265011bbc788229fa2ddaa3bfa3be8397d2ff98ea967f423fa3cd48465e9
 AUX crrcsim-cgal_gmp.patch 352 BLAKE2B 1a9cf7250753c1a0099dd07b5020b7c5af89dffa8387d68f71c51e21a7803ecb2395144de65915ce84cf077b522fecc5790d26190abf9673fef687d1e16f0d6b SHA512 1b8302f71e220df54b73819988f866a7e35ec6b11d271a6a57ad886372fba4eb1a02367ab9942030baf04fbeb5fa093d23e38de2614c39c2c75e76795ec69274
 DIST crrcsim-0.9.13.tar.gz 8337392 BLAKE2B ccaaf3a4255b2082fc52712d49302c7de1347b87e9489c6d859662365f1cd5af538fe76cee232aed61b0c1b68138c47a2e34e128071c3e098e20f1d51c1c409c SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab
-EBUILD crrcsim-0.9.13.ebuild 1232 BLAKE2B ccf89f098cff67e93ee091af11464fd63878c32b052218acb944c0b22934fc27be1d89c45fbcecdb2c616d4fc30c8c4cc460c6085a41868104bd28dc1dbcc5d4 SHA512 ab16d675e3135e65b649ab7cc9a912c84e4d90881042531b89a06e9ce25cfa44fd5e23f525a6b41396c2b907c25db867e7329e96f0f015bc8c0b1c85098c5adb
+EBUILD crrcsim-0.9.13.ebuild 1209 BLAKE2B 909e462a8c52b7039ca8ce5a0d3aca5aa52bb21e2dca7893ee5d17f08627b444f76c13c1b8fe6ebe5e91ad3c193aa353bfbff241821dffe038eca498446a836a SHA512 cf82ae112798b1b6002adbcd379ce4288acedfed5bdd1d560b983193d876eb2afd3274437d8aff6dcaa7b544c4111708fb698c9d7109cec02c909f34e11e0f60
 MISC metadata.xml 330 BLAKE2B 24c61e826448ee0ceecc562776289a0a80c259c718cce5dc0f23523b5091a329933eb6a98c46ecd038b856db3f1d86588d82d62924b5d40dd0ee64c569c1e9ff SHA512 a57fe17fafb1d4cca975665b68283233a1f6b62e25bf903cd5ef7954572f3963471d453da9c569044405ab005105f6d35ae28b679d35eebd01ba61d0166349c8
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
index ef5b5ce752df..4d20e437844b 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WANT_AUTOMAKE="1.10"
+
 inherit autotools eutils gnome2-utils
 
 DESCRIPTION="model-airplane flight simulation program"
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index a25b8d6f86ab..1025aa07261d 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,8 +1,9 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
+AUX flightgear-2018.3.2-cmake.patch 1322 BLAKE2B 4b68e744cf0cd7ea9582025980d055f8def5d5d1c82cabf133d4d1f9e35d501e28fdba1fca51ed409caa6398043fa52a82f68f77ce8f34a3f0a3ce45fa526352 SHA512 5ae183a04df6f12e23e87649210249a0857d5915aba40198507d2e45ee6fba6b997575df40457cb8e214b9fe9f4b81f4bec8fadb3875f1bbebf0c3181ba4fce3
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
 DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B 8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a SHA512 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d
 EBUILD flightgear-2018.3.1.ebuild 4086 BLAKE2B 3d9658d8fce4a0854aeafe8efac28fadd4e3b1a177909d6818aaf729fe94c40dcfc374ae3e394bb158e73140eeac7031a348fdaf921504bef9da2ec26984e691 SHA512 131765eefaf7b02e93bc09544561da9764565bc9d56c0d0fce017e7b3d1e58ae867eed46992b219d495093dd689571e63f3f6c14ec9512fa25344748456f0cee
-EBUILD flightgear-2018.3.2.ebuild 4215 BLAKE2B 0362ec9d7ab6fb6e7f52831d078f39672de6dc2d1672f21c04cbdcbcd0fcaf7c981beb733c450422bf71dc7cc8e25291b8f56d2b712ff23e879f34817bed246e SHA512 af935b2863dddbf78814881d452ca7c445e789e65cdb57def3875a5992fee56cbbe1dac65df749a73ca589bfffb48c1b5edebcd8d9182346114563e89ce254c5
-EBUILD flightgear-9999.ebuild 4136 BLAKE2B 3dbc2079f3300ff513da9397faed098f85f054018536d6b5a0c13ba6cf14668a26702077cf9f0098a0e5b49bb04d145feeaebad3c409af6c160350440ed46f54 SHA512 ea5de4dc344b3b7833efe737ede0caf063c03621db29b57cd063f0a98c3785e7428658afcf15d571abefe0726c3846a960c7f682711c6302ada2f2fdd3b2d465
+EBUILD flightgear-2018.3.2.ebuild 4309 BLAKE2B 57dd4e69c206f7aaf14b951d1a8274afdad34db8f9586f6a32416674aa357a5d9036d6dd7e7bf162feb9fe199187ae63ebdf539d621fb13c5e6301c54e9119fd SHA512 c639424a0be0f38362bcb8a744da37dd42a891f15df125e834d0921111aafaa300b431c3b12d0723f32cc9140f64ba11137b8ec56d5bc053b5aba34e1794da68
+EBUILD flightgear-9999.ebuild 4230 BLAKE2B 2d64e5ab90eef73665975514fd1845fbdcc143cb08fbacf34989e81c403d0fd946995ab8104d48e6948235cf97819c0675da3a51b595a30f3d6ac515c4029c59 SHA512 0f485ac4e40961867c8f895d42eecc3147cdb2c68961f5ed1bd6e1e1a65d8ce36d6bb280392d8252cbb31f2d722dced09e1ffb008c785565a1b3429cdaee8899
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
new file mode 100644
index 000000000000..97747e8b7487
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
@@ -0,0 +1,24 @@
+diff -ruN flightgear-2018.3.2/CMakeLists.txt my/CMakeLists.txt
+--- flightgear-2018.3.2/CMakeLists.txt	2019-01-29 14:17:49.000000000 +0100
++++ my/CMakeLists.txt	2019-08-18 05:29:04.762138013 +0200
+@@ -323,7 +323,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)
+     if (Qt5Widgets_FOUND)
+         message(STATUS "Will enable Qt launcher GUI")
+         message(STATUS "  Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}")
+diff -ruN flightgear-2018.3.2/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt
+--- flightgear-2018.3.2/src/GUI/CMakeLists.txt	2019-01-29 14:17:50.000000000 +0100
++++ my/src/GUI/CMakeLists.txt	2019-08-18 05:38:19.607822998 +0200
+@@ -127,7 +127,7 @@
+                             ${qml_sources})
+ 
+     set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+-    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
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
index 31cb9fe151d2..ddec50a3ac88 100644
--- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
@@ -53,6 +53,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
 	>=media-libs/plib-1.8.5
+	qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
 	utils? (
 		x11-libs/libXi
 		x11-libs/libXmu
@@ -62,6 +63,8 @@ RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
 "
 
+PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
+
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 pkg_pretend() {
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index e485d9af2d35..0243250482c9 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -55,6 +55,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
 	>=media-libs/plib-1.8.5
+	qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
 	utils? (
 		x11-libs/libXi
 		x11-libs/libXmu
@@ -64,6 +65,8 @@ RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
 "
 
+PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
+
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 pkg_pretend() {