Fix Qt5 automagic.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 33 insertions, 7 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 1ef0e52a34aa..7b5b9ff34a65 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.229 2013/01/01 19:25:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.230 2013/01/07 12:12:35 kensington Exp $
+
+  07 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/cmake-2.8.10.2-qt5.patch, cmake-2.8.10.2-r1.ebuild:
+  Fix Qt5 automagic.
 
 *cmake-2.8.10.2-r1 (01 Jan 2013)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5afe15cdda47..6a525fe60f46 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,6 +14,7 @@ AUX cmake-2.8.10-libform.patch 1598 SHA256 8635248bfebe157e545eddc3c16223e4d8c51
 AUX cmake-2.8.10-more-no_host_paths.patch 4221 SHA256 adf64e6357c69d6153efcf0bab708e209071237e29b7f04f80dc7708726a8034 SHA512 c08340d0cf5c4d931fa3a608fafd0eb950cc7f2f9bed2bc152c973f27a2b1c880f13bfbc55698534d533b62f5ed1a03347980d07bad2abae8379f7d2e630e6ee WHIRLPOOL a259a4c8fd271d704c0a6135352f4fdeed9a9aa50077aa1a520889b8a636366c9c9b8632808e54740f9eb7413ab8e0a453a1262b9224839486176690774ac696
 AUX cmake-2.8.10-tests.patch 3339 SHA256 189bd592d5c7de8f9146858b031cf270b4c7385c02ca7dd7e9e86b87e7a7a62e SHA512 3bda453b07f80aeaafd866495a370895497ee2e11707e08994c5636de451f3d114d26c37e1994058cca87be01fa2f684bd3463f6676b6e1b4d5bb5858d6ee340 WHIRLPOOL 1c0631fecb3539a5e2e63e591a947b7de4e0961e2a43c25e2ee380b7335750ea84eaf84e854e59bfe17c345202cae60983e2dd2b8ad3df80cef83e785160101f
 AUX cmake-2.8.10.2-implicit-include.patch 5674 SHA256 25839c6c1726e1eaf65e7fc127a23075d89d304f53ceafaa3c2ac36763ed9488 SHA512 0b8ee9fad6ded237c97667cc4eed4347e287ddf899ed3d0f400a434b988d44509a002fdf7b1efc6e92826476d483766bd8a5b444e8daadc836d3b96c2bfdbce5 WHIRLPOOL 370c375395d477fb537fb8f0db76bd846e375d841dcb4f6be1b5c0bf7026cbc0c6f5a82bb786a6f97819da8c15b060c77ca89bfc0a64f811d65ca04f87f6344e
+AUX cmake-2.8.10.2-qt5.patch 423 SHA256 56caffa73e509b28c7a950fd1346e590751ab9b0e134ec203281ebc5a4481fcd SHA512 f1ec48c01b1747f169fbc835cb25830d2cdc92769397e4fc00fe816b2eb8954d7d0bb77f6114341343ece4b208db83e6b95174b935d788e39de97cfab679ffd2 WHIRLPOOL c544b33913d6e481cd741e0bdeca0e3fcfb682b58ab3b0d4cca59bda08db1c8da0ee66726fc7b589620a8d0d5ccbc1fafb221dfc552ac88fecac6f9219a80fd6
 AUX cmake-2.8.4-FindPythonLibs.patch 642 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3 SHA512 5baa7080e920cf835fcb9defa1298ebb7fde87eb322d6eacde79ae344870a97a4f7d58d307da77c1f4d2beffc1c76058aaa7189b3f4fdd79c6270f6d3f387065 WHIRLPOOL a289a2e82976d7aa3ef2f86aeb394c46df391780d751d2f463ef816a9cf0b7c723cdab32d120ffd90be38daeb4b4baef00cb8597c3e9f9c98a36e6d57ae6b5be
 AUX cmake-2.8.7-FindBLAS.patch 1641 SHA256 be0d7ce6b59171c9e32ce7fe2ab4ae4a351640a7fa07920ae9230047eb0495ac SHA512 91a38e22d183ca4b501b305e6ba5068397b09b02bd39e7bdf27bf4a7771f432acaf099d0840260ce815f4d254d704036d022aaeec5b8c27dea1e4ca78112731b WHIRLPOOL e9734f0671918be36c5c1ec78f5185b21b17ef3a216b2c988d0951652db8c705e587df80f3e2c544c6e5a5080d5fc403a6554724c82055e3448f661df147205a
 AUX cmake-2.8.7-FindBoost-python.patch 5334 SHA256 1f7ab1facbb332cf6a2d6f770ea77eff00cd7137990d3254ee6c1a9ecd22ed68 SHA512 81d6ef46f006a42d1234f7a2aec3e18052ff5f5cca3019b42a5b3be77978babf75265db61eb32b4b28156a320506fbb6f7dc1038c9b01d13ed92cb7d0a25da4e WHIRLPOOL 3f6a52259e85d07e3209b6639fc1ccceda67f80a99f94ebe8a069a67d706e1e6cf16e30c8da0be6eff67793b30c49e006ea9b8d3f7a8cad562f90db5f7eebcdc
