Add patch to fix build with sys-libs/ncurses[tinfo] by Mark Wright <gienah@gentoo.org>, bug #468622.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 66 insertions, 17 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index dc7b7aa43903..806dca9fed95 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.277 2014/05/06 12:21:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.278 2014/05/06 21:12:34 johu Exp $
+
+  06 May 2014; Johannes Huber <johu@gentoo.org>
+  +files/cmake-2.8.12.2-FindCurses.patch, cmake-2.8.12.2-r1.ebuild:
+  Add patch to fix build with sys-libs/ncurses[tinfo] by Mark Wright
+  <gienah@gentoo.org>, bug #468622.
 
 *cmake-2.8.12.2-r1 (06 May 2014)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7b02aa79dd5e..7f3d9d5291a7 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -22,6 +22,7 @@ AUX cmake-2.8.11.2-hppa-bootstrap.patch 820 SHA256 9a9923701573452550a4ac6f6ed6e
 AUX cmake-2.8.12.1-FindFreetype.patch 1404 SHA256 68e4d69aadde939087d257e88273e6fa075b9533dcccc32b0c3ed7d96af6a832 SHA512 f07a6ca20251bd517e4e63ed81a6d67c388de7c53cce6177252a86eb1c68b3fe2ecfdf7493d3f6baba56d58d1b35da181dee7f4a99ae63ac18b0c2398f3d3d76 WHIRLPOOL e7ab5a1987ba1ae0fe8e91ff1535cc870cedc3b4282d4c3721a627cd8fc948a5e2f81214287cf50b35f7b20928526022ed13bc900fd8334244c10c89435267c3
 AUX cmake-2.8.12.1-FindImageMagick.patch 1700 SHA256 042a843bc6204efee071af2cdeb451c5da3da852cba0d522dea1d264ff1014c3 SHA512 4c533e3bf3127eb0696b557fe381bfd88f3ebc70b29a33f04b7bf95fa7c765cb237abe34b6a406b452dd71fbc3d79740d58ae981eedca952f9fae272ea4f5efa WHIRLPOOL 25c5c7c47b2874b32143a9fe14443aa6da8f3abb6c92b0bd94f3848dd7d8114d901a0bc6fbb78547879f5af947f87f070e24cc2deeecd7bb4cc95290a7af7d40
 AUX cmake-2.8.12.2-FindBoost-python.patch 5494 SHA256 4e514122d8078f2b1db10c842f2c5d35713849b72d742848281954040eade4cc SHA512 450be7d80edd54e9d2a609645a0c58f6672fbe623a49bddfa01c3903f9fb2f0d944ae7bc884829fcb48c194e873bede372dd350b9a9d521be2ff2c0e3198b0cb WHIRLPOOL c8486b950f35ce4bad76ba9dd4b3b256c8b6a62e5321d1cb1f99ca5a3c8146830eea5c487494571d92bddf0a10a2db5d89e5ad53bd0aca9f29d218665290077a
+AUX cmake-2.8.12.2-FindCurses.patch 1525 SHA256 85d71d32b0bafffaa2c24e6e7432db1c35e04eae790fc27e515210c8c5f7e812 SHA512 74d6390fa253764c7d6e94e5ed566b886dcd93f35ce840979faeb86f48e3cb5c35aa77895adf39df5708954c256dbd2d277eb1f58f21829805abb11ba2802462 WHIRLPOOL b4041827630a9f53f499d3b448c30cdba32ab4d7962d51e1e6a8a779f55d502a529127ebc477331d3d4fdc87249449e95a51601ca10125d75d19605204e585a6
 AUX cmake-2.8.12.2-hppa-bootstrap.patch 1195 SHA256 fb31515c540fc6d5b2e9d0a3ba3df8d11a74b84fa474e3845285345a219c8a65 SHA512 25ca780843248638502d389d078588194a4eeaa2cde163076b57c588ea6acf78a8ee832eb76d45b747467b31da5562f7d05715ecabcb6c1ce985a98d5f677e68 WHIRLPOOL 41d723a818b6e8d0993abfd6cb77ad505013526b4b2ba11e00200b590b9a27efa1dabeef02ec22c9dafbbcdb003b76b110ce0c9b22f0f1d8a29adf35ccd6de90
 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
