Fix configure with >=dev-util/cmake-3 wrt bug #537138.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 40 insertions, 18 deletions

diff --git a/kde-misc/kolor-manager/ChangeLog b/kde-misc/kolor-manager/ChangeLog
index 24087dda204e..6dcfca6a3d98 100644
--- a/kde-misc/kolor-manager/ChangeLog
+++ b/kde-misc/kolor-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kolor-manager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kolor-manager/ChangeLog,v 1.10 2015/01/28 15:18:24 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kolor-manager/ChangeLog,v 1.11 2015/01/28 15:21:20 kensington Exp $
+
+  28 Jan 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/kolor-manager-1.0.2-cmake-3.patch, kolor-manager-1.0.2.ebuild:
+  Fix configure with >=dev-util/cmake-3 wrt bug #537138.
 
   28 Jan 2015; Michael Palimaka <kensington@gentoo.org>
   -files/FindOyranos.cmake:
diff --git a/kde-misc/kolor-manager/Manifest b/kde-misc/kolor-manager/Manifest
index 0210f74ac7ff..c6bac83fa924 100644
--- a/kde-misc/kolor-manager/Manifest
+++ b/kde-misc/kolor-manager/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kolor-manager-1.0.2-cmake-3.patch 415 SHA256 708d9bc9e941e46b0d5a238993f39aa67ebb75b4d4662809d4edec4b2ae24c0d SHA512 770c2054efbbe06adf4aec02eec360c1efac25eb4823278dddb184592aaffa9b213247f51a65426109a27b11387652166377f695c2c27ef5b57c01e477ce2b03 WHIRLPOOL 553a7cf88fdd2d4450072fda6702274f7557ddcb053d75a9d6a0f7447e75e3803aef3e8df9a8df8df6933af64eb14339c1bf7815e6d8df4dcc20964462d3da42
 DIST kolor-manager-1.0.1.tar.xz 48016 SHA256 e04a7655fab3b6d3459f30254e0b70113ea45526dafc0d4f72b31f6e79e28630 SHA512 204c193f214e032f2abb9d8ec89fff4901ba01543b6ede924c2ff1a5a8466b8e963afcffbd4d62eb9161844b281be00abc412401f68830a6b4fd808f3bf3aa1e WHIRLPOOL 8bbc33ee93d40dc3d5eb05c8472e6efb18e42387c2fc9bb74c99a452eb07422c0c76bb2332d8356a5b09d3c8e1ff64f162d8600c91e3314d01fda694f34a96a0
 DIST kolor-manager-1.0.2.tar.xz 49276 SHA256 2fb2e48143fa9f6ab402eb4fc2062aba412a174e7770ccf0d4359b3ce3c3024b SHA512 a0971190d2143a9471e50d4690084b7d31b8cf6bf2524f9145d858c9e3cb2a9099bf5ec6cc513c9ee82df6e554a35ed15f453f95d8c25f31e3781a21bd780556 WHIRLPOOL 0900d408682ab08a11761e9f50363d812955453c90b5eb6d8c6bf689b8ec69638bf71a93f0ce9a11084e008379a412817ef0c00a016bea7a71aa9d53870b5a94
 EBUILD kolor-manager-1.0.1.ebuild 621 SHA256 82a4ca89258c614b69e65e8eec74f665e6b1d82267a3bf1b7e4212f97353eead SHA512 22f45c21a830202e5bb9563e45be3b8c8b871f6c2ac0caaaf57cd42e4902964305df33e1bc8f9df8b511cf9563a68691e35835d3f576d83d73ff0b9de7a901d5 WHIRLPOOL 682249c81e5a903b9e7365b4e3596eec97f4634983890f62f3121ce43f439e5004e8a33682652c507504363a1d7a9403a19cf793fde766465f9334a33040961d
