Properly handle USE=qt4, fixes bug 550206.

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

4 files changed, 19 insertions, 66 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index b18a049a4746..45b3a489de83 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.61 2015/02/21 12:02:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.62 2015/06/06 03:28:39 reavertm Exp $
+
+  06 Jun 2015; Maciej Mrozowski <reavertm@gentoo.org>
+  files/openscenegraph-3.2.1-cmake.patch, openscenegraph-3.2.1.ebuild:
+  Properly handle USE=qt4, fixes bug 550206.
 
   21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> openscenegraph-3.2.1.ebuild:
   Stable for ppc, wrt bug #526372
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 0397058f5981..4555727a4147 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -5,27 +5,17 @@ AUX openscenegraph-3.0.1-cmake.patch 11396 SHA256 53ca5a868b5d5d5c7d0dff109bab58
 AUX openscenegraph-3.0.1-libav-0.7.patch 763 SHA256 8e78e9e26aefa640bb020beaa92ebfd29d5cd6ef341568926eb4d34ba5688a75 SHA512 20db7d3b1f9358f5701a9414724f9d8556d6a20bc7b0ed3c904421f71c084cd5eef933695008c25e2ab8f161b6610acdd033425538faab718b36768df2d5f3c8 WHIRLPOOL cdb0e50b0bc410461c153df0856d564f80d1767105baf0c5cc4dbca1232593f7c6bfd3a2f4d74b28508165d8224ec0b378f73144104ac3b0d7d67111261c7438
 AUX openscenegraph-3.0.1-libav-9.patch 11919 SHA256 2efd2bab9d2469c42ec2bf78b2c28f5e71c79d5718b54c817391c777a2e27465 SHA512 71f3411b643bc96f67ff60adc36890392355eb2c78f27eac105a526cb97fdf268069f3f453371a6a4204fdf44a3ccc19d250cc18238d99e65c7bd055b6ec3af5 WHIRLPOOL 21cd313b0c2fc4cf6b0b9fac7aef10a682bed9d12fedabaa84be5d076cac21306db50c13a065963da312bdfd2c567755717bae333ce1968d4c79970b6b3224e8
 AUX openscenegraph-3.0.1-xinelib12x.patch 706 SHA256 1d9baf7ec7cfaac0cdb4a08742e663f12a4fe5a431d8fe25b34a2cb4a0cbd828 SHA512 6c72f814a38628b222c82ccf71c3fa7f66af2b92ce45cbcb8c5a5c368239f9dfd60dbd04a8c9c65bad62e3c3005521531a19f469af9919a75b707b8206408c7b WHIRLPOOL 027427daff13ba6f9efa30ca657130936173b6604b2ddc3f848c544d505a22c99d686bd1f27b3497fc60175517ad80227f6103921308d53da7aaa7d27ae038b3
-AUX openscenegraph-3.2.1-cmake.patch 12197 SHA256 5be8d66fd24d86a895ade16f6b54201194aeb9a5db6d903813b53108e1150d07 SHA512 ca9e827dea0f5e27b5e0ebf1759c9f1d87462a9951c169f133c364aa7e29b835f11afc562000b1df30ed7db35e21d17150274ab584258d4775ff0c723f8dae6a WHIRLPOOL adcdd34f6aaf18046a2fafec7398c439448704bc36b015830e1e67a4f8a5a708bf149e46d6e711850e00f71e7b24528f107e6392ace9c1120632342dd9ae095a
+AUX openscenegraph-3.2.1-cmake.patch 11002 SHA256 4a524a4ef4982f837f99fcb876b49373be40e142f6ba39b5758d8983665c0859 SHA512 d9ae3d5ef7840eddb972ead8a3d7cf03c3c78b7857e0c6f7c1893eacae4bd581aac9f85ffe4b17cdbc182686eaf0fac52f5985931c6fbeae2afc21f7e5e9d9eb WHIRLPOOL 40428cf1c80ffbbdd1926bee009c63b1b2eadd6c7336fd4e0c235f2c0b56d9f63d06679a2e8ad282d6e6c1c879e186a95a20c3120046a546675016832d01c64a
 DIST OpenSceneGraph-3.0.1.zip 6780282 SHA256 0c1103574b0a5a27c7d68d43454f1bf9c0cea114a583c42637bc8eb47b1d8296 SHA512 5fbfe9070721f055349a27516c9a20195070d13ab562e0c5109cc1f1d46dfaf09778152a14f5815b72728d315cb80b2d7bab747bfd9be58aea22d600c2c97912 WHIRLPOOL e3e24e2b36fd59a823d43864e7123d3683a8b2ef4e09cae17895d4b15eb4321bdd112cd59a734e1e55924cc9af52198c6152797bd73ab33a91bf17936232a7b0
 DIST OpenSceneGraph-3.2.1.zip 7219212 SHA256 d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d SHA512 f7bd9aedd3a1f48094a0ad95d267c2f2c946b042f7459d6b33e6038a4b16aeda9cfd69f339ea0a2a478dadadf1875313a4132564b8fcade5ad93511ecd8c1a9e WHIRLPOOL ef47a41a316fae86341cdebecaeceb41cf56b5f11fdf93e8218bb9aa9eaa28fc2fc9122efbeb8dce69fa01d8c8b6a2460fab69190714ca53abfa5d347a0ae1bc
 EBUILD openscenegraph-3.0.1-r1.ebuild 3662 SHA256 ee7b72ef5d022d5ee1bc2118c6c67a8b9ae43e750e940497dfce1d4c1b5dbeb7 SHA512 1a3839c6144334c6e2a225183ddf4119283e01be3d12ed7ec6face82baacf20a1f6d632d602bd0bb7216812eff4f3d035f1ece4a9c7b1f2a1dec95e928bc442d WHIRLPOOL b863538a473e07e593d78257de194de8e794dd2cca7971184acba8761c14a19bbf4c48ac33cb12cd783fee6504a614355a2176aecf08bc03b95a9630dd14f47d