@@ -35,24 +36,24 @@ DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86
 EBUILD cmake-2.8.10.2-r2.ebuild 5062 SHA256 ea6ebc14c28c352ae27758386775d8db2ec411d1f244f932e8ae1c57532413b0 SHA512 8fe2c50a8809f926ce2aa3222500cc354aa646c6a7ec139a2b04465b43ea2c97afe3568e573dfb726126a69747f340be971f1e83734c2fa469ce4d847d389ff9 WHIRLPOOL eb1c197d62354d8e3dcad0a87235b6c8a0b0738213fa313151c643354fe8600f786a177f06a9ef8ad5c0f8508025a150f3f94ba3bc70f5507451ba68eaeb2992
 EBUILD cmake-2.8.11.2.ebuild 5401 SHA256 7eb8b3527f4157430aed90feddebab02f7f92a03ff8e272cee5e04bc211fc08b SHA512 5cca83611203369fa518ddeef03a2c1fa031bd7358e45b36a609e3874cd56e54e3730bd35157e099a73f3e2bd056a0c13173aee20a8f5885380bd7723ff2b96b WHIRLPOOL a7494ba8f24f23eb77f2598c7912a001cf26c9ea16da7375436c055d9f89470cd2f6cf2dfe1d66e89fed440801af98b7bc38837a3fc0e3f6351cd85869b57700
 EBUILD cmake-2.8.12.1-r4.ebuild 5507 SHA256 87a20a903e3e897f8d930209b9d44e6ab941853c56ab1d1ca3e6197e85612a61 SHA512 4c2b23facc1e7eea011cc7bcd8ea029c0062609a9b27d1c2c4a2cd7d6a35e762dfb4a19a61579662ae1b223dd4f3801c71fe43eb5da976f2a381262978206c1c WHIRLPOOL 5338d265a3d9eb983b58c1e04e6d6b675f2c2816df24ba500f9a40c5016fcc0cc5e06b0583b300cacd95a5149120810baccace7f5f9796aaf6edef80bf41b71f
-EBUILD cmake-2.8.12.2-r1.ebuild 5556 SHA256 88ef6bdd282a730386b52c03f518002176532cc7499022a70637e289d387272a SHA512 c5a6c0c9871a4f37e4b27c52d9eeb947703a8271a95c402547c7b0dbd20b343981bfa139a59f3e3b435b618aebd7215d35d2f9c5fefd2ef92df2b2bf0bd693b2 WHIRLPOOL 75d7c70121a3674007f7cb20a728aa89c377599e4750e0fc85f3d54ce0beb4564b690dd10df61a4686390a5bd917149fc3246a4e22480c9c40cde594568808dc
+EBUILD cmake-2.8.12.2-r1.ebuild 5603 SHA256 8794275b77cd07def1c7929554797459cd0e8cd2e5eed2bde2043900411b7974 SHA512 ea8990996073dc54bc54ed2a1d2c3c0a6107333b485abf3cd716092d58d465899dd07ab0be9e299e3f6009af63b556e530e74f3403a8c9bc16997b8101463d30 WHIRLPOOL 5674895acb8e12825a1b8ae15b5ae4d77fa36adc09723e5e55ef37d38861a5460de469708350b2c8d473ddccfece60c7af25efc91241df2526e619b51d3e8395
 EBUILD cmake-2.8.12.2.ebuild 5549 SHA256 f90ee46d905bda2173a66a55fd14823576425f25474675563e232bd3d27c5e1f SHA512 1787df4d1a79469bf80fdaa6b24cc615be20011a4ed9729d12862804b12a4663dbcd8456d2cce7698234f7adaa2daa795ec1fbbf51e8d9ee84ecb5ff3f38a261 WHIRLPOOL d7068bafb078f0e4635bad785e32e75d06edef15e5b0db629c9d8cbe51c9b803ceed5fa91f70bdba1d802fa74f1d959e94bfa16257d6c2389b22c65cd24cffe6