@@ -24,14 +25,18 @@ AUX cmake-2.8.9-more-no_host_paths.patch 4177 SHA256 376586fd32013150f75aed0b48e
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
 DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 SHA512 e79759f4429977bb4292c9dc8a9d216ca7c21dca5fefce1fa223d7847a1128c8a3a11e1b6adaac40b2f30e0d6f504508a2845f888a319acc29c2ef6beff55df2 WHIRLPOOL f7327282d352ec04afb6349abc74aa3205ceb57efcb013650f18025e36010a27ca28725cd06e29e7bc5ff3196a4c8abeafcb733fba9c6bcc02159a5c6b8e90eb
 DIST cmake-2.8.9.tar.gz 5658837 SHA256 dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 SHA512 d489fa1c720324d03d5fa6605ec5f39f99f98c2ba3f1754e9450fec35e4d9f9479638365ab813014fc648fe05096a519f387ee03f21b3b8b77088fde2857b6e0 WHIRLPOOL 69f0846b39b3e61f0f4774c702b74ed7445f67eeae8ae3e07f7d36c742966767eb9e39b2911c8e612ce0afdc4e24977f7afe2ebab3159d3096e1b2ba86b8247d
-EBUILD cmake-2.8.10.2-r1.ebuild 4966 SHA256 3c229f968c55e9e8fc959fc361b1fc58c7d5f5ef2befd30c9b02bfc42b68fd5a SHA512 2a0277064c54859463daf77fee6958a935bea0d17e9373910274ad2f2469e86d71b6272b18faec05ebe681bd876d0dfdf629ced87818937902ea7a8344d8a61d WHIRLPOOL 2f6f949155cb7da05cdc48b59f752f574d7afbd8128c9606567f772c85363073e7a282f515edb1713176bd2f748b92d55296e100003fd45d179e5ec4771a6c51
+EBUILD cmake-2.8.10.2-r1.ebuild 5008 SHA256 663ae197cea9a2f2531112ec874731521789b877b810f262de4a0ad2c7d736d2 SHA512 285b017f411285341ec5e80cd881fdad02bbdfb2f4f8ce8ed7ec85b97e165a193fe9a225468805fbd6446936dad78c467d00171bcd4dadbaf3245ec4e37d1ca0 WHIRLPOOL 5308408fed32716ab596bfe504baf1de4c39688903279e19d0756a23ccac4d69d122172b98d3677f2d786220e491cff8f8ec86fc72b29d20b7f375ec4ad83798
 EBUILD cmake-2.8.9.ebuild 4876 SHA256 afd5b890bf972c42947d29d8bcb7e8a91818074352e35a5e3572b74acbca31b7 SHA512 0f804d45fb8cb957d2e199a53960b1866f578d473b29cca5a8c98b5201f0f1b510bda1de350c7b5e3ebeb563ce238454ba2d08c111d3cea7e9c9315618ae75b7 WHIRLPOOL 28c6fb434fd6586596288c485c9e34ae43a646a990e8cab3c0eb042e11648d7e372cf35494e2501d24c1eab631b36f25c3c0229d0138db39015007911d4174f7