-EBUILD openscenegraph-3.2.1.ebuild 3495 SHA256 8910d4f0aa10f05b71431e79a348949a886e321c225c431e88dffef600594d83 SHA512 58e97a9f8fbf121b4f068b5a02719ba515f1d71760289cab6b8eacb820e661586af4cbb7b1cb5f6dea3de36d75acf1b4499b7b464b2eddf55cfdfa1dd9df0ddb WHIRLPOOL 9d3a379b07a6931b1066731189a5dbdc3ecf2c071c8f77ab5047dc3cd3b6a9b1354bf2c2e55e93b83aaa8068bf3edb82032dcd67de6b276929c53d89e7980642
-MISC ChangeLog 9383 SHA256 e2e3f89e2e250f99ecbcb37bfe2e63975945b399633ee6bad633929a593721db SHA512 2c75e04111787f6aa3154a267539873255596b5a48076131f4612e89b8b062c05678253b8f3db9ee44688690dfa49b6dbfdb6c4844bd256c756f13393dfc8c76 WHIRLPOOL 212244aa79a9b0c4af33a6f873671c2d3aceecb289e7a98f4a077fbc826f2ca13cace330afac13c56436b07a9495c14fecc33dc5eb83c2dad245868c8ed56b73
+EBUILD openscenegraph-3.2.1.ebuild 3526 SHA256 36ebf98e446fbf10565ff3d3fea51829a64e8d1bfa685cd21f3f98a3d6d6c4b6 SHA512 711109bbaaa4287f65af0366ccd2fd98a91bf1f1a548919904695b5383822cf553b2a3ef1fd04ac8c98d4c8717604c48a40a7161b6d0df2adef37f7afea54c14 WHIRLPOOL daa97c1d2fa9c88a7c6b72e7503a60ebd70ad512b3ccaadec5db0a0b033ae90ade4e6f0fdda07ee80eb80c2faa83a2932f81b8769dda2ac3b6e79afe35ae43b6
+MISC ChangeLog 9559 SHA256 6f92138df793bf7698f3c609f6663fe6435fce4e29d903506533368a8f531b04 SHA512 c0cfc07148e41e6608ac9b891980dc9bcde930353a1e56337c6d1c75d5c6ca0f9af0b6588d735dbd7dccdf2d19c3f1d08dd22021cdf9900cebfa7481900fe0d0 WHIRLPOOL b5ee47989fdcf97cdab270ed46bc695a8457a075b359728e2811c1daf2c078a569c41a9d6716466fdf7d8b0822a139cd366d7f3c4e635033743afd23750bc378
 MISC metadata.xml 1289 SHA256 d681ed8d7d4c8393f9fea6af276e50e8a93063a2860ca36012779de27705ecd7 SHA512 864cd81ae0b7e87a4599d8cb0910512e6b1c9ad5e953f560fff501734d368f5434edb6a681867e948cd9cbc2fb363ecf59948cf8c0dcc26c296a32840dbb8108 WHIRLPOOL 34a648e86d06762c417fa7dd977ddc5db426e2f5558c672d6eb3a3581cc0f63a4a5415d8cf2c5d93760bce6021c747e48816b9f3d591b7527515e74a9edd2491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU6HPlAAoJELp701BxlEWfYZoP/Rql0j5IfLsE8i1DFqgy4/S5
