gentoo resync : 06.05.2018

3 files changed, 19 insertions, 19 deletions

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 42544317dd89..56a4c11c3e54 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,6 +1,6 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2017.3.1.tar.bz2 8098283 BLAKE2B b95c2d047e130f9c856afb1362256dc698bec6afd6d8118e079816fb59db1ebc321f04316123a9a615e5dee1f5c433faa176924eb6d48bf3bc3471d10f9ff238 SHA512 e91268b4fc6a5b04761cf64e003e9962e5a66a91c0f089a1de220ef7cc438250dbd93ed99773c09f19255604c4cc5a0b65b80fe19e663fa0eae8107374527b4b
-EBUILD flightgear-2017.3.1.ebuild 3668 BLAKE2B 67a101ae1ac5fbfc730d8cd8fc774347da099951fbadee3e9fc1feecfe4291f7305516cd71b88c7c8b667a6dc4b61f3b0e859f1483d29eea833817580ec2b23d SHA512 5c35232ce212fce4fe054d1074ca69f91f477afa1a57fcc22b2a45162cc3f6ea8df54c22aa721be506a3fe512b3ad30485d3905cb6395b5ce6d33bf3b33db6b9
-EBUILD flightgear-9999.ebuild 3718 BLAKE2B f3b2f7425bca9b1c1e52093defa0d54fa9c0c40a9bd09c26164238d09c4343209b1ac14003b4b6c8a55a40753b534d284b21e298b2f7c98e274bd1ecbc513a92 SHA512 c3eaf6e5003e950fe409fe81c13e588179e438cc08bc7e461c86bb23859e441285edabf9d5ba6dd6295f1c602d22736939634ab92965f0b6387af4d2f99eddd4
+DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93
+EBUILD flightgear-2018.1.1.ebuild 3670 BLAKE2B 5427589054a34825e63b44a3fcf99d785bee99e611544aa3cc2104bcac6992bb01c1275b452754bd840e7fe74de04903cbf81faee5922e10701fee4f9334b1b9 SHA512 01ef93c320576c7b7cb8a5db1de9617e7d635eb996768f7bf0fa12a39f6d13e1f5fb5ce8763877bfb874a756bf9818f523dc1b668e695c1c5ce88324102ec538
+EBUILD flightgear-9999.ebuild 3720 BLAKE2B 0532e7fad5eaea1ba5b0f21401b575b05ccefece7e906ce279fd3cab5817390c29631fa999e0907e8e126f6f578b45d3e2107667572bf30ddc069b7b2a524c58 SHA512 a8a5446ec877679767f978c0a1299dd8cc4a09f4b4aa8f5f879ee4653403205bc8bfbcd8331972af0ab8c2fff0850d288f7bb7f4702d4fe5548efe420eff720c
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/flightgear-2017.3.1.ebuild b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
index 23182087a6f5..35f1c3291934 100644
--- a/games-simulation/flightgear/flightgear-2017.3.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,11 +29,11 @@ COMMON_DEPEND="
 	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
 	gdal? ( >=sci-libs/gdal-2.0.0:0 )
 	qt5? (
-		>=dev-qt/qtcore-5.4.1:5
-		>=dev-qt/qtdeclarative-5.4.1:5
-		>=dev-qt/qtgui-5.4.1:5
-		>=dev-qt/qtnetwork-5.4.1:5
-		>=dev-qt/qtwidgets-5.4.1:5
+		>=dev-qt/qtcore-5.7.1:5
+		>=dev-qt/qtdeclarative-5.7.1:5
+		>=dev-qt/qtgui-5.7.1:5
+		>=dev-qt/qtnetwork-5.7.1:5
+		>=dev-qt/qtwidgets-5.7.1:5
 	)
 	udev? ( virtual/udev )
 	utils? (
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 		media-libs/glew:0
 		media-libs/libpng:0
 		virtual/opengl
-		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
+		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
 	)
 "
 # libXi and libXmu are build-only-deps according to FindGLUT.cmake
@@ -75,10 +75,10 @@ src_configure() {
 		-DENABLE_FLITE=OFF
 		-DENABLE_GDAL=$(usex gdal)
 		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_HID_INPUT=$(usex udev)
 		-DENABLE_JS_DEMO=$(usex utils)
 		-DENABLE_JSBSIM=ON
 		-DENABLE_LARCSIM=ON
-		-DENABLE_LOGGING=$(usex test)
 		-DENABLE_METAR=$(usex utils)
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_PROFILE=OFF
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 2a386a478420..3807c996da08 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,11 +31,11 @@ COMMON_DEPEND="
 	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
 	gdal? ( >=sci-libs/gdal-2.0.0:0 )
 	qt5? (
-		>=dev-qt/qtcore-5.4.1:5
-		>=dev-qt/qtdeclarative-5.4.1:5
-		>=dev-qt/qtgui-5.4.1:5
-		>=dev-qt/qtnetwork-5.4.1:5
-		>=dev-qt/qtwidgets-5.4.1:5
+		>=dev-qt/qtcore-5.7.1:5
+		>=dev-qt/qtdeclarative-5.7.1:5
+		>=dev-qt/qtgui-5.7.1:5
+		>=dev-qt/qtnetwork-5.7.1:5
+		>=dev-qt/qtwidgets-5.7.1:5
 	)
 	udev? ( virtual/udev )
 	utils? (
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 		media-libs/glew:0
 		media-libs/libpng:0
 		virtual/opengl
-		qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
+		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
 	)
 "
 # libXi and libXmu are build-only-deps according to FindGLUT.cmake
@@ -77,10 +77,10 @@ src_configure() {
 		-DENABLE_FLITE=OFF
 		-DENABLE_GDAL=$(usex gdal)
 		-DENABLE_GPSSMOOTH=$(usex utils)
+		-DENABLE_HID_INPUT=$(usex udev)
 		-DENABLE_JS_DEMO=$(usex utils)
 		-DENABLE_JSBSIM=ON
 		-DENABLE_LARCSIM=ON
-		-DENABLE_LOGGING=$(usex test)
 		-DENABLE_METAR=$(usex utils)
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_PROFILE=OFF