-EBUILD kolor-manager-1.0.2.ebuild 634 SHA256 715ea5de55a817ed454cf9c3f171cbc3e89cfb087624f2266f9977d6c40989a8 SHA512 5ee10ea89c848f2f0c5465e0384f392b9f3a54ad3270ae0d857169033f3e29c3d2165c2f3c8f788e386558b5602154195075aae0a72989d39e5493bd007951d3 WHIRLPOOL 3c86b456c9db1a008503b2159acc0002bfb680b64aa89860a05ba68a16865d9f55093cc5d932d027b5eb5e79dd6ef050fec6a2a90110a31a4ee283f2e198516a
-MISC ChangeLog 2095 SHA256 693534674bae35d723c2e50253564a9f795a0880bfbed29531092c5bae295e27 SHA512 d501be1b806ebca044f7dd17b3b6e200c9b903c40b6d857b9d43601d393f751fc6fe3a7f3cc21b5ea8fb2c318403f82a7b0e2c84e5928a192bc6cd66148c4324 WHIRLPOOL 9f35a809d2ad557827a72c9c0a6c1c80fa68bac3d54588a0ece62ac41a4a08b203504b9c7bc544d8611c11e704f7a1b95eb73e2b64a7687fa78825116060752b
+EBUILD kolor-manager-1.0.2.ebuild 685 SHA256 b53952b0828dbce795f5db5decab563e8396d32f8b214c094d18734a53c4adf1 SHA512 8958aa801039e405a559abfdc0e37427f8e7409a354f047ade340b5c90834d914c353c316a4400a5cb96df35f2c36758b2b6966854c81c7767a3fe4bc0cd242b WHIRLPOOL 3635122d2523f813de465df1ad94bf92192f2dcf082c75a5b0b578bb27d0e0822837879d5a22b11ca7b1e9415ca70bd1f620d76abbc6a55af37f1f84c71a08ed
+MISC ChangeLog 2281 SHA256 759eab70870177f9a095b825a52d0b53d68bea2ada9d6de3fd9bf4734fd946c6 SHA512 c085a4c42dabccefb96154fe0b994e03ff6c5365e5c1c14f8dea254fc4656385c02aee19318e809888cabbf5b8c1e7b6b2ab2e94ee57c12660985d5d256f51c3 WHIRLPOOL 40c155f905ae4aff82c4e32fa0526f0fb2e1d69863d980fa9f9f88a4ee44368cad49e2e423f7428e53d068f72970c794d68f5481883d2d4d450c071c9e000b54
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUyP3BRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJUyP5yRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7MmXEACEpqLuzLpd7+z7NY9Q0S+IJqii51MZlhHd/YwzGRj5YvVO//wrEyFAjFxW
-m6Jx4Q+DVb1TETF2uV8t9qOsWMJHvBpD8swU4sdILLAeLk4n1s4rQ4gEGB2dXD4M
-wGgSeU0PWzLdYKrChRzLhMMEqIWgQOZVTPyDMs0eHDXrN6to98a/+iW8p3epZWpz
-G83JAwO6TW59cGd1IWVACTiNboUOoFAc1U4GgksPotlP7lAyrKsEdpcQYxqtHTZq
-ap685Xd+KD2Pl/I0bW7ipxxrSUWxLxm66C5+uwu+uUR81UovKIw5Y/8CeXZlTBq9
-8Vq3Ldpudy7iweFevAmz1KoNDDTNNZS3WULIgH+spTT0AeLoPYyCkLXTYQ9j2pnY
-lEdVxDioMLqVSnSwJDQsjmGuBvKtGPLD1iYFNV+qeb4p3nPS5h+ustY8w4vkHZab
-6eiDJWogrRG4pkRo5C+bh9q84dx9MFoeN8cAWUzF/T1K+6DfErM0uFek4nYMqMD9
-T3myYnUmma+r9jQjwL2eddXZpZ4LrUwvIL1JefQ708K+jTUkZq4cjnclL7gdntk1
-bja0NCUMBwGKwi3y4asWIi/0Rk5/uEb6dT+T5nr3lvNOhNUgYxkkeQN8TEk2mmZA
-CY3a7Q4Q8Ih5dB1L2F7kTerK3PZa0qd0jZSY9jSpMfBh/F5grw==
-=UfzX
+7GQ4D/9khUxGsCTdRWd584mro/avR+RQDJfwyuRzcXbFW02xs+moFsmVj5UNJ+2x
+aYcnF99RT1aHOPO+oGbOx5NGwvT+44YVQSNwIKs6vCsPD20PZc/rs0kWWlCzPfyc
+HwlHe6lz9K9f/fUr9J/TUm0nLYGe93kkY5LJwDjQHYkmBcgUu/Q6lLceF/TUi4Kw
+46+dhaL9ZbCozrQiI/BXJbcE/RmNUIO7kqmTe3shezIGsqeO0us91Skb1Lo3EAat
+38fu2ldXl/mQasJ5GqEXJ4sXRwI03vmSUUg9hs9XAMUia9Xj7B+XLabZMgmFSgW6
+jkQHQ5AjuDyfBLyJUFZjILboqp3pHPh0UACajLlXIrKzmwfus5hBdc0NIc7JPcHi
+WWHibXzulqA6omJRCd1SgdKFsrDtxm2xRICLmXkoqySv9Cp3K7yhd1/r1iGbVc3j
+BSzqpdxXU5bRNnkg8nGVRyC1Ohd1xqSMsu9JmS7AZZjqJdyI9Vgz2nuexb4onOsQ
+CaBJsu2DDPf8jf1Le5lM1bXFYCb82rCtNFZDd1QkOkX6F/wh6tr8LOEOndcFVsWr
+zCFu8V+haSFltadFT3p0XDcP0JJdHHHfFenpnqEh96TFDXgJ65GfuUj2zizcFSSY
+4VWp7YLkoRsT2IEZ2gHGGDBoj4QRpA+f8yDkBpl3JAZ/6CyGsA==
+=cFbk
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kolor-manager/files/kolor-manager-1.0.2-cmake-3.patch b/kde-misc/kolor-manager/files/kolor-manager-1.0.2-cmake-3.patch
new file mode 100644
index 000000000000..a29b13e589eb
--- /dev/null
+++ b/kde-misc/kolor-manager/files/kolor-manager-1.0.2-cmake-3.patch
@@ -0,0 +1,15 @@
+INCLUDE is for loading CMake code, and this fails with a fatal error
+in CMake 3 as 'settings' is a directory
+
+Gentoo bug #537138
+--- information/CMakeLists.txt
++++ information/CMakeLists.txt
+@@ -3,8 +3,6 @@
+ find_package(KDE4 REQUIRED)
+ include_directories(${KDE4_INCLUDES} ${kolor_manager_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ 
+-INCLUDE( "../settings")
+- 
+ set(kminfo_PART_SRCS 
+       kminfo.cpp    
+       )
diff --git a/kde-misc/kolor-manager/kolor-manager-1.0.2.ebuild b/kde-misc/kolor-manager/kolor-manager-1.0.2.ebuild
index 21e8d4105c6a..94408a77da22 100644
--- a/kde-misc/kolor-manager/kolor-manager-1.0.2.ebuild
+++ b/kde-misc/kolor-manager/kolor-manager-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kolor-manager/kolor-manager-1.0.2.ebuild,v 1.2 2014/08/05 16:31:40 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kolor-manager/kolor-manager-1.0.2.ebuild,v 1.3 2015/01/28 15:21:20 kensington Exp $
 
 EAPI=5
 
@@ -22,3 +22,5 @@ DEPEND="
 	x11-libs/libXrandr
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-cmake-3.patch" )