Fix bug 554292.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

5 files changed, 103 insertions, 7 deletions

diff --git a/games-simulation/flightgear/ChangeLog b/games-simulation/flightgear/ChangeLog
index 86b78754e5a1..fe44e2534403 100644
--- a/games-simulation/flightgear/ChangeLog
+++ b/games-simulation/flightgear/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/flightgear
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.81 2015/05/14 22:38:35 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/ChangeLog,v 1.82 2015/07/11 15:08:35 reavertm Exp $
+
+  11 Jul 2015; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/0001-flightgear-3.4.0-cmake.patch,
+  +files/0002-flightgear-3.4.0-cmake.patch, flightgear-3.4.0.ebuild:
+  Fix bug 554292.
 
   14 May 2015; Maciej Mrozowski <reavertm@gentoo.org>
   -flightgear-3.0.0-r1.ebuild, -flightgear-3.0.0.ebuild,
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 5436e9c2b8d3..2537d4a0011d 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-flightgear-3.4.0-cmake.patch 976 SHA256 90503701426d353d9ecc6e62f1e4238ee2f4022754b983c4db93ae4939edab84 SHA512 3180014754decd9ba606a5da844f73ad502f1d0b606dfce30efa41c1e07613f9e7945c5dc5ada9372e1404565d18fc4384b11d7da5ceeb0f9b133ca8efc69703 WHIRLPOOL 2354639f3a263a78493d1b9a665ac77d48328b7cf1db7de2534774862463004fc516e9d621df820740100e6e82114a1647a65f338fa5ef0c63e0488b452e6501
+AUX 0002-flightgear-3.4.0-cmake.patch 1652 SHA256 3e95041aac308d3b16e9e70c5898658bffbe48ef4537c2722fe5c5c8b50e7056 SHA512 66cca57bfdd54b4346fa2e90778cccc0bed05ab3db04ad63be0297e5ea74f3e23fd089e39672d294a290db9f68248e70814fcb6f9f03c1e06e2d879cc55e8af3 WHIRLPOOL bc14e2db04a9290544764287d94843e57b6d5bd483bd760a0d180b6ea26cf79cac5b3e87efff9f0deb3d8d82c00dd8ddfb2a0857c3de463fe4e7cd2e0b432f9d
 AUX ac3d.vim 45 SHA256 fce013503a5a902f19909baf9848387c7ef6ec253bd32eb86613838bc8762b1d SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da WHIRLPOOL 2cd5d63cac76d87bf5da1fbb201c1eee3717b44a9e81a771986bb539acb7d7e3f0fb7e04b383c9c7d51769027900841e3686ba245db25c9f945f00542944fc7b
 AUX nasal.vim 47 SHA256 57ceefdda4970e6f347c0df2aefddd36c15522781e4a2d28ba9f8a249b72a28b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb WHIRLPOOL 10558327431b1818c6e366ee074bd0ef37ebfbddd4abf17783825fe1ec8877b88dc518f58d95fc545ef0403e50d294fb93dd87bc7b6b5fcfd5383e76ad3fadaf
 DIST flightgear-3.4.0.tar.bz2 7522457 SHA256 b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 SHA512 10626d00b34255753dc5a5c82076909c296219472faf51c38460cc357ac014b40bd127454f28b2d857f1a1a299716430fd8f04dc7881552b3c24dee6eb616b1e WHIRLPOOL 636ca7e012175141bc4b081cb6137e5348d49b873d241c5d0f1ed0a2581b32d2f23f4fe0ed97d5a1b72440afd14687e5de4e6ebeeaf07b4e854b0ca47875b82f