-f+nuiUPsn2g3ivB1pMfwMYUDgYNuD6IMtxZB3YmMsCJY/JhSC7S8Gn2zBFoYlBhp
-2l7iJxDm3X0qPFymvQllhmAzGBk4fRYmlAVQcLg66wu7V19kFC6KbTZqaeDk/wRy
-RmgIAGv6gg1DBMUjYyTyIW7N4Yq2YuByKNalD+G5G09yMJtD49hKEPJAVXEv7wi0
-RbHU/h11XsTL5vqorgHED9Qt2U7HY1dezSV5a44z458mM8kxguG8iydk62CdZbqY
-jli+TnLRjZUB2b5R5qlaLdV/DeWiDzTuspKzaERh/OJ4027YVAsmPzIsHSSIXFYB
-DEjAkzq83iX0XdmoUQD/dahCrVRLKasHdZWi8CGxayOllzNXOkIqV0ZWdbRrE17C
-+hNTHplVWwiIJRczNqBOKM7GLnDSvfRWn/XUvHsHxAbOxBLltPXuQLHGa73yhYQJ
-zS9vcwAsRDI/v6rcT9MC1lfZCpAVmKCMZv+TZ7d/xAhFxPwQbV02kIsqCNEn0gMy
-wJQzsSETBwLrpFFq4yaNsPx7ZhiTvAOlSmWbTV8Rx1yhIP5NulvOWW+U+LgZteau
-ZzjVQZ2wnJU8y0w7Esygy7T4Bg19kH9qC38PeqgBPDF5nS5ymmqkfHEBVh4xjYyj
-/biTFfpYDJlk6hQMeyyA
-=cadX
+iEYEAREIAAYFAlVyaQMACgkQFuHa/bHpVdvSogCfV95iJhooKOIpVlyIAPJ3Bz/2
+9EIAnj/AWAeqBlLlkhBEJvNdJls6xaQb
+=amBb
 -----END PGP SIGNATURE-----
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
index 84649e5f3d61..1a85ee8d47ba 100644
--- a/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-cmake.patch
@@ -70,48 +70,6 @@ diff -ruN OpenSceneGraph-3.2.1/CMakeLists.txt new/CMakeLists.txt
  ENDIF()
  
  # Include macro utilities here
-@@ -560,16 +561,16 @@
- 
-     IF  (DESIRED_QT_VERSION)
-         IF  (DESIRED_QT_VERSION MATCHES 5)
--              FIND_PACKAGE(Qt5Widgets)
-+              MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets)
-         ELSEIF (DESIRED_QT_VERSION MATCHES 4)
--              FIND_PACKAGE(Qt4)
-+              MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
-         ELSE()
--              FIND_PACKAGE(Qt3)
-+              MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
-         ENDIF()
- 
-     ELSE()
- 
--        FIND_PACKAGE(Qt5Widgets QUIET)
-+        MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets QUIET)
- 
-         IF ( Qt5Widgets_FOUND )
-             # CMake 2.8.8 or greater required
-@@ -585,17 +586,17 @@
-         ENDIF( )
- 
-         IF ( NOT Qt5Widgets_FOUND )
--            FIND_PACKAGE(Qt4)
-+            MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
- 
-             IF (NOT QT4_FOUND)
--                FIND_PACKAGE(Qt3)
-+                MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
-             ENDIF()
-         ENDIF()
-     ENDIF()
- 
-     #If we have found Qt5, let's try to top off by getting the webkit as well
-     IF ( Qt5Widgets_FOUND )
--        FIND_PACKAGE(Qt5WebKitWidgets QUIET)
-+        MACRO_OPTIONAL_FIND_PACKAGE(Qt5WebKitWidgets QUIET)
-     ENDIF()
- 
- ENDIF()
 @@ -604,12 +605,12 @@
  IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
  
diff --git a/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild
index 4a35f11e343c..8d52d5c15508 100644
--- a/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1.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/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild,v 1.4 2015/02/21 12:02:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild,v 1.5 2015/06/06 03:28:39 reavertm Exp $
 
 EAPI=5
 
@@ -33,11 +33,6 @@ RDEPEND="
 		fox? ( x11-libs/fox:1.6[opengl] )
 		glut? ( media-libs/freeglut )
 		gtk? ( x11-libs/gtkglext )
-		qt4? (
-			dev-qt/qtcore:4
-			dev-qt/qtgui:4
-			dev-qt/qtopengl:4
-		)
 		sdl? ( media-libs/libsdl )
 		wxwidgets? ( x11-libs/wxGTK[opengl,X] )
 	)
@@ -53,6 +48,11 @@ RDEPEND="
 	openinventor? ( media-libs/coin )
 	pdf? ( app-text/poppler[cairo] )
 	png? ( media-libs/libpng:0 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
 	svg? (
 		gnome-base/librsvg
 		x11-libs/cairo
@@ -90,6 +90,7 @@ src_configure() {
 	append-cppflags -D__STDC_CONSTANT_MACROS
 
 	mycmakeargs=(
+		-DDESIRED_QT_VERSION=4
 		-DDYNAMIC_OPENSCENEGRAPH=ON
 		-DWITH_ITK=OFF
 		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
@@ -111,7 +112,7 @@ src_configure() {
 		$(cmake-utils_use_with openinventor Inventor)
 		$(cmake-utils_use_with pdf Poppler-glib)
 		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use qt4 OSG_USE_QT)
 		$(cmake-utils_use_with sdl)
 		$(cmake-utils_use_with svg rsvg)
 		$(cmake-utils_use_with tiff)