-MISC ChangeLog 44665 SHA256 5891de674907420e1eb685451071333e8e4b63ea3b61b8b396c301eac84b477b SHA512 d8684a0111309b7f3be3d44c108bc61e0958b106dbb991ef22ca2d6e40783107a6dbc4d2afb6a89bcfea4825b84fbe6252faa7ac31ef85ba65f2ac0fd95c0230 WHIRLPOOL 7948d3a78e35dd8bfcc46e12cfbe88685f44ac5e5a57d7202ea61e580ca6edf2231147c9be504d39c594ac0ec95b68ec55729fd633099e4893944098f1fd643c
+MISC ChangeLog 44887 SHA256 6b69a871888e71891961ba890c371004ddf2814c4dc3d46235adac6b27243349 SHA512 a77314cbd2b83c480ec84d1f71ca933b87ab1ad66f8738ab45f79f991b8f7f3f7e35a4a02ed38631ad0303ab202ec276e2b25506cf6a842bd7c98ab5870a0d75 WHIRLPOOL b2900612abf4c1d201e42423417dda0bd485456f039fe032cb79d12ce2c34399356b2ed1b9ca23936e29b8d709de49eabd89eb8b1464c2137623d26e56bbec90
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTaNPaAAoJEGVpnaTzz9K9imwQALYz6I2wnyGQz1Rj5TsvHEbw
-fZue8xj/TZy4JSbVD8EtkGySo5GxNNyapVR7euRypDjs0j+idDGPYAM//xKNLTSn
-TGFROwf4Up6KlQpUMPL92r1LICjeYIHziL/ino2kBrhq97zHEcs2VQqW3acdsmDl
-onaFjby6jBCBb9aDouXlsRMsoTtEIHOLdYeFBEnhpobhpB7NLSE7hLro9z/Kb/HR
-6E8OCrVeN2VrOpAIJOkAonuJ79QrxqkYCEu26VC33cbZTIfNY4tt2bk+KpJ+w8CW
-OuWfLyGD8L1UDwrHahq09YWPoyAxmpwkIXwxxjkGxpflieHRqv0Qqp44DnIrT815
-ksL6kXfaSaA604aE2FaKXg+KG4fZuGsBUVtZlvQrEIVOGKe532Y3ezS4PSvOOhYx
-2TQREUbj/COUYkCyZxhq9XQXsXT/B3NPL0PUsxM1TROagDHo88UdDkS0/uhuCFBi
-BISh9BYTV5K+jG/BGNviCcYlj+kD7elt3Nj1D0Klwvx07sY8Ue9KEnpnejiqCQDq
-hCnD/oW/WH6gA8jGigKnoVkgdcXsoWL1/Zhfc2CxLtF6ZPCL9OdK1ynpKRHj5HVk
-fljevyJXSxLtR0XSEUZlzSnZFnPWcQEU+d3V03Gq9QTbTiqjcY/m3VTVZzohn64c
-RvbyhyDdqADEXmTbHzoz
-=gQ/z
+iQIcBAEBCAAGBQJTaVBHAAoJEGVpnaTzz9K9fkYP/2ePvML7hukJPONqRLGk8y5l
+AAS37nmqxvM9brUZboV/ixxRrBlh2FFILQSoB+C1pEhRPRyEWVR1vECi3HWYrjaS
+RBk458tkRXjZXc7uXZqveqpzt+D9snK5vSNdVWVPXvxVluFgmSR+ajhoTWiqzBIA
+E4Uqu9gqsIljjX99z+SLm9Bo49myRSOUKPsfMqWzZCSgyIJBnDSx/eEC5VYrkyJX
+OO/AL/b4fOS/XcEb6zwQbHZ4DUiPwfa0uvKLmr95oC8DqjBVtUZKLIO2f7Q1wq3e
+CnYMBWYfdI78zjsiKNBA3+MNrR2f/4Op69Ma3Y52u+r8RGvNLNV5vkhbYYwLXlmR
+nsHITvqLZtmDTgN+BouIWtmQTLpgkQ9sY93CM7IJdiCG4lbYlZALJ0xk1Gd16qHL
+/dqf3iYS+aat3Z3VCSITb2H6JhfgMjZoOXzb85lPUq3/8S4MzHjsZkvybwLXMD1i
+A95JlV3HSsZKyh5qYhTOabFVU8CRHj3mP9ZEK0AFwvK7JunKktpcfAjxpgK2GN7Q
+3Si8qxaFL4w1aIMPhA89QH2+0jxJHtBIzpFLFCpKWXsQQmVdGnM3xSrgc/Y/ovcm
+HYS77r4nip8I59a6GaFZSWxw9lgE8rqRn6pvl32Br/g7nGU4ATayDZ/gZQgwWQ1C
+ScHpU9/GO6v/Yd83coQi
+=ne2j
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
index cd4a0a4baf1b..25a198e550a1 100644
--- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2-r1.ebuild,v 1.1 2014/05/06 12:21:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2-r1.ebuild,v 1.2 2014/05/06 21:12:34 johu Exp $
 
 EAPI=5
 
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
 	"${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
 	"${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-FindCurses.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch
new file mode 100644
index 000000000000..43a2a7f4a2f0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch
@@ -0,0 +1,42 @@
+--- cmake-2.8.12.1-orig/Modules/FindCurses.cmake	2013-11-06 06:07:22.000000000 +1100
++++ cmake-2.8.12.1/Modules/FindCurses.cmake	2014-01-17 21:55:40.630142386 +1100
+@@ -30,7 +30,7 @@
+ find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
+ set(CURSES_USE_NCURSES FALSE)
+ 
+-if(CURSES_NCURSES_LIBRARY  AND NOT  CURSES_CURSES_LIBRARY)
++if(CURSES_NCURSES_LIBRARY  AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
+   set(CURSES_USE_NCURSES TRUE)
+ endif()
+ # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
+@@ -125,10 +125,20 @@
+       CACHE FILEPATH "The curses library" ${FORCE_IT})
+   endif()
+ 
++  CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
++    cbreak "" CURSES_NCURSES_HAS_CBREAK)
++  if(NOT CURSES_NCURSES_HAS_CBREAK)
++    find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
++    find_library(CURSES_EXTRA_LIBRARY tinfo )
++    CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
++      cbreak "" CURSES_TINFO_HAS_CBREAK)
++  endif()
+ endif()
+ 
+-find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
+-find_library(CURSES_EXTRA_LIBRARY cur_colr )
++if (NOT CURSES_TINFO_HAS_CBREAK)
++  find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
++  find_library(CURSES_EXTRA_LIBRARY cur_colr )
++endif()
+ 
+ find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
+ find_library(CURSES_FORM_LIBRARY form )
+@@ -172,5 +182,7 @@
+   CURSES_INCLUDE_DIR
+   CURSES_CURSES_HAS_WSYNCUP
+   CURSES_NCURSES_HAS_WSYNCUP
++  CURSES_NCURSES_HAS_CBREAK
++  CURSES_TINFO_HAS_CBREAK
+   )
+