-EBUILD flightgear-3.4.0.ebuild 3605 SHA256 6559cdb0f47a42e7c9a35c27ef8d1107d555b8e401f05bc9f4e99aa8658d2544 SHA512 ba6d5d541526882f9f04d6f3d3ce0f58fde9d1d8fbc68124d8974f33697969a30cd8bfbe5b8e19ae3732fd52f3bc4a1c57c68ac07c56aad189bdd6c607ff41c7 WHIRLPOOL def82618294e2489449ece18a08d453a9f7efa37b02daf9a9fc0de4638097ac1b31809c16e32fdd09fe423314853ad2176d1e4b9903ae396979b04741a7a0e85
-MISC ChangeLog 13627 SHA256 b0cb82ca7be99cffec3bb87b71453269a0a56db52d7a4b30ac7878681936f948 SHA512 59c4a72a76126349222aa41b24270423a8f60734567ee90aca3343cd4467311718baeacc5c570df626e8eefcb6a718f962f061253073b2874351583c39b11d31 WHIRLPOOL a5e0b625d13694a1bfd9dae3d7f9b9583bdb0c7ea619d6615ac89902b876650f178116644b12a37b359de8eb4700da55224cf662d83934ecdeceba3febb78eb6
+EBUILD flightgear-3.4.0.ebuild 3697 SHA256 de59bc94b1674eaf66976f1a7b9054c9cc814f889b537cef19eddb5c28270612 SHA512 ee5d16ee0cbec9f9976f5f2a59585e69ee745d6d141781712b6f2e57e5a26881839c9a04a08184c33ffcd8fe93c77a1942e0454073ddf419340f6d3f9e45c2f0 WHIRLPOOL 72dd2da34b8195335167ae4cf3fffcaacacaad108e04b729794ef1dd7152d88cb36f48e1bf80ac3d1920afed1b73afd9460037fd800cff3499433e919160a9dd
+MISC ChangeLog 13813 SHA256 f4912ce531c377cf9c5d71c08db3e419e63e9783b2f7858fa410a2d5119aaab3 SHA512 b090c22881f5bee0262349f3aa63dc6500fe51c69e08d834d0bf72cd5919dd82f6593e6c2cd62dfa4ea91198b5c75c36e723a602ad89f376fcc174ef5abc69b5 WHIRLPOOL 7ffffda05c252ff7162b334ef441c16cb868d8f587213e67de22eb55e33ab7ab5a56cdd79abbfac6701232e49b4c177946cf4ecdc287eca9e320e2172ec280a3
 MISC metadata.xml 796 SHA256 8f00f19484a0621bd9f5dc190e6d881ab6d5392b4d7a678693a32058db34950c SHA512 43f5ee767c67a938a0962ffde52d9afa96dab87870df21ab5bea1c38f6eda2538dd209dd14eb88961a5c2a7adf91d891567fa6e3ff8971e6e73c855f77e0c693 WHIRLPOOL 5612e92ae24749b68b3de3b200fddd9959540b8ed65c65e285d69701f0bb875d3f597350fbcd5cd16af3ae694528341fecb969940272914535da7a38e2d0f977
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVVJAcACgkQFuHa/bHpVdvxWwCgnTnIJkcrxLfsoyb6BJnGPzvY
-fnwAnAoYCfDoEFZtHoX23SfHFn8kL02k
-=RQnZ
+iEYEAREIAAYFAlWhMZIACgkQFuHa/bHpVdtEYQCgi2NYo0VoT9/THMUjpvjktKFf
+9TYAn0dbC7BB/a9uS5zLdHBsbj3qlOrx
+=FPlt
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch b/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch
new file mode 100644
index 000000000000..e14920b246c2
--- /dev/null
+++ b/games-simulation/flightgear/files/0001-flightgear-3.4.0-cmake.patch
@@ -0,0 +1,30 @@
+From 06a260822c0eb10f47533a2cbf5cbbc968878c17 Mon Sep 17 00:00:00 2001
+From: James Turner <zakalawe@mac.com>
+Date: Tue, 17 Mar 2015 23:33:57 +0000
+Subject: [PATCH] Make 3.2.1 fix: make thread check platform specific.
+
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8847614..c881c32 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,6 +109,8 @@ IF(APPLE)
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+ 	${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++    find_package(Threads REQUIRED)
++    
+     set(USE_DBUS_DEFAULT 1)
+ 
+     find_package(UDev)
+@@ -230,7 +232,6 @@ endif(EVENT_INPUT)
+ # check required dependencies
+ find_package(Boost   REQUIRED)
+ find_package(ZLIB    REQUIRED)
+-find_package(Threads REQUIRED)
+ find_package(OpenGL  REQUIRED)
+ find_package(OpenAL  REQUIRED)
+ find_package(OpenSceneGraph 3.2.0 REQUIRED
diff --git a/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch b/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
new file mode 100644
index 000000000000..2151acdbbcf4
--- /dev/null
+++ b/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
@@ -0,0 +1,54 @@
+From 14405fe2e397b9a6ab9b004cb8c7459eeb41ec59 Mon Sep 17 00:00:00 2001
+From: "Rebecca N. Palmer" <rebecca_palmer@zoho.com>
+Date: Fri, 3 Apr 2015 19:15:52 +0100
+Subject: [PATCH] Fix compile with CMake 3.2.1, by Kevin Seroux
+
+Explicitly link X11, as this no longer comes with OpenGL
+---
+ CMakeLists.txt                | 1 +
+ src/Main/CMakeLists.txt       | 4 +++-
+ utils/fgviewer/CMakeLists.txt | 4 ++++
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c881c32..c443f58 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,6 +110,7 @@ IF(APPLE)
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+ 	${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+     find_package(Threads REQUIRED)
++    find_package(X11 REQUIRED)
+     
+     set(USE_DBUS_DEFAULT 1)
+ 
+diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
+index 949b379..4b6926e 100644
+--- a/src/Main/CMakeLists.txt
++++ b/src/Main/CMakeLists.txt
+@@ -130,7 +130,9 @@ endif()
+ if (CRASHRPT_FOUND)
+ 	target_link_libraries(fgfs ${CRASHRPT_LIBRARY})
+ endif()
+-
++if(X11_FOUND)
++    target_link_libraries(fgfs ${X11_LIBRARIES})
++endif()
+ target_link_libraries(fgfs
+ 	${SQLITE3_LIBRARY}
+ 	${SIMGEAR_LIBRARIES}
+diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt
+index 165be74..bfc52ad 100644
+--- a/utils/fgviewer/CMakeLists.txt
++++ b/utils/fgviewer/CMakeLists.txt
+@@ -42,6 +42,10 @@ else()
+ endif()
+ 
+ add_executable(fgviewer ${FGVIEWER_SOURCES} ${FGVIEWER_RTI_SOURCES})
++if(X11_FOUND)
++    target_link_libraries(fgviewer ${X11_LIBRARIES})
++endif()
++
+ target_link_libraries(fgviewer
+ 	${SIMGEAR_LIBRARIES}
+ 	${OPENSCENEGRAPH_LIBRARIES}
diff --git a/games-simulation/flightgear/flightgear-3.4.0.ebuild b/games-simulation/flightgear/flightgear-3.4.0.ebuild
index cc123e643611..405038025f0b 100644
--- a/games-simulation/flightgear/flightgear-3.4.0.ebuild
+++ b/games-simulation/flightgear/flightgear-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-3.4.0.ebuild,v 1.4 2015/04/19 10:15:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-3.4.0.ebuild,v 1.5 2015/07/11 15:08:35 reavertm Exp $
 
 EAPI=5
 
@@ -45,6 +45,11 @@ RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
 "
 
+PATCHES=(
+	"${FILESDIR}/0001-${P}-cmake.patch"
+	"${FILESDIR}/0002-${P}-cmake.patch"
+)
+
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 src_configure() {