Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 412232 Details for
Bug 559500
dev-util/cmake-3.2.2 fails to build with musl
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
alternative patch for musl 3.2.2
0001-Fix-Cmake-3.2.2-Under-Musl.patch (text/plain), 87.32 KB, created by
toast+misc
on 2015-09-19 07:02:27 UTC
(
hide
)
Description:
alternative patch for musl 3.2.2
Filename:
MIME Type:
Creator:
toast+misc
Created:
2015-09-19 07:02:27 UTC
Size:
87.32 KB
patch
obsolete
>From d9d6267af8926d3a873fa05e98fd9870e3a7b2ff Mon Sep 17 00:00:00 2001 >From: Chloe Kudryavtsev <chloe.kudryavtsev@gmail.com> >Date: Sat, 19 Sep 2015 06:54:41 +0000 >Subject: [PATCH] Fix Cmake 3.2.2 Under Musl >Cc: musl@gentoo.org > >mode_t is defined in sys/types.h (specifically: bits/alltypes.h, which >is not meant to be included directly). >Cmake before v3.3.0-rc1 assumes it's defined without that include (as is >the case with glibc). >Patch also relevant for any version before v3.3.0-rc1. >--- > dev-util/cmake/Manifest | 33 ++++ > dev-util/cmake/cmake-3.2.2-r99.ebuild | 194 +++++++++++++++++++++ > dev-util/cmake/files/50cmake-gentoo.el | 4 + > .../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 +++++ > .../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++ > .../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++ > .../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++++++ > dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++ > dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++ > .../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 +++ > .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++ > dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 +++++ > .../files/cmake-2.8.11-FindBoost-python.patch | 73 ++++++++ > .../files/cmake-2.8.11-more-no_host_paths.patch | 130 ++++++++++++++ > .../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 +++++ > .../files/cmake-2.8.12.1-FindImageMagick.patch | 23 +++ > .../files/cmake-2.8.12.2-FindBoost-python.patch | 77 ++++++++ > .../cmake/files/cmake-2.8.12.2-FindCurses.patch | 42 +++++ > dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch | 38 ++++ > .../files/cmake-2.8.12.2-hppa-bootstrap.patch | 27 +++ > dev-util/cmake/files/cmake-2.8.12.2-python34.patch | 34 ++++ > dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++ > .../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++ > dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch | 43 +++++ > .../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 ++++++++++ > dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 +++++++++++++++ > dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch | 43 +++++ > .../cmake/files/cmake-3.1.0-FindPythonInterp.patch | 29 +++ > .../cmake/files/cmake-3.1.0-darwin-isysroot.patch | 48 +++++ > .../files/cmake-3.2.2-musl-fix-includes.patch | 66 +++++++ > .../files/cmake-3.2.3-musl-missing-include.patch | 28 +++ > dev-util/cmake/files/cmake.vim | 3 + > dev-util/cmake/metadata.xml | 8 + > 33 files changed, 1572 insertions(+) > create mode 100644 dev-util/cmake/Manifest > create mode 100644 dev-util/cmake/cmake-3.2.2-r99.ebuild > create mode 100644 dev-util/cmake/files/50cmake-gentoo.el > create mode 100644 dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch > create mode 100644 dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.10-desktop.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.10-libform.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.12.2-python34.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch > create mode 100644 dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch > create mode 100644 dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch > create mode 100644 dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch > create mode 100644 dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch > create mode 100644 dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch > create mode 100644 dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch > create mode 100644 dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch > create mode 100644 dev-util/cmake/files/cmake-3.2.2-musl-fix-includes.patch > create mode 100644 dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch > create mode 100644 dev-util/cmake/files/cmake.vim > create mode 100644 dev-util/cmake/metadata.xml > >diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest >new file mode 100644 >index 0000000..8e0b258 >--- /dev/null >+++ b/dev-util/cmake/Manifest >@@ -0,0 +1,33 @@ >+AUX 50cmake-gentoo.el 244 SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb WHIRLPOOL aa60ffe7e5edd00fdbb32ce2c9aee24fddd6e4d064b8bde55c7ff3b42196c3420596653aade9cc447a3293050c5ab23a27a556f26806e4d67139d264a38d1aaa >+AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 SHA512 fe3148f9a09363c5943f09b963391a4276f2da6095e66c28a1c365fd655e2124e1931b40890152836e24a3c9e330db799199d8ae295fe4581f7124b42f09f928 WHIRLPOOL 322a805a2df9afa40c7ff217481819462d90d8259856696fa4ef76fda1571fa081577eb8cd06fbee899911b01243a912e43a9dcc667932f9885492fcb92c0f98 >+AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 SHA512 13dfb5d1ed271eaf673aa53c40a5a17a89812c7617e840ffd3df962e9ed6e46da7b507121f56314a2ef8b86a80b2453cf327684e2c4e82bb903cd8210807f507 WHIRLPOOL b43a187a6f90590460b6e499630a6f6d550cee09309c4c32c0b7d68189bcd84dac309ae4b80bc345de5b32dcc4ac94f789c1fea8162cea4175847c49dc862ccf >+AUX cmake-2.8.10-darwin-bundle.patch 956 SHA256 8195342561ada36d4e3796a906fc662f9f84cc470809e7596b4376f3fe90dbac SHA512 39f444f592f435fbcc865a903ccb851b6c40ddf5f3b99b986c92af6b8984978d4fa1819808f1365f53887098da8533c31f6ea29e14cb541045ed3f63fcc771e2 WHIRLPOOL c20412508cad6329bebfb152051008c5ff98f0a27657d047992f4523a213d4ee396ea23c009ad2133b283ab4518d359b2b65d5034e06bd5649a6f08d76cb5db8 >+AUX cmake-2.8.10-darwin-isysroot.patch 1913 SHA256 a706da7288dd1f1fcd78291e411f34cb5e6d8eec3ea620011da9c7182e3e4df6 SHA512 862fcedba5abab3f7dab6eb56a680cc0f81090e551a1519f40a638a3dfd08ec083b2c67cdd174f2f32aa3e417b178e8b3bcde1e9db9d34f740b8e72be4306c6d WHIRLPOOL 46a523c1e9c8f17828a3130cc1ce37810cea408d04870939f30c4a5c0e777e1c5537b3e1c2e36690f6a21fa783057d6f5f9b8b7186b45b0f8056dc72041cdd1d >+AUX cmake-2.8.10-desktop.patch 370 SHA256 747eb8c75f82d1edf9683c31914892e19118670d4e2e955cdcf5a14f25fefe15 SHA512 bc5c6ca27e3317ac7c65e09733331e3732ea31c28d5b08b7fbd150845cf6657238b017d0782237ef57abab9fec249cacf78762dfe66c6389bc0fd9a91add0f08 WHIRLPOOL 5c446ba04f0d88a022a415c03e601ee6dc7cbfaebe8c564f9e5ca88a92e9f5755ae8435789e477ff14980a22e690748c7b0bc602e51bc8a074fb025010337dbf >+AUX cmake-2.8.10-libform.patch 1598 SHA256 8635248bfebe157e545eddc3c16223e4d8c51af51a8d224ef1003a043ce468f4 SHA512 08a0fb45f2b4c1a8ba0e961539d650e38feedd4b2ca3b5acc2fcad3d68fe3fcdb5b114663b1f84b26027e902d28cc2d4f50cc1e3491ba90d6c3c273aa32d62d9 WHIRLPOOL 505231f51be487dd71eb2f17cb65560eb86039673a593e1e76f3d7f27c3cb64dad36ef1c507aa9e97aae28b20f642dfcb4d023537e0a1af361e74c43b88a51e1 >+AUX cmake-2.8.10.2-FindPythonInterp.patch 651 SHA256 bae58e84982de8331a4038fdc1339baa42512ffb254dfbf553d3bf6f04221cfe SHA512 a1c68cc9f24addc771b8eb33ca6ac0d841311b634e5c5d6500924d70678408a666353791a8b2a00013e1b31545ecef6d26f939216b8fe7dcb8b6152c9e89f17c WHIRLPOOL 3c6a3f084d402244d8628bce6ac17a11eda0d55ced3824584284f63b5f1300f89921941257ded395e2aec88950ab65ca80dd9ff0fa6932f7eee908bd4778c688 >+AUX cmake-2.8.10.2-FindPythonLibs.patch 968 SHA256 4a2bbd60a2c526387ac8088d6bbecff1cc4399259d737530f2d55a6afd033b15 SHA512 e42713242202409e06a1b0725c6ea0a89c6d623d143e6c06def9681b72516a760ebddeccdf16e141e6b21ced2fb63e42337536afd6ca799e6d6d8689d48037cb WHIRLPOOL f92e7981f267310e471425b9f6595c54bf6df2af3fd99a0502bebaa39d87dcc14e31389d1c1bd99271718ce6b33f837842a0cdb454de09da60df5252f86cf826 >+AUX cmake-2.8.11-FindBLAS.patch 1524 SHA256 d59a2d1fdbab24d25c90e22047569745b6a2d80318d0914ab21c704286b1d15e SHA512 20b4f594a5fee9e20cccd1ec79797d2ac2e930ae2252ac544248ee7825ee76dbd32459ae6b87afd0d684a9a780dd1e1e78da361519dbb767fe761eeff6b545f6 WHIRLPOOL 38e13557dc7009ba422c5e6487b89c9847c2b51fa69c0d02eac20ea8c9d9d212a5b66f4ab9049d241ff0e4ffc23096117592c584b3b787dceb5e225a06ea9d75 >+AUX cmake-2.8.11-FindBoost-python.patch 5287 SHA256 95784f74c82fd412d81c850ccea8e2b0e333084dbd3dcaca3d2316986828e5c6 SHA512 db6ab343d3497ac2314250d094d4b608e83ca9d7f5c04d3b98e4461bd4655e155c189c39adffa9d31264564de6e382e227ba70c8c6ee8ab14dd8dbb7004490ef WHIRLPOOL 16358f1d91bd8ab79d51d3a772380b4e0d9ca65443dff685109e88e0c383f4edd181fdf7737cea7f8527684143704ba9154b3569dbe31ab34c9fdd2606c6487b >+AUX cmake-2.8.11-more-no_host_paths.patch 3797 SHA256 09a583d102f491c49d65282a8665ffb960f5801c7addc79e858a002d0c26ef5b SHA512 cb3bde23246c93f27d7cff2f0bb7fd17b0286da201a68a68abefca881cb2395844fe0adfa091f2f7657f44a56f2c5fba794430effe1edf0596c16f2d34c825bc WHIRLPOOL 5d53ba1a375da31cdd50cef63072480d3f0a77e785cbe6ee16b82ff6249e4244ad7ff67c9971533705bc97e396332ae0936bea3c6ef2002b5fc7f3a88d8036e1 >+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-fbsd.patch 1269 SHA256 9005632e98e9db50f6b71fd701babc345c1d194c506bcf4bdbc169fcaaf85533 SHA512 5e66cfa8d56f55a24423197815e6441c347d625cbe2529173686e4aa09995872a25265849b755b9b93695414764825a79d32eed4a38493d7fdf9857b66ae6aa9 WHIRLPOOL fe48e879b67ada6ad5ecac76bf4ec936463477d37d1e3dccafa1e2ff27d33d5a4c95ec82052c75a0ac2030b9aeea63509c269dbd2e1d5b440fd170a2df4435ae >+AUX cmake-2.8.12.2-hppa-bootstrap.patch 1195 SHA256 fb31515c540fc6d5b2e9d0a3ba3df8d11a74b84fa474e3845285345a219c8a65 SHA512 25ca780843248638502d389d078588194a4eeaa2cde163076b57c588ea6acf78a8ee832eb76d45b747467b31da5562f7d05715ecabcb6c1ce985a98d5f677e68 WHIRLPOOL 41d723a818b6e8d0993abfd6cb77ad505013526b4b2ba11e00200b590b9a27efa1dabeef02ec22c9dafbbcdb003b76b110ce0c9b22f0f1d8a29adf35ccd6de90 >+AUX cmake-2.8.12.2-python34.patch 1199 SHA256 72e8f1924ebc8739f6256bc35f65774658ff581192118733541fc242c96523e8 SHA512 4740321664c0eb0b19478eeeea20d848660dbe9e77959168fb1624567570eba0caee8179c5f4caafbac8ec46b56a9600aff3aeb43a8613cfe441dfe87d080a96 WHIRLPOOL 4fa63fb7b76557b78a689a38b8822bee3f166bf462647c83cf00b9b63381b08410fcabaedc12903436b9dc44b6db4b2f53ee0a75c6c833b8487153d8f15d7cb2 >+AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1ec32d409d91de9558f7e8f567323e SHA512 c5dab9c697df3593b8fb5222e619ccc1b1cc82beae0cd685ecabb1a0e31193cf663e95dc4d556e338c9f45e451fcb0fbc1a5f0bc39a65c67e6d9d9193f049990 WHIRLPOOL bc42012b830f998c5b8b892b84314fbc5ec6fdbdae627c2364d112a3e48c5350df9334b17e8b91bb4bd6377f10cc927fd3c3c8008370343fc19d43eef1fda005 >+AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe SHA512 b52986a9faf2329096452c3cf4b3066c2eb51b37d057bf46527dc7797fcd795936d63ad287419c2eba6ffcb0134b24544d62fb5c449e6a25354b65a4d5c63d8f WHIRLPOOL b444f6524b1e24d0c1040508babc03b229e7bac7ba11c978d155252fc8df9d052f7f23010c0db027af9f41e594d6ca131e6018f58a21d83f797762ddf644b911 >+AUX cmake-3.0.0-FindBLAS.patch 1577 SHA256 25be4e8671eff94b5cb7fe955215d9b97cc39e61f7203b4eb9b28e16977c3842 SHA512 c6239fe3d8b8e437b66399a3ebdf09da94f747dc6c45aaaba43773ce29a106727c7d4f8a570e1fd9603a9cdbade6b9702398c1989267adbcc5aebbeb59d30915 WHIRLPOOL 44366678ff681b3c876c90274d3b6709ad4ef7de051663db03fecdb77baffbd87b02c5edf53126b383680a58ef4c0a0100982240e58db352c781cd204907f2bc >+AUX cmake-3.0.0-FindBoost-python.patch 6481 SHA256 bd8ff52ce3565ab67806e2417d3c1e3c05215dde1da588f65dfc8db061ea3116 SHA512 4eed678c74af89e249de7202c553825cfd0132b84d605d078c388224a1add76acef778f366bb60e52e58e9ca25a23e18f8f6bef7385a9180fb1cab7d7698ffbf WHIRLPOOL ba4965b6e390a30178cd99806eda5d1fd669ccb894ba94d1f8ea358dcfbf10f9559918711912786cc3be16569b87d931d13712bd84a433b561f1092d8c71c416 >+AUX cmake-3.0.0-prefix-dirs.patch 4279 SHA256 5f5f544a861c8c79fe668cbe65bbba8c8c83e4eca82503f8e7b193ec476c2225 SHA512 f90b2114aa84509fe3763d5c2d29460c84334aedc48f1856e646d7118a80ece72b57084f9ee7e8669ce59d61337d967e8d01f6a68b7d3580f2230a804a0ab2ee WHIRLPOOL 70761c4b3c7886ebcf1d052237f77eb871b92846a35281c911c6cf5ef867d3df09b563399113ca8f7d6f8e912b9c170b074d296b82a480dcc4c8dd10ebeab245 >+AUX cmake-3.0.2-FindLAPACK.patch 1442 SHA256 394388bdf47c995bc540537ad2cb497c719eafc5298a19d41d1a672c02d3b221 SHA512 60b673005bb3cec6830a3f68922c5661bccd8d7d39d77172d1f59383e8f9912e3e74e052d5e632479d1b091357dbabef656049dffaf705cebae9ae99ea35e74e WHIRLPOOL 7b46096381aa9a94e92c9aac80993a3da75b80203050f609adf7672ac238d4dd3ad89ff8261e87bd040a4ba5b4b1b4e73bfdf9ac3ba55b2c33a6f7800315748c >+AUX cmake-3.1.0-FindPythonInterp.patch 1072 SHA256 463c0a681b92ed02f7802153457d530109c6a6ec686d6c02968ea84085134705 SHA512 5e3445f43793fbea561d24cf502d06264f3f27134420d7df18aee678901bb895912a0b7b7f73ec7321155284f821aab5dbd6046bb050c02f58a0bd5188dc85f0 WHIRLPOOL 65aaa246da0230df4ff45a21e398224751d67820153ed5b871ee6095ae97804da98057de114354ec7ff2abb8f438fbcdd5c0b70a718fef6974d39ee69f94ca6e >+AUX cmake-3.1.0-darwin-isysroot.patch 1922 SHA256 05b3f77f8f8a25c809cf0819867fa785a739d3dc9c34e5e9fbbb6b4ad9115710 SHA512 9fcdac45f1c4d8c90839e5f4a6c9f1d28c1767bf6b1767dd7d8d04d332558ef8dc775af65926c3d08a72a6e535c063a85956bf20a10e48016fa13533037979d0 WHIRLPOOL 31ea327e6c41132923a26dfce39b19961b1862e79fcfa3f9c80773f6c3181acbf44ab655a2b837c0ab2165d918c8709aa82321958ca4e0d93277d0a2a47c1127 >+AUX cmake-3.2.2-musl-fix-includes.patch 2713 SHA256 99929a021def1104e388d9fc95f96695621386312f2f0adec7d3c92e8dcd3c3d SHA512 2f4351ffa5eee60d4763e779db0cd4a1ad9ca376854b38d29cf272372059e382693edd8a8f2a9ddfd1b4f068ec9b68666879bd3270738c2062a6d7cdfa15fef3 WHIRLPOOL cf6d05104547deb09df98851371030b7cb47b0532c98be413ea43797d7cdb8b466f7522fee5d61625cd36ada62319a2ce1c829b00f90af6b338761febab8bbf9 >+AUX cmake-3.2.3-musl-missing-include.patch 959 SHA256 abb5e1eaaa3b07dc41e131ad9f42421456ed28b80b8390a4ef1b7770e4d35484 SHA512 340d01ecd3f5400bff850071c50b2068daf0bd1fe154235c7c0bca88524777dc418b53c5e1baf6e08741da3be2bcfd996da406dfbfa6d24ccc8185c0728d8162 WHIRLPOOL 48ef76ec94b3589993f21e63ee34e9d4b29a56687c067a06b3617b79f80c9012bb2f4d4d718fab855011d57f11d12e14761495a1a7849481786704e7069f7b02 >+AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc >+DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2 >+EBUILD cmake-3.2.2-r99.ebuild 5242 SHA256 d60ec765d5c528b2f5f0be3ad7b40a823c4cb93eb47895d6f8e34266ed67291b SHA512 4f2bbe6d950eb71f46e7f3c214ba5d76fee5d444d06125e5e99f9342ffa75de64f85f7454acfdc881b5a50dc88606773a9ff6d5fe34c8c743aa88f3a5629f07c WHIRLPOOL d5078a04e3a6c6b0c7b3b9e45c8bfb2b18ed292ff9d95a246e757ed605c94345ac370e16075504b245b34a407abffd1bc51021937fc2e78d3d01ae584427b99a >+MISC metadata.xml 280 SHA256 9c11fcc54fc2212abdf8d07008cdb7cd8c1352fb59aeabebf58ee6aa89fdd8c5 SHA512 7b3012e7dcac7f1a9d0bf66616fd5c43884d236d1d617993a6ad8b142af0a0609c7c87fd6f1f60e0187c4138246e63733bdce51ddc0ccf31523427e96b9c737c WHIRLPOOL 122044a3ae23a55d2a218478e9c309e9c373e0f00f22a1d97d4c9178cbfa63f4a250a1eff9e2ba6f7e3c80c457fc232e5219ce685347103324bb2b15c59cf4a1 >diff --git a/dev-util/cmake/cmake-3.2.2-r99.ebuild b/dev-util/cmake/cmake-3.2.2-r99.ebuild >new file mode 100644 >index 0000000..798eabd >--- /dev/null >+++ b/dev-util/cmake/cmake-3.2.2-r99.ebuild >@@ -0,0 +1,194 @@ >+# Copyright 1999-2015 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Id$ >+ >+EAPI=5 >+ >+CMAKE_REMOVE_MODULES="no" >+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx >+ >+DESCRIPTION="Cross platform Make" >+HOMEPAGE="http://www.cmake.org/" >+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" >+ >+LICENSE="CMake" >+SLOT="0" >+KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" >+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" >+ >+RDEPEND=" >+ >=app-arch/libarchive-3.0.0:= >+ >=dev-libs/expat-2.0.1 >+ >=net-misc/curl-7.20.0-r1[ssl] >+ sys-libs/zlib >+ virtual/pkgconfig >+ emacs? ( virtual/emacs ) >+ ncurses? ( sys-libs/ncurses:0= ) >+ qt4? ( >+ dev-qt/qtcore:4 >+ dev-qt/qtgui:4 >+ ) >+ qt5? ( >+ dev-qt/qtcore:5 >+ dev-qt/qtgui:5 >+ dev-qt/qtwidgets:5 >+ ) >+ system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) >+" >+DEPEND="${RDEPEND} >+ doc? ( dev-python/sphinx ) >+" >+ >+SITEFILE="50${PN}-gentoo.el" >+ >+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" >+ >+PATCHES=( >+ # prefix >+ "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch >+ "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch >+ "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch >+ >+ # handle gentoo packaging in find modules >+ "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch >+ "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch >+ "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch >+ "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch >+ >+ # respect python eclasses >+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch >+ "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch >+ >+ # musl includes >+ "${FILESDIR}"/${PN}-3.2.2-musl-fix-includes.patch >+) >+ >+cmake_src_bootstrap() { >+ # Cleanup args to extract only JOBS. >+ # Because bootstrap does not know anything else. >+ echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null >+ if [ $? -eq 0 ]; then >+ par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') >+ par_arg="--parallel=${par_arg}" >+ else >+ par_arg="--parallel=1" >+ fi >+ >+ # execinfo.h on Solaris isn't quite what it is on Darwin >+ if [[ ${CHOST} == *-solaris* ]] ; then >+ sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die >+ fi >+ >+ tc-export CC CXX LD >+ >+ # bootstrap script isn't exactly /bin/sh compatible >+ ${CONFIG_SHELL:-sh} ./bootstrap \ >+ --prefix="${T}/cmakestrap/" \ >+ ${par_arg} \ >+ || die "Bootstrap failed" >+} >+ >+cmake_src_test() { >+ # fix OutDir and SelectLibraryConfigurations tests >+ # these are altered thanks to our eclass >+ sed -i -e 's:#IGNORE ::g' \ >+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ >+ || die >+ >+ pushd "${BUILD_DIR}" > /dev/null >+ >+ local ctestargs >+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" >+ >+ # Excluded tests: >+ # BootstrapTest: we actualy bootstrap it every time so why test it. >+ # BundleUtilities: bundle creation broken >+ # CTest.updatecvs: which fails to commit as root >+ # Fortran: requires fortran >+ # Qt4Deploy, which tries to break sandbox and ignores prefix >+ # TestUpload, which requires network access >+ "${BUILD_DIR}"/bin/ctest ${ctestargs} \ >+ -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ >+ || die "Tests failed" >+ >+ popd > /dev/null >+} >+ >+src_prepare() { >+ cmake-utils_src_prepare >+ >+ # disable running of cmake in boostrap command >+ sed -i \ >+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ >+ bootstrap || die "sed failed" >+ >+ # Add gcc libs to the default link paths >+ sed -i \ >+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ >+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ >+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" >+ >+ cmake_src_bootstrap >+} >+ >+src_configure() { >+ local mycmakeargs=( >+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON >+ -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) >+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr >+ -DCMAKE_DOC_DIR=/share/doc/${PF} >+ -DCMAKE_MAN_DIR=/share/man >+ -DCMAKE_DATA_DIR=/share/${PN} >+ -DSPHINX_MAN=$(usex doc) >+ -DSPHINX_HTML=$(usex doc) >+ $(cmake-utils_use_build ncurses CursesDialog) >+ ) >+ >+ if use qt4 || use qt5 ; then >+ mycmakeargs+=( >+ -DBUILD_QtDialog=ON >+ $(cmake-utils_use_find_package qt5 Qt5Widgets) >+ ) >+ fi >+ >+ cmake-utils_src_configure >+} >+ >+src_compile() { >+ cmake-utils_src_compile >+ use emacs && elisp-compile Auxiliary/cmake-mode.el >+} >+ >+src_test() { >+ VIRTUALX_COMMAND="cmake_src_test" virtualmake >+} >+ >+src_install() { >+ cmake-utils_src_install >+ >+ if use emacs; then >+ elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc >+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" >+ fi >+ >+ insinto /usr/share/vim/vimfiles/syntax >+ doins Auxiliary/cmake-syntax.vim >+ >+ insinto /usr/share/vim/vimfiles/indent >+ doins Auxiliary/cmake-indent.vim >+ >+ insinto /usr/share/vim/vimfiles/ftdetect >+ doins "${FILESDIR}/${PN}.vim" >+ >+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} >+ >+ rm -rf "${D}"/usr/share/cmake/{completions,editors} || die >+} >+ >+pkg_postinst() { >+ use emacs && elisp-site-regen >+} >+ >+pkg_postrm() { >+ use emacs && elisp-site-regen >+} >diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el >new file mode 100644 >index 0000000..e4a1a6d >--- /dev/null >+++ b/dev-util/cmake/files/50cmake-gentoo.el >@@ -0,0 +1,4 @@ >+(add-to-list 'load-path "@SITELISP@") >+(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) >+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) >+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) >diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch >new file mode 100644 >index 0000000..02c3011 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch >@@ -0,0 +1,39 @@ >+http://public.kitware.com/Bug/view.php?id=7933 >+ >+diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx >+--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 >++++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 >+@@ -38,6 +38,13 @@ >+ int main() { return 0; } >+ #endif >+ >++#ifdef TEST_KWSYS_LFS_SUPPORT >++#define _LARGE_FILES >++#include <iostream> >++int main() { return 0; } >++#endif >++ >++ >+ #ifdef TEST_KWSYS_IOS_HAVE_STD >+ #include <iosfwd> >+ void f(std ::ostream*) {} >+diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap >+--- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 >++++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 >+@@ -1005,6 +1005,16 @@ >+ echo "${cmake_cxx_compiler} does not have stl iterator_traits" >+ fi >+ >++if cmake_try_run "${cmake_cxx_compiler}" \ >++ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ >++ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then >++ KWSYS_LFS_AVAILABLE=1 >++ echo "LFS support available" >++else >++ KWSYS_LFS_AVAILABLE=0 >++ echo "LFS support unavailable, disabled" >++fi >++ >+ if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then >+ if cmake_try_run "${cmake_cxx_compiler}" \ >+ "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ >diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch >new file mode 100644 >index 0000000..ceb205f >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch >@@ -0,0 +1,19 @@ >+Patch by Heiko Przybyl >+ >+--- Source/cmComputeLinkInformation.cxx >++++ Source/cmComputeLinkInformation.cxx >+@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge >+ for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); >+ ri != runtimeDirs.end(); ++ri) >+ { >++ // Do not add duplicates. >++ // I'd like to have that check already in the list generation code >++ // but that would need lots of more changes, even in ExpandListArgument(). >++ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) >++ { >++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; >++ continue; >++ } >+ // Separate from previous path. >+ rpath += sep; >+ sep = this->GetRuntimeSep().c_str(); >diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch >new file mode 100644 >index 0000000..9cb4777 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch >@@ -0,0 +1,23 @@ >+Don't use .so for modules on darwin/macos. Use .bundle instead. >+Patch by Heiko Przybyl >+ >+--- Modules/Platform/Darwin.cmake >++++ Modules/Platform/Darwin.cmake >+@@ -26,7 +26,7 @@ >+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib") >+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") >+ set(CMAKE_SHARED_MODULE_PREFIX "lib") >+-set(CMAKE_SHARED_MODULE_SUFFIX ".so") >++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") >+ set(CMAKE_MODULE_EXISTS 1) >+ set(CMAKE_DL_LIBS "") >+ >+@@ -48,7 +48,7 @@ >+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") >+ set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") >+ set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") >+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") >++set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") >+ >+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree >+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache >diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch >new file mode 100644 >index 0000000..97c93aa >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch >@@ -0,0 +1,50 @@ >+Do not detect Xcode and set -isysroot for its SDK, since that messes up >+our toolchain, and hence makes any compilation fail, bug #445308 >+ >+--- Modules/Platform/Darwin.cmake >++++ Modules/Platform/Darwin.cmake >+@@ -60,18 +60,18 @@ >+ endif() >+ >+ # Ask xcode-select where to find /Developer or fall back to ancient location. >+-execute_process(COMMAND xcode-select -print-path >+- OUTPUT_VARIABLE _stdout >+- OUTPUT_STRIP_TRAILING_WHITESPACE >+- ERROR_VARIABLE _stderr >+- RESULT_VARIABLE _failed) >+-if(NOT _failed AND IS_DIRECTORY ${_stdout}) >+- set(OSX_DEVELOPER_ROOT ${_stdout}) >+-elseif(IS_DIRECTORY "/Developer") >+- set(OSX_DEVELOPER_ROOT "/Developer") >+-else() >++#execute_process(COMMAND xcode-select -print-path >++# OUTPUT_VARIABLE _stdout >++# OUTPUT_STRIP_TRAILING_WHITESPACE >++# ERROR_VARIABLE _stderr >++# RESULT_VARIABLE _failed) >++#if(NOT _failed AND IS_DIRECTORY ${_stdout}) >++# set(OSX_DEVELOPER_ROOT ${_stdout}) >++#elseif(IS_DIRECTORY "/Developer") >++# set(OSX_DEVELOPER_ROOT "/Developer") >++#else() >+ set(OSX_DEVELOPER_ROOT "") >+-endif() >++#endif() >+ >+ execute_process(COMMAND sw_vers -productVersion >+ OUTPUT_VARIABLE CURRENT_OSX_VERSION >+@@ -91,10 +91,10 @@ >+ # CMAKE_OSX_DEPLOYMENT_TARGET >+ >+ # Set cache variable - end user may change this during ccmake or cmake-gui configure. >+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) >+- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING >+- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") >+-endif() >++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) >++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING >++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") >++#endif() >+ >+ #---------------------------------------------------------------------------- >+ # CMAKE_OSX_SYSROOT >diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch >new file mode 100644 >index 0000000..e0cefa9 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.10-desktop.patch >@@ -0,0 +1,13 @@ >+diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop >+index 645eb76..7be495f 100644 >+--- a/Source/QtDialog/CMake.desktop >++++ b/Source/QtDialog/CMake.desktop >+@@ -3,7 +3,7 @@ Version=1.0 >+ Name=CMake >+ Comment=Cross-platform buildsystem >+ Exec=cmake-gui %f >+-Icon=CMakeSetup32.png >++Icon=CMakeSetup32 >+ Terminal=false >+ X-MultipleArgs=false >+ Type=Application >diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch >new file mode 100644 >index 0000000..052cc30 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch >@@ -0,0 +1,51 @@ >+diff --git a/CMakeLists.txt b/CMakeLists.txt >+index ea1c033..ae479ce 100644 >+--- a/CMakeLists.txt >++++ b/CMakeLists.txt >+@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) >+ else () >+ set(BUILD_CursesDialog 0) >+ endif () >+- if(BUILD_CursesDialog) >+- add_subdirectory(Source/CursesDialog/form) >+- endif() >+ endmacro () >+ >+ #----------------------------------------------------------------------- >+diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt >+index 96e28b4..4102379 100644 >+--- a/Source/CursesDialog/CMakeLists.txt >++++ b/Source/CursesDialog/CMakeLists.txt >+@@ -25,13 +25,16 @@ set( CURSES_SRCS >+ CursesDialog/ccmake >+ ) >+ >+-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form >+- ${CMake_BINARY_DIR}/Source/CursesDialog/form) >+ include_directories(${CURSES_INCLUDE_PATH}) >+ >+ >+ add_executable(ccmake ${CURSES_SRCS} ) >+ target_link_libraries(ccmake CMakeLib) >+-target_link_libraries(ccmake cmForm) >++TARGET_LINK_LIBRARIES(ccmake form) >++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) >++IF(CURSES_EXTRA_LIBRARY) >++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) >++ENDIF(CURSES_EXTRA_LIBRARY) >++ >+ >+ install_targets(/bin ccmake) >+diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h >+index b157a28..f131ea4 100644 >+--- a/Source/CursesDialog/cmCursesStandardIncludes.h >++++ b/Source/CursesDialog/cmCursesStandardIncludes.h >+@@ -15,8 +15,6 @@ >+ #define _MSE_INT_H >+ #endif >+ >+-#include <cmFormConfigure.h> >+- >+ #if defined(__hpux) >+ # define _BOOL_DEFINED >+ # include <sys/time.h> >diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch >new file mode 100644 >index 0000000..a7e8688 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch >@@ -0,0 +1,22 @@ >+--- Modules/FindPythonInterp.cmake >++++ Modules/FindPythonInterp.cmake >+@@ -60,6 +60,10 @@ >+ >+ list(APPEND _Python_NAMES python) >+ >++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) >++ set(_Python_NAMES python) >++endif() >++ >+ # Search for the current active python version first >+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) >+ >+@@ -76,7 +80,7 @@ >+ unset(_PYTHON3_VERSIONS) >+ >+ # Search for newest python version if python executable isn't found >+-if(NOT PYTHON_EXECUTABLE) >++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) >+ foreach(_CURRENT_VERSION ${_Python_VERSIONS}) >+ set(_Python_NAMES python${_CURRENT_VERSION}) >+ if(WIN32) >diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch >new file mode 100644 >index 0000000..2a83ff7 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch >@@ -0,0 +1,24 @@ >+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake >+index bffa9fb..8fc90ee 100644 >+--- a/Modules/FindPythonLibs.cmake >++++ b/Modules/FindPythonLibs.cmake >+@@ -74,6 +74,19 @@ set(_Python_VERSIONS >+ ${_PYTHON_FIND_OTHER_VERSIONS} >+ ) >+ >++# Gentoo portage requires that you use exactly the given python version >++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) >++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" >++ OUTPUT_VARIABLE _Gentoo_Python_VERSION) >++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) >++ if (_Gentoo_Python_INDEX EQUAL -1) >++ # the current Gentoo python version is not compatible with what is requested >++ set(_Python_VERSIONS) >++ else () >++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}") >++ endif () >++endif() >++ >+ unset(_PYTHON_FIND_OTHER_VERSIONS) >+ unset(_PYTHON1_VERSIONS) >+ unset(_PYTHON2_VERSIONS) >diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch >new file mode 100644 >index 0000000..02e44fb >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch >@@ -0,0 +1,48 @@ >+--- b/Modules/FindBLAS.cmake >++++ a/Modules/FindBLAS.cmake >+@@ -1,3 +1,9 @@ >++# >++# Version modified for Gentoo Linux >++# If a valid PkgConfig configuration for blas is found, this overrides and cancels >++# all further checks. >++# >++ >+ # - Find BLAS library >+ # This module finds an installed fortran library that implements the BLAS >+ # linear-algebra interface (see http://www.netlib.org/blas/). >+@@ -40,6 +46,26 @@ >+ # (To distribute this file outside of CMake, substitute the full >+ # License text for the above reference.) >+ >++# >++# first, try PkgConfig >++# >++find_package(PkgConfig REQUIRED) >++pkg_check_modules(PC_BLAS blas) >++if(PC_BLAS_FOUND) >++ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) >++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) >++ if (NOT ${PC_LIB}_LIBRARY) >++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") >++ endif (NOT ${PC_LIB}_LIBRARY) >++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) >++ endforeach(PC_LIB) >++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) >++ mark_as_advanced(BLAS_LIBRARIES) >++else(PC_BLAS_FOUND) >++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") >++ >++ >++ >+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) >+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) >+ >+@@ -604,3 +630,8 @@ >+ endif() >+ >+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) >++ >++ >++endif(PC_BLAS_FOUND) >++ >++ >diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch >new file mode 100644 >index 0000000..b00b4f7 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch >@@ -0,0 +1,73 @@ >+--- Modules/FindBoost.cmake >++++ Modules/FindBoost.cmake >+@@ -903,6 +903,11 @@ >+ >+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)") >+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ # Get version of Python. >++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) >++ endif() >++ >+ >+ # >+ # Find RELEASE libraries >+@@ -913,6 +918,14 @@ >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_RELEASE_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) >++ endif() >+ if(_boost_STATIC_RUNTIME_WORKAROUND) >+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") >+ list(APPEND _boost_RELEASE_NAMES >+@@ -920,6 +933,13 @@ >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_RELEASE_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) >++ endif() >+ endif() >+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") >+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) >+@@ -945,6 +965,15 @@ >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_DEBUG_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) >++ endif() >+ if(_boost_STATIC_RUNTIME_WORKAROUND) >+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") >+ list(APPEND _boost_DEBUG_NAMES >+@@ -952,6 +981,13 @@ >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_DEBUG_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) >++ endif() >+ endif() >+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") >+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) >diff --git a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch >new file mode 100644 >index 0000000..36f4ded >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch >@@ -0,0 +1,130 @@ >+From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 >+From: Michael Palimaka <kensington@gentoo.org> >+Date: Tue, 6 Nov 2012 23:35:34 +1100 >+Subject: [PATCH] Set some proper paths to make cmake find our tools. >+ >+The ebuild now adds an extra / at the end of $EPREFIX so that it is >+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains >+correct) >+ >+Original patch by Heiko Przybyl. >+Updated by Chris Reffett (cmake-2.8.8) >+Updated by Johannes Huber (cmake-2.8.9) >+Updated by Michael Palimaka (cmake-2.8.10) >+Updated by Chris Reffett (cmake-2.8.11) >+ >+--- a/Modules/Platform/Darwin.cmake >++++ b/Modules/Platform/Darwin.cmake >+@@ -252,9 +252,9 @@ >+ "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>") >+ >+ >+-# default to searching for frameworks first >++# default to searching for frameworks last >+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK) >+- set(CMAKE_FIND_FRAMEWORK FIRST) >++ set(CMAKE_FIND_FRAMEWORK LAST) >+ endif() >+ >+ # Older OS X linkers do not report their framework search path >+@@ -276,6 +276,8 @@ >+ >+ # set up the default search directories for frameworks >+ set(CMAKE_SYSTEM_FRAMEWORK_PATH >++ @GENTOO_PORTAGE_EPREFIX@Frameworks >++ @GENTOO_PORTAGE_EPREFIX@usr/lib >+ ~/Library/Frameworks >+ /Library/Frameworks >+ /Network/Library/Frameworks >+@@ -298,13 +300,15 @@ >+ endif() >+ endif() >+ >+-# default to searching for application bundles first >++# default to searching for application bundles last >+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE) >+- set(CMAKE_FIND_APPBUNDLE FIRST) >++ set(CMAKE_FIND_APPBUNDLE LAST) >+ endif() >+ # set up the default search directories for application bundles >+ set(_apps_paths) >+ foreach(_path >++ @GENTOO_PORTAGE_EPREFIX@Applications >++ @GENTOO_PORTAGE_EPREFIX@usr/bin >+ "~/Applications" >+ "/Applications" >+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ >+--- a/Modules/Platform/UnixPaths.cmake >++++ b/Modules/Platform/UnixPaths.cmake >+@@ -33,6 +33,7 @@ >+ # search types. >+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH >+ # Standard >++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ >+ /usr/local /usr / >+ >+ # CMake install location >+@@ -44,43 +45,41 @@ >+ >+ # List common include file locations not under the common prefixes. >+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH >+- # Windows API on Cygwin >+- /usr/include/w32api >+- >+- # X11 >+- /usr/X11R6/include /usr/include/X11 >+- >+- # Other >+- /usr/pkg/include >+- /opt/csw/include /opt/include >+- /usr/openwin/include >++ @GENTOO_PORTAGE_EPREFIX@usr/include >+ ) >+ >+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH >+- # Windows API on Cygwin >+- /usr/lib/w32api >+- >+- # X11 >+- /usr/X11R6/lib /usr/lib/X11 >+- >+- # Other >+- /usr/pkg/lib >+- /opt/csw/lib /opt/lib >+- /usr/openwin/lib >++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc >++ @GENTOO_PORTAGE_GCCLIBDIR@ >++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 >++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 >++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 >++ @GENTOO_PORTAGE_EPREFIX@usr/lib >++ @GENTOO_PORTAGE_EPREFIX@lib >+ ) >+ >+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH >+- /usr/pkg/bin >++ @GENTOO_PORTAGE_EPREFIX@usr/bin >++ @GENTOO_PORTAGE_EPREFIX@bin >+ ) >+ >+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES >+- /lib /usr/lib /usr/lib32 /usr/lib64 >++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc >++ @GENTOO_PORTAGE_GCCLIBDIR@ >++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 >++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 >++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 >++ @GENTOO_PORTAGE_EPREFIX@usr/lib >++ @GENTOO_PORTAGE_EPREFIX@lib >++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 >+ ) >+ >+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES >++ @GENTOO_PORTAGE_EPREFIX@usr/include >+ /usr/include >+ ) >+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES >++ @GENTOO_PORTAGE_EPREFIX@usr/include >+ /usr/include >+ ) >+ >diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch >new file mode 100644 >index 0000000..6dc244c >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch >@@ -0,0 +1,43 @@ >+From: Julian Ospald <hasufell@gentoo.org> >+Date: Sun Dec 8 13:38:06 UTC 2013 >+Subject: fix check for freetype-2.5.1 >+ >+--- Modules/FindFreetype.cmake >++++ Modules/FindFreetype.cmake >+@@ -64,6 +64,19 @@ >+ PATH_SUFFIXES include/freetype2 include >+ ) >+ >++if(NOT FREETYPE_INCLUDE_DIR_freetype2) >++ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h >++ HINTS >++ ENV FREETYPE_DIR >++ PATHS >++ /usr/X11R6 >++ /usr/local/X11R6 >++ /usr/local/X11 >++ /usr/freeware >++ PATH_SUFFIXES include/freetype2 include >++ ) >++endif() >++ >+ find_library(FREETYPE_LIBRARY >+ NAMES freetype libfreetype freetype219 >+ HINTS >+@@ -82,8 +95,14 @@ >+ endif() >+ set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") >+ >+-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") >+- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str >++if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") >++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") >++elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") >++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") >++endif() >++ >++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) >++ file(STRINGS "${FREETYPE_H}" freetype_version_str >+ REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") >+ >+ unset(FREETYPE_VERSION_STRING) >diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch >new file mode 100644 >index 0000000..b094f17 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch >@@ -0,0 +1,23 @@ >+--- Modules/FindImageMagick.cmake >++++ Modules/FindImageMagick.cmake >+@@ -147,17 +147,17 @@ >+ ) >+ if(component STREQUAL "Magick++") >+ FIND_IMAGEMAGICK_API(Magick++ Magick++.h >+- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI >++ Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI >+ ) >+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) >+ elseif(component STREQUAL "MagickWand") >+ FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h >+- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI >++ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI >+ ) >+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) >+ elseif(component STREQUAL "MagickCore") >+ FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h >+- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI >++ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI >+ ) >+ list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) >+ else() >diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch >new file mode 100644 >index 0000000..4a5474a >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch >@@ -0,0 +1,77 @@ >+--- Modules/FindBoost.cmake >++++ Modules/FindBoost.cmake >+@@ -905,6 +905,15 @@ >+ >+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)") >+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ # Get version of Python. >++ if (NOT PYTHON_EXECUTABLE) >++ #if a certain version of python was detected by cmake before use that one >++ set(PYTHON_EXECUTABLE "python") >++ endif (NOT PYTHON_EXECUTABLE) >++ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) >++ endif() >++ >+ >+ # >+ # Find RELEASE libraries >+@@ -915,6 +924,14 @@ >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_RELEASE_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) >++ endif() >+ if(_boost_STATIC_RUNTIME_WORKAROUND) >+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") >+ list(APPEND _boost_RELEASE_NAMES >+@@ -922,6 +939,13 @@ >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_RELEASE_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) >++ endif() >+ endif() >+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") >+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) >+@@ -951,6 +975,15 @@ >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_DEBUG_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) >++ endif() >+ if(_boost_STATIC_RUNTIME_WORKAROUND) >+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") >+ list(APPEND _boost_DEBUG_NAMES >+@@ -958,6 +991,13 @@ >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_DEBUG_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) >++ endif() >+ endif() >+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") >+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) >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 0000000..43a2a7f >--- /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 >+ ) >+ >diff --git a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch b/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch >new file mode 100644 >index 0000000..ab27af2 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch >@@ -0,0 +1,38 @@ >+From: KWSys Robot <kwrobot@kitware.com> >+Date: Tue, 15 Oct 2013 12:43:32 +0000 (-0400) >+Subject: KWSys 2013-10-15 (6eab64c3) >+X-Git-Tag: v3.0.0-rc1~178^2^2~5 >+X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=c01e7445 >+ >+KWSys 2013-10-15 (6eab64c3) >+ >+Extract upstream KWSys using the following shell commands. >+ >+$ git archive --prefix=upstream-kwsys/ 6eab64c3 | tar x >+$ git shortlog --no-merges --abbrev=8 --format='%h %s' 96b2f6f4..6eab64c3 >+Raphael Kubo da Costa (1): >+ 6eab64c3 SystemInformation: Include backtrace-related headers on FreeBSD >+ >+Change-Id: Ib0447aab3d6555ce278f0c1417af2c53e6f181a5 >+--- >+ >+diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx >+index 7c31f3a..2672730 100644 >+--- a/Source/kwsys/SystemInformation.cxx >++++ b/Source/kwsys/SystemInformation.cxx >+@@ -88,6 +88,15 @@ typedef int siginfo_t; >+ # include <ifaddrs.h> >+ # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN >+ # endif >++# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) >++# include <execinfo.h> >++# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) >++# include <cxxabi.h> >++# endif >++# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) >++# include <dlfcn.h> >++# endif >++# endif >+ #endif >+ >+ #if defined(__OpenBSD__) || defined(__NetBSD__) >diff --git a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch >new file mode 100644 >index 0000000..99e39a2 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch >@@ -0,0 +1,27 @@ >+diff --git a/CompileFlags.cmake b/CompileFlags.cmake >+index 20f5dec..24ac58d 100644 >+--- a/CompileFlags.cmake >++++ b/CompileFlags.cmake >+@@ -66,5 +66,5 @@ endif () >+ # avoid binutils problem with large binaries, e.g. when building CMake in debug mode >+ # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 >+ if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) >+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*") >++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") >+ endif () >+diff --git a/bootstrap b/bootstrap >+index 9784d5d..51d067e 100755 >+--- a/bootstrap >++++ b/bootstrap >+@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then >+ # avoid binutils problem with large binaries, e.g. when building CMake in debug mode >+ # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 >+ if ${cmake_machine_parisc}; then >+- # if -O[s23] is given the effect is inverted, so do not use the flag then >+- if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then >+- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" >+- fi >++ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" >+ fi >+ fi >+ >diff --git a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch b/dev-util/cmake/files/cmake-2.8.12.2-python34.patch >new file mode 100644 >index 0000000..f64e40c >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.12.2-python34.patch >@@ -0,0 +1,34 @@ >+commit ab6201ab647c13fee44c44822b8502e9848faaaf >+Author: Matt McCormick <matt.mccormick@kitware.com> >+Date: Wed Mar 5 17:41:47 2014 -0500 >+ >+ FindPython{Interp,Libs}: Search for Python 3.4. >+ >+ Python 3.4.0rnc1 was released on 2014-02-20. >+ >+diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake >+index 8da848c..e23a58b 100644 >+--- a/Modules/FindPythonInterp.cmake >++++ b/Modules/FindPythonInterp.cmake >+@@ -47,7 +47,7 @@ unset(_Python_NAMES) >+ >+ set(_PYTHON1_VERSIONS 1.6 1.5) >+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) >+-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) >++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) >+ >+ if(PythonInterp_FIND_VERSION) >+ if(PythonInterp_FIND_VERSION_COUNT GREATER 1) >+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake >+index 0749efc..1dbc967 100644 >+--- a/Modules/FindPythonLibs.cmake >++++ b/Modules/FindPythonLibs.cmake >+@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python) >+ >+ set(_PYTHON1_VERSIONS 1.6 1.5) >+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) >+-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0) >++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) >+ >+ if(PythonLibs_FIND_VERSION) >+ if(PythonLibs_FIND_VERSION_COUNT GREATER 1) >diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch >new file mode 100644 >index 0000000..6808b80 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch >@@ -0,0 +1,44 @@ >+diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake >+--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100 >++++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100 >+@@ -1,3 +1,9 @@ >++# >++# Version modified for Gentoo Linux >++# If a valid PkgConfig configuration is found, this overrides and cancels >++# all further checks. >++# >++ >+ # - Find LAPACK library >+ # This module finds an installed fortran library that implements the LAPACK >+ # linear-algebra interface (see http://www.netlib.org/lapack/). >+@@ -36,6 +42,24 @@ >+ # (To distribute this file outside of CMake, substitute the full >+ # License text for the above reference.) >+ >++# >++# first, try PkgConfig >++# >++find_package(PkgConfig REQUIRED) >++pkg_check_modules(PC_LAPACK lapack) >++if(PC_LAPACK_FOUND) >++ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) >++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) >++ if (NOT ${PC_LIB}_LIBRARY) >++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") >++ endif (NOT ${PC_LIB}_LIBRARY) >++ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) >++ endforeach(PC_LIB) >++ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) >++ mark_as_advanced(LAPACK_LIBRARIES) >++else(PC_LAPACK_FOUND) >++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") >++ >+ set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) >+ >+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) >+@@ -305,3 +329,5 @@ >+ endif(BLA_F95) >+ >+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) >++ >++endif(PC_LAPACK_FOUND) >diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch >new file mode 100644 >index 0000000..c5e17c5 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch >@@ -0,0 +1,18 @@ >+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake >+index c47f583..5783d37 100644 >+--- a/Modules/FindPkgConfig.cmake >++++ b/Modules/FindPkgConfig.cmake >+@@ -87,7 +87,12 @@ >+ set(PKG_CONFIG_VERSION 1) >+ set(PKG_CONFIG_FOUND 0) >+ >+-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") >++if(NOT PKG_CONFIG_EXECUTABLE) >++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) >++ if(NOT PKG_CONFIG_EXECUTABLE) >++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") >++ endif(NOT PKG_CONFIG_EXECUTABLE) >++endif(NOT PKG_CONFIG_EXECUTABLE) >+ mark_as_advanced(PKG_CONFIG_EXECUTABLE) >+ >+ if(PKG_CONFIG_EXECUTABLE) >diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch >new file mode 100644 >index 0000000..86c5dc7 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch >@@ -0,0 +1,43 @@ >+--- Modules/FindBLAS.cmake >++++ Modules/FindBLAS.cmake >+@@ -4,6 +4,10 @@ >+ # >+ # Find BLAS library >+ # >++# Version modified for Gentoo Linux. >++# If a valid PkgConfig configuration is found, this overrides and cancels >++# all further checks. >++# >+ # This module finds an installed fortran library that implements the >+ # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The >+ # list of libraries searched for is taken from the autoconf macro file, >+@@ -50,6 +54,23 @@ >+ # (To distribute this file outside of CMake, substitute the full >+ # License text for the above reference.) >+ >++# first, try PkgConfig >++# >++find_package(PkgConfig REQUIRED) >++pkg_check_modules(PC_BLAS blas) >++if(PC_BLAS_FOUND) >++ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) >++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) >++ if (NOT ${PC_LIB}_LIBRARY) >++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") >++ endif (NOT ${PC_LIB}_LIBRARY) >++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) >++ endforeach(PC_LIB) >++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) >++ mark_as_advanced(BLAS_LIBRARIES) >++else(PC_BLAS_FOUND) >++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") >++ >+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) >+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) >+ >+@@ -688,3 +709,5 @@ >+ endif() >+ >+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) >++ >++endif(PC_BLAS_FOUND) >diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch >new file mode 100644 >index 0000000..a6291d2 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch >@@ -0,0 +1,93 @@ >+From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001 >+From: Michael Palimaka <kensington@gentoo.org> >+Date: Thu, 19 Jun 2014 00:17:48 +1000 >+Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries >+ wrt bug #400969. >+ >+--- >+ Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++ >+ 1 file changed, 41 insertions(+) >+ >+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake >+index dfd4460..70bfb4f 100644 >+--- a/Modules/FindBoost.cmake >++++ b/Modules/FindBoost.cmake >+@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) >+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)") >+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") >+ >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ # Get version of Python. >++ if (NOT PYTHON_EXECUTABLE) >++ #if a certain version of python was detected by cmake before use that one >++ set(PYTHON_EXECUTABLE "python") >++ endif (NOT PYTHON_EXECUTABLE) >++ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) >++ endif() >++ >+ # Compute component-specific hints. >+ set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "") >+ if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR >+@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_RELEASE_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) >++ endif() >++ >+ if(_boost_STATIC_RUNTIME_WORKAROUND) >+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") >+ list(APPEND _boost_RELEASE_NAMES >+@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_RELEASE_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) >++ endif() >+ endif() >+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") >+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) >+@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED} >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_DEBUG_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) >++ endif() >+ if(_boost_STATIC_RUNTIME_WORKAROUND) >+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") >+ list(APPEND _boost_DEBUG_NAMES >+@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) >++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") >++ list(APPEND _boost_DEBUG_NAMES >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} >++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) >++ endif() >+ endif() >+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") >+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) >+-- >+1.8.5.5 >+ >diff --git a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch >new file mode 100644 >index 0000000..decfb91 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch >@@ -0,0 +1,142 @@ >+From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001 >+From: Michael Palimaka <kensington@gentoo.org> >+Date: Thu, 19 Jun 2014 00:08:13 +1000 >+Subject: [PATCH] Set some proper paths to make cmake find our tools. >+ >+The ebuild now adds an extra / at the end of $EPREFIX so that it is >+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains >+correct) >+ >+Original patch by Heiko Przybyl. >+Updated by Chris Reffett (cmake-2.8.8) >+Updated by Johannes Huber (cmake-2.8.9) >+Updated by Michael Palimaka (cmake-2.8.10) >+Updated by Chris Reffett (cmake-2.8.11) >+Updated by Michael Palimaka (cmake-3.0.0) >+--- >+ Modules/Platform/Darwin.cmake | 12 +++++++---- >+ Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++-------------------- >+ 2 files changed, 29 insertions(+), 26 deletions(-) >+ >+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake >+index e25df1e..9b22a6a 100644 >+--- a/Modules/Platform/Darwin.cmake >++++ b/Modules/Platform/Darwin.cmake >+@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F) >+ set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F) >+ set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F) >+ >+-# default to searching for frameworks first >++# default to searching for frameworks last >+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK) >+- set(CMAKE_FIND_FRAMEWORK FIRST) >++ set(CMAKE_FIND_FRAMEWORK LAST) >+ endif() >+ >+ # Older OS X linkers do not report their framework search path >+@@ -156,6 +156,8 @@ endif() >+ >+ # set up the default search directories for frameworks >+ set(CMAKE_SYSTEM_FRAMEWORK_PATH >++ @GENTOO_PORTAGE_EPREFIX@Frameworks >++ @GENTOO_PORTAGE_EPREFIX@usr/lib >+ ~/Library/Frameworks >+ ) >+ if(_CMAKE_OSX_SYSROOT_PATH) >+@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT) >+ endif() >+ endif() >+ >+-# default to searching for application bundles first >++# default to searching for application bundles last >+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE) >+- set(CMAKE_FIND_APPBUNDLE FIRST) >++ set(CMAKE_FIND_APPBUNDLE LAST) >+ endif() >+ # set up the default search directories for application bundles >+ set(_apps_paths) >+ foreach(_path >++ @GENTOO_PORTAGE_EPREFIX@Applications >++ @GENTOO_PORTAGE_EPREFIX@usr/bin >+ "~/Applications" >+ "/Applications" >+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ >+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake >+index 20ee1d1..3481ca8 100644 >+--- a/Modules/Platform/UnixPaths.cmake >++++ b/Modules/Platform/UnixPaths.cmake >+@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) >+ # search types. >+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH >+ # Standard >++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ >+ /usr/local /usr / >+ >+ # CMake install location >+@@ -53,43 +54,41 @@ endif() >+ >+ # List common include file locations not under the common prefixes. >+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH >+- # Windows API on Cygwin >+- /usr/include/w32api >+- >+- # X11 >+- /usr/X11R6/include /usr/include/X11 >+- >+- # Other >+- /usr/pkg/include >+- /opt/csw/include /opt/include >+- /usr/openwin/include >++ @GENTOO_PORTAGE_EPREFIX@usr/include >+ ) >+ >+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH >+- # Windows API on Cygwin >+- /usr/lib/w32api >+- >+- # X11 >+- /usr/X11R6/lib /usr/lib/X11 >+- >+- # Other >+- /usr/pkg/lib >+- /opt/csw/lib /opt/lib >+- /usr/openwin/lib >++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc >++ @GENTOO_PORTAGE_GCCLIBDIR@ >++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 >++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 >++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 >++ @GENTOO_PORTAGE_EPREFIX@usr/lib >++ @GENTOO_PORTAGE_EPREFIX@lib >+ ) >+ >+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH >+- /usr/pkg/bin >++ @GENTOO_PORTAGE_EPREFIX@usr/bin >++ @GENTOO_PORTAGE_EPREFIX@bin >+ ) >+ >+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES >+- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 >++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc >++ @GENTOO_PORTAGE_GCCLIBDIR@ >++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 >++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 >++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 >++ @GENTOO_PORTAGE_EPREFIX@usr/lib >++ @GENTOO_PORTAGE_EPREFIX@lib >++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 >+ ) >+ >+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES >++ GENTOO_PORTAGE_EPREFIX@usr/include >+ /usr/include >+ ) >+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES >++ @GENTOO_PORTAGE_EPREFIX@usr/include >+ /usr/include >+ ) >+ >+-- >+1.8.5.5 >+ >diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch >new file mode 100644 >index 0000000..57250e4 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch >@@ -0,0 +1,43 @@ >+--- Modules/FindLAPACK.cmake.orig 2014-09-15 23:50:11.377111987 +0200 >++++ Modules/FindLAPACK.cmake 2014-09-15 23:52:54.734388375 +0200 >+@@ -4,6 +4,10 @@ >+ # >+ # Find LAPACK library >+ # >++# Version modified for Gentoo Linux. >++# If a valid PkgConfig configuration is found, this overrides and cancels >++# all further checks. >++# >+ # This module finds an installed fortran library that implements the >+ # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). >+ # >+@@ -140,6 +144,23 @@ >+ >+ endmacro() >+ >++# >++# first, try PkgConfig >++# >++find_package(PkgConfig REQUIRED) >++pkg_check_modules(PC_LAPACK lapack) >++if(PC_LAPACK_FOUND) >++ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) >++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) >++ if (NOT ${PC_LIB}_LIBRARY) >++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") >++ endif (NOT ${PC_LIB}_LIBRARY) >++ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) >++ endforeach(PC_LIB) >++ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) >++ mark_as_advanced(LAPACK_LIBRARIES) >++else(PC_LAPACK_FOUND) >++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") >+ >+ set(LAPACK_LINKER_FLAGS) >+ set(LAPACK_LIBRARIES) >+@@ -348,3 +369,5 @@ >+ endif() >+ >+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) >++ >++endif(PC_LAPACK_FOUND) >diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch >new file mode 100644 >index 0000000..78f622d >--- /dev/null >+++ b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch >@@ -0,0 +1,29 @@ >+--- Modules/FindPythonInterp.cmake.orig 2015-01-06 11:50:03.376357898 +0100 >++++ Modules/FindPythonInterp.cmake 2015-01-06 12:25:48.614989290 +0100 >+@@ -75,6 +75,11 @@ >+ else() >+ set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS}) >+ endif() >++ >++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) >++ set(_Python_NAMES python) >++endif() >++ >+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) >+ >+ # Set up the versions we know about, in the order we will search. Always add >+@@ -99,12 +104,13 @@ >+ unset(_PYTHON3_VERSIONS) >+ >+ # Search for newest python version if python executable isn't found >+-if(NOT PYTHON_EXECUTABLE) >++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) >+ foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS) >+ set(_Python_NAMES python${_CURRENT_VERSION}) >+ if(WIN32) >+ list(APPEND _Python_NAMES python) >+ endif() >++ >+ find_program(PYTHON_EXECUTABLE >+ NAMES ${_Python_NAMES} >+ PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath] >diff --git a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch >new file mode 100644 >index 0000000..119001a >--- /dev/null >+++ b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch >@@ -0,0 +1,48 @@ >+Do not detect Xcode and set -isysroot for its SDK, since that messes up >+our toolchain, and hence makes any compilation fail, bug #445308 >+ >+--- Modules/Platform/Darwin-Initialize.cmake >++++ Modules/Platform/Darwin-Initialize.cmake >+@@ -1,16 +1,16 @@ >+ # Ask xcode-select where to find /Developer or fall back to ancient location. >+-execute_process(COMMAND xcode-select -print-path >+- OUTPUT_VARIABLE _stdout >+- OUTPUT_STRIP_TRAILING_WHITESPACE >+- ERROR_VARIABLE _stderr >+- RESULT_VARIABLE _failed) >+-if(NOT _failed AND IS_DIRECTORY ${_stdout}) >+- set(OSX_DEVELOPER_ROOT ${_stdout}) >+-elseif(IS_DIRECTORY "/Developer") >+- set(OSX_DEVELOPER_ROOT "/Developer") >+-else() >++#execute_process(COMMAND xcode-select -print-path >++# OUTPUT_VARIABLE _stdout >++# OUTPUT_STRIP_TRAILING_WHITESPACE >++# ERROR_VARIABLE _stderr >++# RESULT_VARIABLE _failed) >++#if(NOT _failed AND IS_DIRECTORY ${_stdout}) >++# set(OSX_DEVELOPER_ROOT ${_stdout}) >++#elseif(IS_DIRECTORY "/Developer") >++# set(OSX_DEVELOPER_ROOT "/Developer") >++#else() >+ set(OSX_DEVELOPER_ROOT "") >+-endif() >++#endif() >+ >+ execute_process(COMMAND sw_vers -productVersion >+ OUTPUT_VARIABLE CURRENT_OSX_VERSION >+@@ -91,10 +91,10 @@ >+ # CMAKE_OSX_DEPLOYMENT_TARGET >+ >+ # Set cache variable - end user may change this during ccmake or cmake-gui configure. >+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) >+- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING >+- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") >+-endif() >++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) >++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING >++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") >++#endif() >+ >+ #---------------------------------------------------------------------------- >+ # CMAKE_OSX_SYSROOT >diff --git a/dev-util/cmake/files/cmake-3.2.2-musl-fix-includes.patch b/dev-util/cmake/files/cmake-3.2.2-musl-fix-includes.patch >new file mode 100644 >index 0000000..ff6af29 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-3.2.2-musl-fix-includes.patch >@@ -0,0 +1,66 @@ >+diff -Naur cmake-3.2.2.orig/Source/cmGeneratorExpressionEvaluationFile.h cmake-3.2.2/Source/cmGeneratorExpressionEvaluationFile.h >+--- cmake-3.2.2.orig/Source/cmGeneratorExpressionEvaluationFile.h 2015-04-13 17:09:00.000000000 +0000 >++++ cmake-3.2.2/Source/cmGeneratorExpressionEvaluationFile.h 2015-09-19 06:20:30.904497669 +0000 >+@@ -17,6 +17,8 @@ >+ >+ #include "cmGeneratorExpression.h" >+ >++#include <sys/types.h> // mode_t >++ >+ //---------------------------------------------------------------------------- >+ class cmGeneratorExpressionEvaluationFile >+ { >+diff -Naur cmake-3.2.2.orig/Source/cmGeneratorExpressionEvaluationFile.h.orig cmake-3.2.2/Source/cmGeneratorExpressionEvaluationFile.h.orig >+--- cmake-3.2.2.orig/Source/cmGeneratorExpressionEvaluationFile.h.orig 1970-01-01 00:00:00.000000000 +0000 >++++ cmake-3.2.2/Source/cmGeneratorExpressionEvaluationFile.h.orig 2015-09-19 06:19:57.429497669 +0000 >+@@ -0,0 +1,50 @@ >++/*============================================================================ >++ CMake - Cross Platform Makefile Generator >++ Copyright 2013 Stephen Kelly <steveire@gmail.com> >++ >++ Distributed under the OSI-approved BSD License (the "License"); >++ see accompanying file Copyright.txt for details. >++ >++ This software is distributed WITHOUT ANY WARRANTY; without even the >++ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. >++ See the License for more information. >++============================================================================*/ >++#ifndef cmGeneratorExpressionEvaluationFile_h >++#define cmGeneratorExpressionEvaluationFile_h >++ >++#include "cmStandardIncludes.h" >++#include <cmsys/auto_ptr.hxx> >++ >++#include "cmGeneratorExpression.h" >++ >++//---------------------------------------------------------------------------- >++class cmGeneratorExpressionEvaluationFile >++{ >++public: >++ cmGeneratorExpressionEvaluationFile(const std::string &input, >++ cmsys::auto_ptr<cmCompiledGeneratorExpression> outputFileExpr, >++ cmMakefile *makefile, >++ cmsys::auto_ptr<cmCompiledGeneratorExpression> condition, >++ bool inputIsContent); >++ >++ void Generate(); >++ >++ std::vector<std::string> GetFiles() const { return this->Files; } >++ >++ void CreateOutputFile(std::string const& config); >++ >++private: >++ void Generate(const std::string& config, >++ cmCompiledGeneratorExpression* inputExpression, >++ std::map<std::string, std::string> &outputFiles, mode_t perm); >++ >++private: >++ const std::string Input; >++ const cmsys::auto_ptr<cmCompiledGeneratorExpression> OutputFileExpr; >++ cmMakefile *Makefile; >++ const cmsys::auto_ptr<cmCompiledGeneratorExpression> Condition; >++ std::vector<std::string> Files; >++ const bool InputIsContent; >++}; >++ >++#endif >diff --git a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch b/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch >new file mode 100644 >index 0000000..5e0efa9 >--- /dev/null >+++ b/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch >@@ -0,0 +1,28 @@ >+From c775072ad5a93306183f83f4396268b1690bb392 Mon Sep 17 00:00:00 2001 >+From: Brad King <brad.king@kitware.com> >+Date: Wed, 22 Apr 2015 09:58:46 -0400 >+Subject: [PATCH] cmGeneratorExpressionEvaluationFile: Add missing sys/types.h >+ include >+ >+This is needed for 'mode_t', and on mingw-w64 in particular. We added >+use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use >+permissions of input file if present, 2014-07-22). >+--- >+ Source/cmGeneratorExpressionEvaluationFile.h | 1 + >+ 1 file changed, 1 insertion(+) >+ >+diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h >+index 4424bec..5d8b54c 100644 >+--- a/Source/cmGeneratorExpressionEvaluationFile.h >++++ b/Source/cmGeneratorExpressionEvaluationFile.h >+@@ -13,6 +13,7 @@ >+ #define cmGeneratorExpressionEvaluationFile_h >+ >+ #include "cmStandardIncludes.h" >++#include <sys/types.h> >+ #include <cmsys/auto_ptr.hxx> >+ >+ #include "cmGeneratorExpression.h" >+-- >+1.7.10.4 >+ >diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim >new file mode 100644 >index 0000000..5cecd7d >--- /dev/null >+++ b/dev-util/cmake/files/cmake.vim >@@ -0,0 +1,3 @@ >+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim >+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake >+autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake >diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml >new file mode 100644 >index 0000000..7e3fec5 >--- /dev/null >+++ b/dev-util/cmake/metadata.xml >@@ -0,0 +1,8 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> >+<pkgmetadata> >+ <herd>kde</herd> >+ <use> >+ <flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag> >+ </use> >+</pkgmetadata> >-- >2.4.6 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=412232">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 559500
:
410912
| 412232