-MISC ChangeLog 37161 SHA256 cf8f99cdba7d06e383debd052fc6a2970ac4256035fc85773e4d1adbe7466a25 SHA512 9c32e94987c7dfce2e37a18e5cca0f834bd0ccc380339ceea7656f11cfc3a5273c49e96f3ba557fed5e14fa502467e4f11e801d355396b91db7a66454aeef981 WHIRLPOOL fd2918b95c658ad5099ad78afb890d353f7016d19479b79017a903d67dfd164ec77f66feaadd49e5b17bdd1e3fd445e131a495c0d4e3e0b79bff33b9b10ccda7
+MISC ChangeLog 37302 SHA256 b6bf157a1b2142204de642a7d05b80a6b7482277872cc5fe67a2551b049b897c SHA512 e94ebf2e3fe0cfbee094631926d841db0f9df87c9dbc2d104625b2a7f3d816fe4b49844dfb7bf48ca5dd9c85cca7728c5c6e739db3af63058588aa2f58a63d97 WHIRLPOOL 160303f4bda03d831025684226ee487e41c60cbcb54aeb7f07d111a729bc41f34244e113cd11aaa2be3606ce87417134aeac59edf897a4e6ca6eb574752c3fc4
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDjOEsACgkQ23laikJhg1SyDACglcl+5r9y6CiwC3jz/eNd7gkF
-Lm0An2PL1BwL/W+JZ5xWAd0a8vSusS8d
-=/7zJ
+iQEcBAEBCAAGBQJQ6rr0AAoJEMbwO6tnXQ0sHXQH/0D3IWY1Z0RJA34TA/fthGRy
+PaSXmqHkzqe3qu08u9x2rM8h63r/tc7XBAfWzcH8jryk5BlQhLggado33VEy3+ye
+QC2tK11aXvORGrjHF3YbRGjKALS0c90IM2amFdbt3Zpnf+p00ttkHT0xQQxSYJh1
+PuoQloKNPR3Dg2XRRjMCxY1Rq8HexjZ2y2cywwlnloHltkJOKlreZPCSC427F3DA
+LicKkbi3tZ7RQahdwXtISkgztS1pgR+tU1Wq3miTy9Zxfzcux///1UMEPusmFX46
+Af9Zcc1DgTV/7ybjWjWA5FjP20SdlO89f/seslWKksMz1a/pmUpMdAbU1aQbdUk=
+=XnG1
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.10.2-r1.ebuild b/dev-util/cmake/cmake-2.8.10.2-r1.ebuild
index 0f26d5a35d11..a2cbf85342f9 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r1.ebuild,v 1.1 2013/01/01 19:25:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r1.ebuild,v 1.2 2013/01/07 12:12:35 kensington Exp $
 
 EAPI=4
 
@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.10-libform.patch
 	"${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
 	"${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-qt5.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
new file mode 100644
index 000000000000..1f2bef0cec14
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
@@ -0,0 +1,16 @@
+--- Source/QtDoalog/CMakeLists.txt
++++ Source/QtDialog/CMakeLists.txt
+@@ -11,7 +11,12 @@
+ #=============================================================================
+ 
+ project(QtDialog)
+-find_package(Qt5Widgets QUIET)
++option(WITH_Qt5 ON)
++
++if(WITH_Qt5)
++  find_package(Qt5Widgets QUIET)
++endif()
++
+ if (Qt5Widgets_FOUND)
+   include_directories(${Qt5Widgets_INCLUDE_DIRS})
+   add_definitions(${Qt5Widgets_DEFINITONS})