Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/android:master commit in: dev-util/cmake/, dev-util/cmake/files/
Date: Mon, 26 Sep 2016 01:17:19
Message-Id: 1469590072.08b4542f596eb3673923401c161841b19ffd056f.heroxbd@gentoo
1 commit: 08b4542f596eb3673923401c161841b19ffd056f
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 27 03:27:52 2016 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 27 03:27:52 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=08b4542f
7
8 dev-utils/cmake: merged.
9
10 dev-util/cmake/Manifest | 42 -----
11 dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 201 --------------------
12 dev-util/cmake/cmake-3.2.2.ebuild | 191 -------------------
13 dev-util/cmake/cmake-3.3.1-r1.ebuild | 199 --------------------
14 dev-util/cmake/cmake-3.3.2-r1.ebuild | 203 ---------------------
15 dev-util/cmake/cmake-3.4.2.ebuild | 198 --------------------
16 dev-util/cmake/cmake-3.4.3.ebuild | 201 --------------------
17 dev-util/cmake/files/50cmake-gentoo.el | 4 -
18 .../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ----
19 .../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
20 .../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 ---
21 .../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 -----
22 dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 --
23 dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------
24 .../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 ---
25 .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 ---
26 dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 -----
27 .../files/cmake-2.8.11-more-no_host_paths.patch | 130 -------------
28 .../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 -----
29 .../files/cmake-2.8.12.1-FindImageMagick.patch | 23 ---
30 .../files/cmake-2.8.12.2-FindBoost-python.patch | 77 --------
31 .../cmake/files/cmake-2.8.12.2-FindCurses.patch | 42 -----
32 .../files/cmake-2.8.12.2-hppa-bootstrap.patch | 27 ---
33 dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 -----
34 .../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
35 dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch | 43 -----
36 .../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 ----------
37 dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 --------------
38 dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch | 43 -----
39 .../cmake/files/cmake-3.1.0-FindPythonInterp.patch | 29 ---
40 .../cmake/files/cmake-3.1.0-darwin-isysroot.patch | 48 -----
41 dev-util/cmake/files/cmake-3.3.2-FindQt4.patch | 45 -----
42 .../files/cmake-3.4.0_rc1-darwin-bundle.patch | 25 ---
43 .../cmake/files/cmake-3.4.3-utimensat-test.patch | 33 ----
44 dev-util/cmake/files/cmake.vim | 3 -
45 dev-util/cmake/metadata.xml | 11 --
46 36 files changed, 2447 deletions(-)
47
48 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
49 deleted file mode 100644
50 index be378cf..0000000
51 --- a/dev-util/cmake/Manifest
52 +++ /dev/null
53 @@ -1,42 +0,0 @@
54 -AUX 50cmake-gentoo.el 244 SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb WHIRLPOOL aa60ffe7e5edd00fdbb32ce2c9aee24fddd6e4d064b8bde55c7ff3b42196c3420596653aade9cc447a3293050c5ab23a27a556f26806e4d67139d264a38d1aaa
55 -AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 SHA512 fe3148f9a09363c5943f09b963391a4276f2da6095e66c28a1c365fd655e2124e1931b40890152836e24a3c9e330db799199d8ae295fe4581f7124b42f09f928 WHIRLPOOL 322a805a2df9afa40c7ff217481819462d90d8259856696fa4ef76fda1571fa081577eb8cd06fbee899911b01243a912e43a9dcc667932f9885492fcb92c0f98
56 -AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 SHA512 13dfb5d1ed271eaf673aa53c40a5a17a89812c7617e840ffd3df962e9ed6e46da7b507121f56314a2ef8b86a80b2453cf327684e2c4e82bb903cd8210807f507 WHIRLPOOL b43a187a6f90590460b6e499630a6f6d550cee09309c4c32c0b7d68189bcd84dac309ae4b80bc345de5b32dcc4ac94f789c1fea8162cea4175847c49dc862ccf
57 -AUX cmake-2.8.10-darwin-bundle.patch 956 SHA256 8195342561ada36d4e3796a906fc662f9f84cc470809e7596b4376f3fe90dbac SHA512 39f444f592f435fbcc865a903ccb851b6c40ddf5f3b99b986c92af6b8984978d4fa1819808f1365f53887098da8533c31f6ea29e14cb541045ed3f63fcc771e2 WHIRLPOOL c20412508cad6329bebfb152051008c5ff98f0a27657d047992f4523a213d4ee396ea23c009ad2133b283ab4518d359b2b65d5034e06bd5649a6f08d76cb5db8
58 -AUX cmake-2.8.10-darwin-isysroot.patch 1913 SHA256 a706da7288dd1f1fcd78291e411f34cb5e6d8eec3ea620011da9c7182e3e4df6 SHA512 862fcedba5abab3f7dab6eb56a680cc0f81090e551a1519f40a638a3dfd08ec083b2c67cdd174f2f32aa3e417b178e8b3bcde1e9db9d34f740b8e72be4306c6d WHIRLPOOL 46a523c1e9c8f17828a3130cc1ce37810cea408d04870939f30c4a5c0e777e1c5537b3e1c2e36690f6a21fa783057d6f5f9b8b7186b45b0f8056dc72041cdd1d
59 -AUX cmake-2.8.10-desktop.patch 370 SHA256 747eb8c75f82d1edf9683c31914892e19118670d4e2e955cdcf5a14f25fefe15 SHA512 bc5c6ca27e3317ac7c65e09733331e3732ea31c28d5b08b7fbd150845cf6657238b017d0782237ef57abab9fec249cacf78762dfe66c6389bc0fd9a91add0f08 WHIRLPOOL 5c446ba04f0d88a022a415c03e601ee6dc7cbfaebe8c564f9e5ca88a92e9f5755ae8435789e477ff14980a22e690748c7b0bc602e51bc8a074fb025010337dbf
60 -AUX cmake-2.8.10-libform.patch 1598 SHA256 8635248bfebe157e545eddc3c16223e4d8c51af51a8d224ef1003a043ce468f4 SHA512 08a0fb45f2b4c1a8ba0e961539d650e38feedd4b2ca3b5acc2fcad3d68fe3fcdb5b114663b1f84b26027e902d28cc2d4f50cc1e3491ba90d6c3c273aa32d62d9 WHIRLPOOL 505231f51be487dd71eb2f17cb65560eb86039673a593e1e76f3d7f27c3cb64dad36ef1c507aa9e97aae28b20f642dfcb4d023537e0a1af361e74c43b88a51e1
61 -AUX cmake-2.8.10.2-FindPythonInterp.patch 651 SHA256 bae58e84982de8331a4038fdc1339baa42512ffb254dfbf553d3bf6f04221cfe SHA512 a1c68cc9f24addc771b8eb33ca6ac0d841311b634e5c5d6500924d70678408a666353791a8b2a00013e1b31545ecef6d26f939216b8fe7dcb8b6152c9e89f17c WHIRLPOOL 3c6a3f084d402244d8628bce6ac17a11eda0d55ced3824584284f63b5f1300f89921941257ded395e2aec88950ab65ca80dd9ff0fa6932f7eee908bd4778c688
62 -AUX cmake-2.8.10.2-FindPythonLibs.patch 968 SHA256 4a2bbd60a2c526387ac8088d6bbecff1cc4399259d737530f2d55a6afd033b15 SHA512 e42713242202409e06a1b0725c6ea0a89c6d623d143e6c06def9681b72516a760ebddeccdf16e141e6b21ced2fb63e42337536afd6ca799e6d6d8689d48037cb WHIRLPOOL f92e7981f267310e471425b9f6595c54bf6df2af3fd99a0502bebaa39d87dcc14e31389d1c1bd99271718ce6b33f837842a0cdb454de09da60df5252f86cf826
63 -AUX cmake-2.8.11-FindBLAS.patch 1524 SHA256 d59a2d1fdbab24d25c90e22047569745b6a2d80318d0914ab21c704286b1d15e SHA512 20b4f594a5fee9e20cccd1ec79797d2ac2e930ae2252ac544248ee7825ee76dbd32459ae6b87afd0d684a9a780dd1e1e78da361519dbb767fe761eeff6b545f6 WHIRLPOOL 38e13557dc7009ba422c5e6487b89c9847c2b51fa69c0d02eac20ea8c9d9d212a5b66f4ab9049d241ff0e4ffc23096117592c584b3b787dceb5e225a06ea9d75
64 -AUX cmake-2.8.11-more-no_host_paths.patch 3797 SHA256 09a583d102f491c49d65282a8665ffb960f5801c7addc79e858a002d0c26ef5b SHA512 cb3bde23246c93f27d7cff2f0bb7fd17b0286da201a68a68abefca881cb2395844fe0adfa091f2f7657f44a56f2c5fba794430effe1edf0596c16f2d34c825bc WHIRLPOOL 5d53ba1a375da31cdd50cef63072480d3f0a77e785cbe6ee16b82ff6249e4244ad7ff67c9971533705bc97e396332ae0936bea3c6ef2002b5fc7f3a88d8036e1
65 -AUX cmake-2.8.12.1-FindFreetype.patch 1404 SHA256 68e4d69aadde939087d257e88273e6fa075b9533dcccc32b0c3ed7d96af6a832 SHA512 f07a6ca20251bd517e4e63ed81a6d67c388de7c53cce6177252a86eb1c68b3fe2ecfdf7493d3f6baba56d58d1b35da181dee7f4a99ae63ac18b0c2398f3d3d76 WHIRLPOOL e7ab5a1987ba1ae0fe8e91ff1535cc870cedc3b4282d4c3721a627cd8fc948a5e2f81214287cf50b35f7b20928526022ed13bc900fd8334244c10c89435267c3
66 -AUX cmake-2.8.12.1-FindImageMagick.patch 1700 SHA256 042a843bc6204efee071af2cdeb451c5da3da852cba0d522dea1d264ff1014c3 SHA512 4c533e3bf3127eb0696b557fe381bfd88f3ebc70b29a33f04b7bf95fa7c765cb237abe34b6a406b452dd71fbc3d79740d58ae981eedca952f9fae272ea4f5efa WHIRLPOOL 25c5c7c47b2874b32143a9fe14443aa6da8f3abb6c92b0bd94f3848dd7d8114d901a0bc6fbb78547879f5af947f87f070e24cc2deeecd7bb4cc95290a7af7d40
67 -AUX cmake-2.8.12.2-FindBoost-python.patch 5494 SHA256 4e514122d8078f2b1db10c842f2c5d35713849b72d742848281954040eade4cc SHA512 450be7d80edd54e9d2a609645a0c58f6672fbe623a49bddfa01c3903f9fb2f0d944ae7bc884829fcb48c194e873bede372dd350b9a9d521be2ff2c0e3198b0cb WHIRLPOOL c8486b950f35ce4bad76ba9dd4b3b256c8b6a62e5321d1cb1f99ca5a3c8146830eea5c487494571d92bddf0a10a2db5d89e5ad53bd0aca9f29d218665290077a
68 -AUX cmake-2.8.12.2-FindCurses.patch 1525 SHA256 85d71d32b0bafffaa2c24e6e7432db1c35e04eae790fc27e515210c8c5f7e812 SHA512 74d6390fa253764c7d6e94e5ed566b886dcd93f35ce840979faeb86f48e3cb5c35aa77895adf39df5708954c256dbd2d277eb1f58f21829805abb11ba2802462 WHIRLPOOL b4041827630a9f53f499d3b448c30cdba32ab4d7962d51e1e6a8a779f55d502a529127ebc477331d3d4fdc87249449e95a51601ca10125d75d19605204e585a6
69 -AUX cmake-2.8.12.2-hppa-bootstrap.patch 1195 SHA256 fb31515c540fc6d5b2e9d0a3ba3df8d11a74b84fa474e3845285345a219c8a65 SHA512 25ca780843248638502d389d078588194a4eeaa2cde163076b57c588ea6acf78a8ee832eb76d45b747467b31da5562f7d05715ecabcb6c1ce985a98d5f677e68 WHIRLPOOL 41d723a818b6e8d0993abfd6cb77ad505013526b4b2ba11e00200b590b9a27efa1dabeef02ec22c9dafbbcdb003b76b110ce0c9b22f0f1d8a29adf35ccd6de90
70 -AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1ec32d409d91de9558f7e8f567323e SHA512 c5dab9c697df3593b8fb5222e619ccc1b1cc82beae0cd685ecabb1a0e31193cf663e95dc4d556e338c9f45e451fcb0fbc1a5f0bc39a65c67e6d9d9193f049990 WHIRLPOOL bc42012b830f998c5b8b892b84314fbc5ec6fdbdae627c2364d112a3e48c5350df9334b17e8b91bb4bd6377f10cc927fd3c3c8008370343fc19d43eef1fda005
71 -AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe SHA512 b52986a9faf2329096452c3cf4b3066c2eb51b37d057bf46527dc7797fcd795936d63ad287419c2eba6ffcb0134b24544d62fb5c449e6a25354b65a4d5c63d8f WHIRLPOOL b444f6524b1e24d0c1040508babc03b229e7bac7ba11c978d155252fc8df9d052f7f23010c0db027af9f41e594d6ca131e6018f58a21d83f797762ddf644b911
72 -AUX cmake-3.0.0-FindBLAS.patch 1577 SHA256 25be4e8671eff94b5cb7fe955215d9b97cc39e61f7203b4eb9b28e16977c3842 SHA512 c6239fe3d8b8e437b66399a3ebdf09da94f747dc6c45aaaba43773ce29a106727c7d4f8a570e1fd9603a9cdbade6b9702398c1989267adbcc5aebbeb59d30915 WHIRLPOOL 44366678ff681b3c876c90274d3b6709ad4ef7de051663db03fecdb77baffbd87b02c5edf53126b383680a58ef4c0a0100982240e58db352c781cd204907f2bc
73 -AUX cmake-3.0.0-FindBoost-python.patch 6481 SHA256 bd8ff52ce3565ab67806e2417d3c1e3c05215dde1da588f65dfc8db061ea3116 SHA512 4eed678c74af89e249de7202c553825cfd0132b84d605d078c388224a1add76acef778f366bb60e52e58e9ca25a23e18f8f6bef7385a9180fb1cab7d7698ffbf WHIRLPOOL ba4965b6e390a30178cd99806eda5d1fd669ccb894ba94d1f8ea358dcfbf10f9559918711912786cc3be16569b87d931d13712bd84a433b561f1092d8c71c416
74 -AUX cmake-3.0.0-prefix-dirs.patch 4280 SHA256 55dcc8203a802659c21bd6449b847b4477bfa4d140f30ba8dceac5f4e536d92a SHA512 1d0f2c9b2831a79dac61bf156ad981388dd8f340960f78b2800b559a5f2d18dd8a2b69499c4a8b1ee3677b7a116a6cec9666bacb8a8429c77fb0bd589dc47ade WHIRLPOOL 6952c370d3963f2a1c6d762b652e8c19ecc0aec0b9be5d2b2084cbfaaa9c329712b5a67ba4e6e44c3c89d8da50e639a1e223b5cabe4c4bb9cf3607dba2170b00
75 -AUX cmake-3.0.2-FindLAPACK.patch 1442 SHA256 394388bdf47c995bc540537ad2cb497c719eafc5298a19d41d1a672c02d3b221 SHA512 60b673005bb3cec6830a3f68922c5661bccd8d7d39d77172d1f59383e8f9912e3e74e052d5e632479d1b091357dbabef656049dffaf705cebae9ae99ea35e74e WHIRLPOOL 7b46096381aa9a94e92c9aac80993a3da75b80203050f609adf7672ac238d4dd3ad89ff8261e87bd040a4ba5b4b1b4e73bfdf9ac3ba55b2c33a6f7800315748c
76 -AUX cmake-3.1.0-FindPythonInterp.patch 1072 SHA256 463c0a681b92ed02f7802153457d530109c6a6ec686d6c02968ea84085134705 SHA512 5e3445f43793fbea561d24cf502d06264f3f27134420d7df18aee678901bb895912a0b7b7f73ec7321155284f821aab5dbd6046bb050c02f58a0bd5188dc85f0 WHIRLPOOL 65aaa246da0230df4ff45a21e398224751d67820153ed5b871ee6095ae97804da98057de114354ec7ff2abb8f438fbcdd5c0b70a718fef6974d39ee69f94ca6e
77 -AUX cmake-3.1.0-darwin-isysroot.patch 1922 SHA256 05b3f77f8f8a25c809cf0819867fa785a739d3dc9c34e5e9fbbb6b4ad9115710 SHA512 9fcdac45f1c4d8c90839e5f4a6c9f1d28c1767bf6b1767dd7d8d04d332558ef8dc775af65926c3d08a72a6e535c063a85956bf20a10e48016fa13533037979d0 WHIRLPOOL 31ea327e6c41132923a26dfce39b19961b1862e79fcfa3f9c80773f6c3181acbf44ab655a2b837c0ab2165d918c8709aa82321958ca4e0d93277d0a2a47c1127
78 -AUX cmake-3.3.2-FindQt4.patch 1581 SHA256 33aadc81151b4113865d6a959698667ef42456252deeb11ee988e8ecf62ecd2c SHA512 253b8035c8ffd791fded345882caa609012b738dfce3d48ee8f1ee16d34eb6b8521de22915b89a195b93a37267c0a593b6a77dac5fe5223f26f8b719c8c2131c WHIRLPOOL 8af2141261ae4e581e05f1833b5b01309b8a1663457c837d8886e40ade6ee36a2fde064d48763ae1a4bb6771d6347ea402f2dadced4427de1b49430098ff010c
79 -AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 SHA256 e3a8f2ff999ffe32c71de3779fb7b349120cafce7f2be26d89ba393085cffcad SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9 WHIRLPOOL 49add46771d80ead6d4648d747816e728f2b59bfddd403936b2e13079a9f268d126d56ba3c6de4bdf7c1eb91cb7c3391c9008f3b25ccee8ba38563753670487c
80 -AUX cmake-3.4.3-utimensat-test.patch 1454 SHA256 9f4cc03a9426c5517e2542ec023067f8752aebf182c1b75af4ad0f86cf78a322 SHA512 26a4ce3e7c94648b1620e254d65d98cc62169e7fc7630b0208fb9b004e14a1134a3d28d67bff81bd46bbf980d4788231f3d75882e5d60d75ca75157e8f269766 WHIRLPOOL 8da4951a4febc2e3fd20344144a91dc7c04b475ea98deb6ce3e96f9fa5127376fdcd2416c14e25d4bb6d3cab2b4d6272a5f2d9fd491a7842a228d47fd761653a
81 -AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
82 -DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
83 -DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
84 -DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
85 -DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
86 -DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
87 -DIST cmake-3.4.2.tar.gz 6722152 SHA256 da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392 SHA512 a06a3f1d2d2dcbc3c1d432bd7416632393b4f5219b89dc0ba000acefe6f0d713c35878344884ea9d9e595a6387b362c97a2432acd92c385cbddb4e7b916723bb WHIRLPOOL 42f66e4273367e821b4b06b630f84919a68bc0d4a2be2085a0f24fb79e1b20fb208abe78a1806570401ba6ca24ad1077b1be27c3e7a774491c8beb63f7d501af
88 -DIST cmake-3.4.3.tar.gz 6722311 SHA256 b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11 WHIRLPOOL fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad
89 -EBUILD cmake-2.8.12.2-r1.ebuild 5504 SHA256 1d39b4ff30e7b99174e593ecf01ff303659a9adfec48507a5490b620b248bd32 SHA512 d3286337d2133499d02d3a08329d91fec708d587c50669094dd964938da3159e882cc29d2527d144a10beca6b26b64694a6943df5d2d716ea138900221b93d54 WHIRLPOOL 87e492c17a12b89258d5e0a2daa42f6cba43661fa923b5dd5fde1e2519f7661c37b8976cf1ed76ce087b722afd2fe81cd114827c7000abff880047a9379fc05f
90 -EBUILD cmake-3.2.2.ebuild 5173 SHA256 378f7aa192174ae74bff82d2d4c3d24b4e2e68ac1210641ae9209c8c447bb80b SHA512 27e64539209d172ff1b6edee1617e47cc1baf93a521363b271455d73ffae835f05d01b5e8af97754a836d0bf7149c9902627a004000e5e9a6e7dbed8c23702f2 WHIRLPOOL 461cc51621db5cb195f1ec87fe9963c44de8bf7227d46869d109577a6c3e4d06e33c7d0471b08d0ff0c79c8655d348ac8f67aedd53ce5fceac113560b223c529
91 -EBUILD cmake-3.3.1-r1.ebuild 5515 SHA256 14aa1543b0049b1a4e24ecff3f4d1d53cc71e911a454313cc42d9405f4538ba0 SHA512 1adf9e15c9570f7ce99a14f1ff3d30aef3882971b38b80df1fe9afae789ef6659716b9bc79181d046676192398499468342b2f708bf6a41732c57398d72b60b7 WHIRLPOOL ef0ff3277fa27e0366a5498af706ba5dd2464e3769fc83e23c970b47862c158de430ca3476caa991d795a0def95362dcd76e0bc6a6fb7ce85b177a83f4712c92
92 -EBUILD cmake-3.3.2-r1.ebuild 5654 SHA256 b27f6758711377c0ceba18fbadebfbcce14752943744e4d2a790c2213bd36bc0 SHA512 c9ddb10f5b7440ffbd8dba8079576809b15ede87464f54527e25fe6dfa7d9f527c7fd5c98979ae3f760e5284c5c1516466196f9482cf688386628c2485d116b3 WHIRLPOOL d4a25da32afd4607c2665acca56a3c7a10a9ce81563e70287e5d92d76d2c6b36efa856c7e250e7849956a1a57de43f863c6f420c64d1e715125028127818f344
93 -EBUILD cmake-3.4.2.ebuild 5339 SHA256 68fc3890cacc64110d76f3ea37b4eeb1368aab5b2cd1701bea8aa1ed4a380b58 SHA512 7a56c5f5c65fd938e7ab11067be868a2112dd41cc567806b3333392c513e9dd38c988f4ee3fececcd5fa6c62a92dbce165b6a70b38ff6f5861589b6c898c2734 WHIRLPOOL 406d9b6dcc9f7e7bcfa457a8239d13ab225940c8faf68f55e5f338f4a73ce644128aa6b6e1a1cecf5a159ef7058ecbc652fe6f9643fbb6778d2dadb04554374d
94 -EBUILD cmake-3.4.3.ebuild 5429 SHA256 dd9a77c62cf4a5e208612760c3dd57ee5be9fe6126db3305f239ed9518def8b0 SHA512 bbda813b582d999d5efebab4d9a567bdc17dceccf904b9f1928718a517329c9d5f1b8723b013e0f52c8ce7eb8dc3faac115cac1ee50a002ae051652fc7ee50a9 WHIRLPOOL 47d7a7a8ee822242203745ec10cf998a4a5f72a843d64f66192c85ce28e07c21b6651e7cfa26f9757bfc66a9025d152e5df411a78db306fa3cbff3c2f3a3fd49
95 -MISC metadata.xml 372 SHA256 78d93866535e604c9aa6a148da808af80312bee964a0c56b0e8d591b0f83ebb8 SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a WHIRLPOOL 5fb2acc7f68b1dd0beeb65685674103e5dfa195ee83bca3a356e8d17aafe5fdc84821d2461a988977a44e0f01fa8a8cf8ee014a932ada4580ac0555b9e2408b2
96
97 diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
98 deleted file mode 100644
99 index af20ec7..0000000
100 --- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
101 +++ /dev/null
102 @@ -1,201 +0,0 @@
103 -# Copyright 1999-2015 Gentoo Foundation
104 -# Distributed under the terms of the GNU General Public License v2
105 -# $Id$
106 -
107 -EAPI=5
108 -
109 -CMAKE_REMOVE_MODULES="no"
110 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
111 -
112 -MY_PV=${PV/_/-}
113 -MY_P=${PN}-${MY_PV}
114 -
115 -DESCRIPTION="Cross platform Make"
116 -HOMEPAGE="http://www.cmake.org/"
117 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
118 -
119 -LICENSE="CMake"
120 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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"
121 -SLOT="0"
122 -IUSE="emacs ncurses qt4 qt5"
123 -
124 -REQUIRED_USE="?? ( qt4 qt5 )"
125 -
126 -DEPEND="
127 - >=app-arch/libarchive-2.8.0:=
128 - >=dev-libs/expat-2.0.1
129 - >=net-misc/curl-7.20.0-r1[ssl]
130 - sys-libs/zlib
131 - virtual/pkgconfig
132 - ncurses? ( sys-libs/ncurses:0= )
133 - qt4? (
134 - dev-qt/qtcore:4
135 - dev-qt/qtgui:4
136 - )
137 - qt5? (
138 - dev-qt/qtcore:5
139 - dev-qt/qtgui:5
140 - dev-qt/qtwidgets:5
141 - )
142 -"
143 -RDEPEND="${DEPEND}
144 - emacs? ( virtual/emacs )
145 -"
146 -
147 -S="${WORKDIR}/${MY_P}"
148 -
149 -SITEFILE="50${PN}-gentoo.el"
150 -
151 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
152 -
153 -PATCHES=(
154 - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
155 - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
156 - "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
157 - "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
158 - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
159 - "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
160 - "${FILESDIR}"/${PN}-2.8.10-desktop.patch
161 - "${FILESDIR}"/${PN}-2.8.10-libform.patch
162 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
163 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
164 - "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
165 - "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
166 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
167 - "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
168 - "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
169 - "${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch
170 - "${FILESDIR}"/${PN}-2.8.12.2-FindCurses.patch
171 -)
172 -
173 -cmake_src_bootstrap() {
174 - # Cleanup args to extract only JOBS.
175 - # Because bootstrap does not know anything else.
176 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
177 - if [ $? -eq 0 ]; then
178 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
179 - par_arg="--parallel=${par_arg}"
180 - else
181 - par_arg="--parallel=1"
182 - fi
183 -
184 - # execinfo.h on Solaris isn't quite what it is on Darwin
185 - if [[ ${CHOST} == *-solaris* ]] ; then
186 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
187 - fi
188 -
189 - tc-export CC CXX LD
190 -
191 - # bootstrap script isn't exactly /bin/sh compatible
192 - ${CONFIG_SHELL:-sh} ./bootstrap \
193 - --prefix="${T}/cmakestrap/" \
194 - ${par_arg} \
195 - || die "Bootstrap failed"
196 -}
197 -
198 -cmake_src_test() {
199 - # fix OutDir and SelectLibraryConfigurations tests
200 - # these are altered thanks to our eclass
201 - sed -i -e 's:#IGNORE ::g' \
202 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
203 - || die
204 -
205 - pushd "${BUILD_DIR}" > /dev/null
206 -
207 - local ctestargs
208 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
209 -
210 - # Excluded tests:
211 - # BootstrapTest: we actualy bootstrap it every time so why test it.
212 - # CTest.updatecvs, which fails to commit as root
213 - # Qt4Deploy, which tries to break sandbox and ignores prefix
214 - # TestUpload, which requires network access
215 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
216 - -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
217 - || die "Tests failed"
218 -
219 - popd > /dev/null
220 -}
221 -
222 -pkg_setup() {
223 - # bug 387227
224 - addpredict /proc/self/coredump_filter
225 -}
226 -
227 -src_prepare() {
228 - cmake-utils_src_prepare
229 -
230 - # disable running of cmake in boostrap command
231 - sed -i \
232 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
233 - bootstrap || die "sed failed"
234 -
235 - # Add gcc libs to the default link paths
236 - sed -i \
237 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
238 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
239 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
240 -
241 - cmake_src_bootstrap
242 -}
243 -
244 -src_configure() {
245 - # make things work with gentoo java setup
246 - # in case java-config cannot be run, the variable just becomes unset
247 - # per bug #315229
248 - export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
249 -
250 - local mycmakeargs=(
251 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
252 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
253 - -DCMAKE_DOC_DIR=/share/doc/${PF}
254 - -DCMAKE_MAN_DIR=/share/man
255 - -DCMAKE_DATA_DIR=/share/${PN}
256 - $(cmake-utils_use_build ncurses CursesDialog)
257 - )
258 -
259 - if use qt4 || use qt5 ; then
260 - mycmakeargs+=(
261 - -DBUILD_QtDialog=ON
262 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
263 - )
264 - fi
265 - cmake-utils_src_configure
266 -}
267 -
268 -src_compile() {
269 - cmake-utils_src_compile
270 - use emacs && elisp-compile Docs/cmake-mode.el
271 -}
272 -
273 -src_test() {
274 - VIRTUALX_COMMAND="cmake_src_test" virtualmake
275 -}
276 -
277 -src_install() {
278 - cmake-utils_src_install
279 - if use emacs; then
280 - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
281 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
282 - fi
283 -
284 - insinto /usr/share/vim/vimfiles/syntax
285 - doins Docs/cmake-syntax.vim
286 -
287 - insinto /usr/share/vim/vimfiles/indent
288 - doins Docs/cmake-indent.vim
289 -
290 - insinto /usr/share/vim/vimfiles/ftdetect
291 - doins "${FILESDIR}/${PN}.vim"
292 -
293 - dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
294 - rm -rf "${D}/usr/share/cmake/completions" || die
295 -}
296 -
297 -pkg_postinst() {
298 - use emacs && elisp-site-regen
299 -}
300 -
301 -pkg_postrm() {
302 - use emacs && elisp-site-regen
303 -}
304
305 diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild
306 deleted file mode 100644
307 index 51c7679..0000000
308 --- a/dev-util/cmake/cmake-3.2.2.ebuild
309 +++ /dev/null
310 @@ -1,191 +0,0 @@
311 -# Copyright 1999-2015 Gentoo Foundation
312 -# Distributed under the terms of the GNU General Public License v2
313 -# $Id$
314 -
315 -EAPI=5
316 -
317 -CMAKE_REMOVE_MODULES="no"
318 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
319 -
320 -DESCRIPTION="Cross platform Make"
321 -HOMEPAGE="http://www.cmake.org/"
322 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
323 -
324 -LICENSE="CMake"
325 -SLOT="0"
326 -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"
327 -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
328 -
329 -RDEPEND="
330 - >=app-arch/libarchive-3.0.0:=
331 - >=dev-libs/expat-2.0.1
332 - >=net-misc/curl-7.20.0-r1[ssl]
333 - sys-libs/zlib
334 - virtual/pkgconfig
335 - emacs? ( virtual/emacs )
336 - ncurses? ( sys-libs/ncurses:0= )
337 - qt4? (
338 - dev-qt/qtcore:4
339 - dev-qt/qtgui:4
340 - )
341 - qt5? (
342 - dev-qt/qtcore:5
343 - dev-qt/qtgui:5
344 - dev-qt/qtwidgets:5
345 - )
346 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
347 -"
348 -DEPEND="${RDEPEND}
349 - doc? ( dev-python/sphinx )
350 -"
351 -
352 -SITEFILE="50${PN}-gentoo.el"
353 -
354 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
355 -
356 -PATCHES=(
357 - # prefix
358 - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
359 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
360 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
361 -
362 - # handle gentoo packaging in find modules
363 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
364 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
365 - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
366 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
367 -
368 - # respect python eclasses
369 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
370 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
371 -)
372 -
373 -cmake_src_bootstrap() {
374 - # Cleanup args to extract only JOBS.
375 - # Because bootstrap does not know anything else.
376 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
377 - if [ $? -eq 0 ]; then
378 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
379 - par_arg="--parallel=${par_arg}"
380 - else
381 - par_arg="--parallel=1"
382 - fi
383 -
384 - # execinfo.h on Solaris isn't quite what it is on Darwin
385 - if [[ ${CHOST} == *-solaris* ]] ; then
386 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
387 - fi
388 -
389 - tc-export CC CXX LD
390 -
391 - # bootstrap script isn't exactly /bin/sh compatible
392 - ${CONFIG_SHELL:-sh} ./bootstrap \
393 - --prefix="${T}/cmakestrap/" \
394 - ${par_arg} \
395 - || die "Bootstrap failed"
396 -}
397 -
398 -cmake_src_test() {
399 - # fix OutDir and SelectLibraryConfigurations tests
400 - # these are altered thanks to our eclass
401 - sed -i -e 's:#IGNORE ::g' \
402 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
403 - || die
404 -
405 - pushd "${BUILD_DIR}" > /dev/null
406 -
407 - local ctestargs
408 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
409 -
410 - # Excluded tests:
411 - # BootstrapTest: we actualy bootstrap it every time so why test it.
412 - # BundleUtilities: bundle creation broken
413 - # CTest.updatecvs: which fails to commit as root
414 - # Fortran: requires fortran
415 - # Qt4Deploy, which tries to break sandbox and ignores prefix
416 - # TestUpload, which requires network access
417 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
418 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
419 - || die "Tests failed"
420 -
421 - popd > /dev/null
422 -}
423 -
424 -src_prepare() {
425 - cmake-utils_src_prepare
426 -
427 - # disable running of cmake in boostrap command
428 - sed -i \
429 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
430 - bootstrap || die "sed failed"
431 -
432 - # Add gcc libs to the default link paths
433 - sed -i \
434 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
435 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
436 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
437 -
438 - cmake_src_bootstrap
439 -}
440 -
441 -src_configure() {
442 - local mycmakeargs=(
443 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
444 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
445 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
446 - -DCMAKE_DOC_DIR=/share/doc/${PF}
447 - -DCMAKE_MAN_DIR=/share/man
448 - -DCMAKE_DATA_DIR=/share/${PN}
449 - -DSPHINX_MAN=$(usex doc)
450 - -DSPHINX_HTML=$(usex doc)
451 - $(cmake-utils_use_build ncurses CursesDialog)
452 - )
453 -
454 - if use qt4 || use qt5 ; then
455 - mycmakeargs+=(
456 - -DBUILD_QtDialog=ON
457 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
458 - )
459 - fi
460 -
461 - cmake-utils_src_configure
462 -}
463 -
464 -src_compile() {
465 - cmake-utils_src_compile
466 - use emacs && elisp-compile Auxiliary/cmake-mode.el
467 -}
468 -
469 -src_test() {
470 - VIRTUALX_COMMAND="cmake_src_test" virtualmake
471 -}
472 -
473 -src_install() {
474 - cmake-utils_src_install
475 -
476 - if use emacs; then
477 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
478 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
479 - fi
480 -
481 - insinto /usr/share/vim/vimfiles/syntax
482 - doins Auxiliary/cmake-syntax.vim
483 -
484 - insinto /usr/share/vim/vimfiles/indent
485 - doins Auxiliary/cmake-indent.vim
486 -
487 - insinto /usr/share/vim/vimfiles/ftdetect
488 - doins "${FILESDIR}/${PN}.vim"
489 -
490 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
491 -
492 - rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
493 -}
494 -
495 -pkg_postinst() {
496 - use emacs && elisp-site-regen
497 -}
498 -
499 -pkg_postrm() {
500 - use emacs && elisp-site-regen
501 -}
502
503 diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild
504 deleted file mode 100644
505 index 0f3a6c5..0000000
506 --- a/dev-util/cmake/cmake-3.3.1-r1.ebuild
507 +++ /dev/null
508 @@ -1,199 +0,0 @@
509 -# Copyright 1999-2015 Gentoo Foundation
510 -# Distributed under the terms of the GNU General Public License v2
511 -# $Id$
512 -
513 -EAPI=5
514 -
515 -CMAKE_REMOVE_MODULES="no"
516 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
517 -
518 -MY_P="${P/_/-}"
519 -
520 -DESCRIPTION="Cross platform Make"
521 -HOMEPAGE="http://www.cmake.org/"
522 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz
523 - http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
524 -
525 -LICENSE="CMake"
526 -SLOT="0"
527 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~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"
528 -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
529 -
530 -RDEPEND="
531 - >=app-arch/libarchive-3.0.0:=
532 - >=dev-libs/expat-2.0.1
533 - >=net-misc/curl-7.20.0-r1[ssl]
534 - sys-libs/zlib
535 - virtual/pkgconfig
536 - emacs? ( virtual/emacs )
537 - ncurses? ( sys-libs/ncurses:0= )
538 - qt4? (
539 - dev-qt/qtcore:4
540 - dev-qt/qtgui:4
541 - )
542 - qt5? (
543 - dev-qt/qtcore:5
544 - dev-qt/qtgui:5
545 - dev-qt/qtwidgets:5
546 - )
547 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
548 -"
549 -DEPEND="${RDEPEND}
550 - doc? ( dev-python/sphinx )
551 -"
552 -
553 -S="${WORKDIR}/${MY_P}"
554 -
555 -SITEFILE="50${PN}-gentoo.el"
556 -
557 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
558 -
559 -PATCHES=(
560 - # prefix
561 - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
562 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
563 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
564 -
565 - # handle gentoo packaging in find modules
566 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
567 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
568 - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
569 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
570 -
571 - # respect python eclasses
572 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
573 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
574 -
575 - # upstream fixes (can usually be removed with a version bump)
576 - "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch
577 -)
578 -
579 -cmake_src_bootstrap() {
580 - # Cleanup args to extract only JOBS.
581 - # Because bootstrap does not know anything else.
582 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
583 - if [ $? -eq 0 ]; then
584 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
585 - par_arg="--parallel=${par_arg}"
586 - else
587 - par_arg="--parallel=1"
588 - fi
589 -
590 - # execinfo.h on Solaris isn't quite what it is on Darwin
591 - if [[ ${CHOST} == *-solaris* ]] ; then
592 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
593 - fi
594 -
595 - tc-export CC CXX LD
596 -
597 - # bootstrap script isn't exactly /bin/sh compatible
598 - ${CONFIG_SHELL:-sh} ./bootstrap \
599 - --prefix="${T}/cmakestrap/" \
600 - ${par_arg} \
601 - || die "Bootstrap failed"
602 -}
603 -
604 -cmake_src_test() {
605 - # fix OutDir and SelectLibraryConfigurations tests
606 - # these are altered thanks to our eclass
607 - sed -i -e 's:#IGNORE ::g' \
608 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
609 - || die
610 -
611 - pushd "${BUILD_DIR}" > /dev/null
612 -
613 - local ctestargs
614 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
615 -
616 - # Excluded tests:
617 - # BootstrapTest: we actualy bootstrap it every time so why test it.
618 - # BundleUtilities: bundle creation broken
619 - # CTest.updatecvs: which fails to commit as root
620 - # Fortran: requires fortran
621 - # Qt4Deploy, which tries to break sandbox and ignores prefix
622 - # TestUpload, which requires network access
623 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
624 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
625 - || die "Tests failed"
626 -
627 - popd > /dev/null
628 -}
629 -
630 -src_prepare() {
631 - cmake-utils_src_prepare
632 -
633 - # disable running of cmake in boostrap command
634 - sed -i \
635 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
636 - bootstrap || die "sed failed"
637 -
638 - # Add gcc libs to the default link paths
639 - sed -i \
640 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
641 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
642 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
643 -
644 - cmake_src_bootstrap
645 -}
646 -
647 -src_configure() {
648 - local mycmakeargs=(
649 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
650 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
651 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
652 - -DCMAKE_DOC_DIR=/share/doc/${PF}
653 - -DCMAKE_MAN_DIR=/share/man
654 - -DCMAKE_DATA_DIR=/share/${PN}
655 - -DSPHINX_MAN=$(usex doc)
656 - -DSPHINX_HTML=$(usex doc)
657 - $(cmake-utils_use_build ncurses CursesDialog)
658 - )
659 -
660 - if use qt4 || use qt5 ; then
661 - mycmakeargs+=(
662 - -DBUILD_QtDialog=ON
663 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
664 - )
665 - fi
666 -
667 - cmake-utils_src_configure
668 -}
669 -
670 -src_compile() {
671 - cmake-utils_src_compile
672 - use emacs && elisp-compile Auxiliary/cmake-mode.el
673 -}
674 -
675 -src_test() {
676 - VIRTUALX_COMMAND="cmake_src_test" virtualmake
677 -}
678 -
679 -src_install() {
680 - cmake-utils_src_install
681 -
682 - if use emacs; then
683 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
684 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
685 - fi
686 -
687 - insinto /usr/share/vim/vimfiles/syntax
688 - doins Auxiliary/cmake-syntax.vim
689 -
690 - insinto /usr/share/vim/vimfiles/indent
691 - doins Auxiliary/cmake-indent.vim
692 -
693 - insinto /usr/share/vim/vimfiles/ftdetect
694 - doins "${FILESDIR}/${PN}.vim"
695 -
696 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
697 -
698 - rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
699 -}
700 -
701 -pkg_postinst() {
702 - use emacs && elisp-site-regen
703 -}
704 -
705 -pkg_postrm() {
706 - use emacs && elisp-site-regen
707 -}
708
709 diff --git a/dev-util/cmake/cmake-3.3.2-r1.ebuild b/dev-util/cmake/cmake-3.3.2-r1.ebuild
710 deleted file mode 100644
711 index 9604865..0000000
712 --- a/dev-util/cmake/cmake-3.3.2-r1.ebuild
713 +++ /dev/null
714 @@ -1,203 +0,0 @@
715 -# Copyright 1999-2015 Gentoo Foundation
716 -# Distributed under the terms of the GNU General Public License v2
717 -# $Id$
718 -
719 -EAPI=5
720 -
721 -CMAKE_REMOVE_MODULES="no"
722 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx prefix
723 -
724 -MY_P="${P/_/-}"
725 -
726 -DESCRIPTION="Cross platform Make"
727 -HOMEPAGE="http://www.cmake.org/"
728 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz
729 - http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
730 -
731 -LICENSE="CMake"
732 -SLOT="0"
733 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
734 -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
735 -
736 -RDEPEND="
737 - >=app-arch/libarchive-3.0.0:=
738 - >=dev-libs/expat-2.0.1
739 - >=net-misc/curl-7.20.0-r1[ssl]
740 - sys-libs/zlib
741 - virtual/pkgconfig
742 - emacs? ( virtual/emacs )
743 - ncurses? ( sys-libs/ncurses:0= )
744 - qt4? (
745 - dev-qt/qtcore:4
746 - dev-qt/qtgui:4
747 - )
748 - qt5? (
749 - dev-qt/qtcore:5
750 - dev-qt/qtgui:5
751 - dev-qt/qtwidgets:5
752 - )
753 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
754 -"
755 -DEPEND="${RDEPEND}
756 - doc? ( dev-python/sphinx )
757 -"
758 -
759 -S="${WORKDIR}/${MY_P}"
760 -
761 -SITEFILE="50${PN}-gentoo.el"
762 -
763 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
764 -
765 -PATCHES=(
766 - # prefix
767 - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
768 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
769 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
770 -
771 - # handle gentoo packaging in find modules
772 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
773 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
774 - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
775 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
776 - "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
777 -
778 - # respect python eclasses
779 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
780 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
781 -
782 - # upstream fixes (can usually be removed with a version bump)
783 - "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch
784 - "${FILESDIR}"/${PN}-3.4.3-utimensat-test.patch
785 -)
786 -
787 -cmake_src_bootstrap() {
788 - # Cleanup args to extract only JOBS.
789 - # Because bootstrap does not know anything else.
790 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
791 - if [ $? -eq 0 ]; then
792 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
793 - par_arg="--parallel=${par_arg}"
794 - else
795 - par_arg="--parallel=1"
796 - fi
797 -
798 - # execinfo.h on Solaris isn't quite what it is on Darwin
799 - if [[ ${CHOST} == *-solaris* ]] ; then
800 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
801 - fi
802 -
803 - tc-export CC CXX LD
804 -
805 - # bootstrap script isn't exactly /bin/sh compatible
806 - ${CONFIG_SHELL:-sh} ./bootstrap \
807 - --prefix="${T}/cmakestrap/" \
808 - ${par_arg} \
809 - || die "Bootstrap failed"
810 -}
811 -
812 -cmake_src_test() {
813 - # fix OutDir and SelectLibraryConfigurations tests
814 - # these are altered thanks to our eclass
815 - sed -i -e 's:#IGNORE ::g' \
816 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
817 - || die
818 -
819 - pushd "${BUILD_DIR}" > /dev/null
820 -
821 - local ctestargs
822 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
823 -
824 - # Excluded tests:
825 - # BootstrapTest: we actualy bootstrap it every time so why test it.
826 - # BundleUtilities: bundle creation broken
827 - # CTest.updatecvs: which fails to commit as root
828 - # Fortran: requires fortran
829 - # Qt4Deploy, which tries to break sandbox and ignores prefix
830 - # TestUpload, which requires network access
831 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
832 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
833 - || die "Tests failed"
834 -
835 - popd > /dev/null
836 -}
837 -
838 -src_prepare() {
839 - cmake-utils_src_prepare
840 -
841 - eprefixify Modules/FindQt4.cmake
842 -
843 - # disable running of cmake in boostrap command
844 - sed -i \
845 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
846 - bootstrap || die "sed failed"
847 -
848 - # Add gcc libs to the default link paths
849 - sed -i \
850 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
851 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
852 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
853 -
854 - cmake_src_bootstrap
855 -}
856 -
857 -src_configure() {
858 - local mycmakeargs=(
859 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
860 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
861 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
862 - -DCMAKE_DOC_DIR=/share/doc/${PF}
863 - -DCMAKE_MAN_DIR=/share/man
864 - -DCMAKE_DATA_DIR=/share/${PN}
865 - -DSPHINX_MAN=$(usex doc)
866 - -DSPHINX_HTML=$(usex doc)
867 - $(cmake-utils_use_build ncurses CursesDialog)
868 - )
869 -
870 - if use qt4 || use qt5 ; then
871 - mycmakeargs+=(
872 - -DBUILD_QtDialog=ON
873 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
874 - )
875 - fi
876 -
877 - cmake-utils_src_configure
878 -}
879 -
880 -src_compile() {
881 - cmake-utils_src_compile
882 - use emacs && elisp-compile Auxiliary/cmake-mode.el
883 -}
884 -
885 -src_test() {
886 - VIRTUALX_COMMAND="cmake_src_test" virtualmake
887 -}
888 -
889 -src_install() {
890 - cmake-utils_src_install
891 -
892 - if use emacs; then
893 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
894 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
895 - fi
896 -
897 - insinto /usr/share/vim/vimfiles/syntax
898 - doins Auxiliary/cmake-syntax.vim
899 -
900 - insinto /usr/share/vim/vimfiles/indent
901 - doins Auxiliary/cmake-indent.vim
902 -
903 - insinto /usr/share/vim/vimfiles/ftdetect
904 - doins "${FILESDIR}/${PN}.vim"
905 -
906 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
907 -
908 - rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
909 -}
910 -
911 -pkg_postinst() {
912 - use emacs && elisp-site-regen
913 -}
914 -
915 -pkg_postrm() {
916 - use emacs && elisp-site-regen
917 -}
918
919 diff --git a/dev-util/cmake/cmake-3.4.2.ebuild b/dev-util/cmake/cmake-3.4.2.ebuild
920 deleted file mode 100644
921 index acd76b8..0000000
922 --- a/dev-util/cmake/cmake-3.4.2.ebuild
923 +++ /dev/null
924 @@ -1,198 +0,0 @@
925 -# Copyright 1999-2016 Gentoo Foundation
926 -# Distributed under the terms of the GNU General Public License v2
927 -# $Id$
928 -
929 -EAPI=5
930 -
931 -CMAKE_REMOVE_MODULES="no"
932 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
933 -
934 -MY_P="${P/_/-}"
935 -
936 -DESCRIPTION="Cross platform Make"
937 -HOMEPAGE="http://www.cmake.org/"
938 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
939 -
940 -LICENSE="CMake"
941 -SLOT="0"
942 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
943 -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
944 -
945 -RDEPEND="
946 - >=app-arch/libarchive-3.0.0:=
947 - >=dev-libs/expat-2.0.1
948 - >=net-misc/curl-7.20.0-r1[ssl]
949 - sys-libs/zlib
950 - virtual/pkgconfig
951 - emacs? ( virtual/emacs )
952 - ncurses? ( sys-libs/ncurses:0= )
953 - qt4? (
954 - dev-qt/qtcore:4
955 - dev-qt/qtgui:4
956 - )
957 - qt5? (
958 - dev-qt/qtcore:5
959 - dev-qt/qtgui:5
960 - dev-qt/qtwidgets:5
961 - )
962 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
963 -"
964 -DEPEND="${RDEPEND}
965 - doc? ( dev-python/sphinx )
966 -"
967 -
968 -S="${WORKDIR}/${MY_P}"
969 -
970 -SITEFILE="50${PN}-gentoo.el"
971 -
972 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
973 -
974 -PATCHES=(
975 - # prefix
976 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
977 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
978 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
979 -
980 - # handle gentoo packaging in find modules
981 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
982 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
983 - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
984 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
985 - "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
986 -
987 - # respect python eclasses
988 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
989 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
990 -
991 - # upstream fixes (can usually be removed with a version bump)
992 -)
993 -
994 -cmake_src_bootstrap() {
995 - # Cleanup args to extract only JOBS.
996 - # Because bootstrap does not know anything else.
997 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
998 - if [ $? -eq 0 ]; then
999 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
1000 - par_arg="--parallel=${par_arg}"
1001 - else
1002 - par_arg="--parallel=1"
1003 - fi
1004 -
1005 - # execinfo.h on Solaris isn't quite what it is on Darwin
1006 - if [[ ${CHOST} == *-solaris* ]] ; then
1007 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
1008 - fi
1009 -
1010 - tc-export CC CXX LD
1011 -
1012 - # bootstrap script isn't exactly /bin/sh compatible
1013 - ${CONFIG_SHELL:-sh} ./bootstrap \
1014 - --prefix="${T}/cmakestrap/" \
1015 - ${par_arg} \
1016 - || die "Bootstrap failed"
1017 -}
1018 -
1019 -cmake_src_test() {
1020 - # fix OutDir and SelectLibraryConfigurations tests
1021 - # these are altered thanks to our eclass
1022 - sed -i -e 's:#IGNORE ::g' \
1023 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
1024 - || die
1025 -
1026 - pushd "${BUILD_DIR}" > /dev/null
1027 -
1028 - local ctestargs
1029 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
1030 -
1031 - # Excluded tests:
1032 - # BootstrapTest: we actualy bootstrap it every time so why test it.
1033 - # BundleUtilities: bundle creation broken
1034 - # CTest.updatecvs: which fails to commit as root
1035 - # Fortran: requires fortran
1036 - # Qt4Deploy, which tries to break sandbox and ignores prefix
1037 - # TestUpload, which requires network access
1038 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
1039 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
1040 - || die "Tests failed"
1041 -
1042 - popd > /dev/null
1043 -}
1044 -
1045 -src_prepare() {
1046 - cmake-utils_src_prepare
1047 -
1048 - # disable running of cmake in boostrap command
1049 - sed -i \
1050 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
1051 - bootstrap || die "sed failed"
1052 -
1053 - # Add gcc libs to the default link paths
1054 - sed -i \
1055 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
1056 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
1057 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
1058 -
1059 - cmake_src_bootstrap
1060 -}
1061 -
1062 -src_configure() {
1063 - local mycmakeargs=(
1064 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
1065 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
1066 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
1067 - -DCMAKE_DOC_DIR=/share/doc/${PF}
1068 - -DCMAKE_MAN_DIR=/share/man
1069 - -DCMAKE_DATA_DIR=/share/${PN}
1070 - -DSPHINX_MAN=$(usex doc)
1071 - -DSPHINX_HTML=$(usex doc)
1072 - $(cmake-utils_use_build ncurses CursesDialog)
1073 - )
1074 -
1075 - if use qt4 || use qt5 ; then
1076 - mycmakeargs+=(
1077 - -DBUILD_QtDialog=ON
1078 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
1079 - )
1080 - fi
1081 -
1082 - cmake-utils_src_configure
1083 -}
1084 -
1085 -src_compile() {
1086 - cmake-utils_src_compile
1087 - use emacs && elisp-compile Auxiliary/cmake-mode.el
1088 -}
1089 -
1090 -src_test() {
1091 - VIRTUALX_COMMAND="cmake_src_test" virtualmake
1092 -}
1093 -
1094 -src_install() {
1095 - cmake-utils_src_install
1096 -
1097 - if use emacs; then
1098 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
1099 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
1100 - fi
1101 -
1102 - insinto /usr/share/vim/vimfiles/syntax
1103 - doins Auxiliary/cmake-syntax.vim
1104 -
1105 - insinto /usr/share/vim/vimfiles/indent
1106 - doins Auxiliary/cmake-indent.vim
1107 -
1108 - insinto /usr/share/vim/vimfiles/ftdetect
1109 - doins "${FILESDIR}/${PN}.vim"
1110 -
1111 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
1112 -
1113 - rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
1114 -}
1115 -
1116 -pkg_postinst() {
1117 - use emacs && elisp-site-regen
1118 -}
1119 -
1120 -pkg_postrm() {
1121 - use emacs && elisp-site-regen
1122 -}
1123
1124 diff --git a/dev-util/cmake/cmake-3.4.3.ebuild b/dev-util/cmake/cmake-3.4.3.ebuild
1125 deleted file mode 100644
1126 index 802fc61..0000000
1127 --- a/dev-util/cmake/cmake-3.4.3.ebuild
1128 +++ /dev/null
1129 @@ -1,201 +0,0 @@
1130 -# Copyright 1999-2016 Gentoo Foundation
1131 -# Distributed under the terms of the GNU General Public License v2
1132 -# $Id$
1133 -
1134 -EAPI=5
1135 -
1136 -CMAKE_REMOVE_MODULES="no"
1137 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx prefix
1138 -
1139 -MY_P="${P/_/-}"
1140 -
1141 -DESCRIPTION="Cross platform Make"
1142 -HOMEPAGE="http://www.cmake.org/"
1143 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
1144 -
1145 -LICENSE="CMake"
1146 -SLOT="0"
1147 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
1148 -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
1149 -
1150 -RDEPEND="
1151 - >=app-arch/libarchive-3.0.0:=
1152 - >=dev-libs/expat-2.0.1
1153 - >=net-misc/curl-7.20.0-r1[ssl]
1154 - sys-libs/zlib
1155 - virtual/pkgconfig
1156 - emacs? ( virtual/emacs )
1157 - ncurses? ( sys-libs/ncurses:0= )
1158 - qt4? (
1159 - dev-qt/qtcore:4
1160 - dev-qt/qtgui:4
1161 - )
1162 - qt5? (
1163 - dev-qt/qtcore:5
1164 - dev-qt/qtgui:5
1165 - dev-qt/qtwidgets:5
1166 - )
1167 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
1168 -"
1169 -DEPEND="${RDEPEND}
1170 - doc? ( dev-python/sphinx )
1171 -"
1172 -
1173 -S="${WORKDIR}/${MY_P}"
1174 -
1175 -SITEFILE="50${PN}-gentoo.el"
1176 -
1177 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
1178 -
1179 -PATCHES=(
1180 - # prefix
1181 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
1182 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
1183 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
1184 -
1185 - # handle gentoo packaging in find modules
1186 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
1187 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
1188 - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
1189 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
1190 - "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
1191 -
1192 - # respect python eclasses
1193 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
1194 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
1195 -
1196 - # upstream fixes (can usually be removed with a version bump)
1197 - "${FILESDIR}"/${PN}-3.4.3-utimensat-test.patch
1198 -)
1199 -
1200 -cmake_src_bootstrap() {
1201 - # Cleanup args to extract only JOBS.
1202 - # Because bootstrap does not know anything else.
1203 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
1204 - if [ $? -eq 0 ]; then
1205 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
1206 - par_arg="--parallel=${par_arg}"
1207 - else
1208 - par_arg="--parallel=1"
1209 - fi
1210 -
1211 - # execinfo.h on Solaris isn't quite what it is on Darwin
1212 - if [[ ${CHOST} == *-solaris* ]] ; then
1213 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
1214 - fi
1215 -
1216 - tc-export CC CXX LD
1217 -
1218 - # bootstrap script isn't exactly /bin/sh compatible
1219 - ${CONFIG_SHELL:-sh} ./bootstrap \
1220 - --prefix="${T}/cmakestrap/" \
1221 - ${par_arg} \
1222 - || die "Bootstrap failed"
1223 -}
1224 -
1225 -cmake_src_test() {
1226 - # fix OutDir and SelectLibraryConfigurations tests
1227 - # these are altered thanks to our eclass
1228 - sed -i -e 's:#IGNORE ::g' \
1229 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
1230 - || die
1231 -
1232 - pushd "${BUILD_DIR}" > /dev/null
1233 -
1234 - local ctestargs
1235 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
1236 -
1237 - # Excluded tests:
1238 - # BootstrapTest: we actualy bootstrap it every time so why test it.
1239 - # BundleUtilities: bundle creation broken
1240 - # CTest.updatecvs: which fails to commit as root
1241 - # Fortran: requires fortran
1242 - # Qt4Deploy, which tries to break sandbox and ignores prefix
1243 - # TestUpload, which requires network access
1244 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
1245 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
1246 - || die "Tests failed"
1247 -
1248 - popd > /dev/null
1249 -}
1250 -
1251 -src_prepare() {
1252 - cmake-utils_src_prepare
1253 -
1254 - eprefixify Modules/FindQt4.cmake
1255 -
1256 - # disable running of cmake in boostrap command
1257 - sed -i \
1258 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
1259 - bootstrap || die "sed failed"
1260 -
1261 - # Add gcc libs to the default link paths
1262 - sed -i \
1263 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
1264 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
1265 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
1266 -
1267 - cmake_src_bootstrap
1268 -}
1269 -
1270 -src_configure() {
1271 - local mycmakeargs=(
1272 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
1273 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
1274 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
1275 - -DCMAKE_DOC_DIR=/share/doc/${PF}
1276 - -DCMAKE_MAN_DIR=/share/man
1277 - -DCMAKE_DATA_DIR=/share/${PN}
1278 - -DSPHINX_MAN=$(usex doc)
1279 - -DSPHINX_HTML=$(usex doc)
1280 - $(cmake-utils_use_build ncurses CursesDialog)
1281 - )
1282 -
1283 - if use qt4 || use qt5 ; then
1284 - mycmakeargs+=(
1285 - -DBUILD_QtDialog=ON
1286 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
1287 - )
1288 - fi
1289 -
1290 - cmake-utils_src_configure
1291 -}
1292 -
1293 -src_compile() {
1294 - cmake-utils_src_compile
1295 - use emacs && elisp-compile Auxiliary/cmake-mode.el
1296 -}
1297 -
1298 -src_test() {
1299 - VIRTUALX_COMMAND="cmake_src_test" virtualmake
1300 -}
1301 -
1302 -src_install() {
1303 - cmake-utils_src_install
1304 -
1305 - if use emacs; then
1306 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
1307 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
1308 - fi
1309 -
1310 - insinto /usr/share/vim/vimfiles/syntax
1311 - doins Auxiliary/cmake-syntax.vim
1312 -
1313 - insinto /usr/share/vim/vimfiles/indent
1314 - doins Auxiliary/cmake-indent.vim
1315 -
1316 - insinto /usr/share/vim/vimfiles/ftdetect
1317 - doins "${FILESDIR}/${PN}.vim"
1318 -
1319 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
1320 -
1321 - rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
1322 -}
1323 -
1324 -pkg_postinst() {
1325 - use emacs && elisp-site-regen
1326 -}
1327 -
1328 -pkg_postrm() {
1329 - use emacs && elisp-site-regen
1330 -}
1331
1332 diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
1333 deleted file mode 100644
1334 index e4a1a6d..0000000
1335 --- a/dev-util/cmake/files/50cmake-gentoo.el
1336 +++ /dev/null
1337 @@ -1,4 +0,0 @@
1338 -(add-to-list 'load-path "@SITELISP@")
1339 -(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t)
1340 -(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
1341 -(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
1342
1343 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
1344 deleted file mode 100644
1345 index 02c3011..0000000
1346 --- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
1347 +++ /dev/null
1348 @@ -1,39 +0,0 @@
1349 -http://public.kitware.com/Bug/view.php?id=7933
1350 -
1351 -diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx
1352 ---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008
1353 -+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008
1354 -@@ -38,6 +38,13 @@
1355 - int main() { return 0; }
1356 - #endif
1357 -
1358 -+#ifdef TEST_KWSYS_LFS_SUPPORT
1359 -+#define _LARGE_FILES
1360 -+#include <iostream>
1361 -+int main() { return 0; }
1362 -+#endif
1363 -+
1364 -+
1365 - #ifdef TEST_KWSYS_IOS_HAVE_STD
1366 - #include <iosfwd>
1367 - void f(std ::ostream*) {}
1368 -diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap
1369 ---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008
1370 -+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008
1371 -@@ -1005,6 +1005,16 @@
1372 - echo "${cmake_cxx_compiler} does not have stl iterator_traits"
1373 - fi
1374 -
1375 -+if cmake_try_run "${cmake_cxx_compiler}" \
1376 -+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \
1377 -+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then
1378 -+ KWSYS_LFS_AVAILABLE=1
1379 -+ echo "LFS support available"
1380 -+else
1381 -+ KWSYS_LFS_AVAILABLE=0
1382 -+ echo "LFS support unavailable, disabled"
1383 -+fi
1384 -+
1385 - if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then
1386 - if cmake_try_run "${cmake_cxx_compiler}" \
1387 - "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \
1388
1389 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
1390 deleted file mode 100644
1391 index ceb205f..0000000
1392 --- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
1393 +++ /dev/null
1394 @@ -1,19 +0,0 @@
1395 -Patch by Heiko Przybyl
1396 -
1397 ---- Source/cmComputeLinkInformation.cxx
1398 -+++ Source/cmComputeLinkInformation.cxx
1399 -@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
1400 - for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
1401 - ri != runtimeDirs.end(); ++ri)
1402 - {
1403 -+ // Do not add duplicates.
1404 -+ // I'd like to have that check already in the list generation code
1405 -+ // but that would need lots of more changes, even in ExpandListArgument().
1406 -+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
1407 -+ {
1408 -+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
1409 -+ continue;
1410 -+ }
1411 - // Separate from previous path.
1412 - rpath += sep;
1413 - sep = this->GetRuntimeSep().c_str();
1414
1415 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
1416 deleted file mode 100644
1417 index 9cb4777..0000000
1418 --- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
1419 +++ /dev/null
1420 @@ -1,23 +0,0 @@
1421 -Don't use .so for modules on darwin/macos. Use .bundle instead.
1422 -Patch by Heiko Przybyl
1423 -
1424 ---- Modules/Platform/Darwin.cmake
1425 -+++ Modules/Platform/Darwin.cmake
1426 -@@ -26,7 +26,7 @@
1427 - set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
1428 - set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
1429 - set(CMAKE_SHARED_MODULE_PREFIX "lib")
1430 --set(CMAKE_SHARED_MODULE_SUFFIX ".so")
1431 -+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
1432 - set(CMAKE_MODULE_EXISTS 1)
1433 - set(CMAKE_DL_LIBS "")
1434 -
1435 -@@ -48,7 +48,7 @@
1436 - set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
1437 - set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
1438 - set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
1439 --set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
1440 -+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
1441 -
1442 - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
1443 - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
1444
1445 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
1446 deleted file mode 100644
1447 index 97c93aa..0000000
1448 --- a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
1449 +++ /dev/null
1450 @@ -1,50 +0,0 @@
1451 -Do not detect Xcode and set -isysroot for its SDK, since that messes up
1452 -our toolchain, and hence makes any compilation fail, bug #445308
1453 -
1454 ---- Modules/Platform/Darwin.cmake
1455 -+++ Modules/Platform/Darwin.cmake
1456 -@@ -60,18 +60,18 @@
1457 - endif()
1458 -
1459 - # Ask xcode-select where to find /Developer or fall back to ancient location.
1460 --execute_process(COMMAND xcode-select -print-path
1461 -- OUTPUT_VARIABLE _stdout
1462 -- OUTPUT_STRIP_TRAILING_WHITESPACE
1463 -- ERROR_VARIABLE _stderr
1464 -- RESULT_VARIABLE _failed)
1465 --if(NOT _failed AND IS_DIRECTORY ${_stdout})
1466 -- set(OSX_DEVELOPER_ROOT ${_stdout})
1467 --elseif(IS_DIRECTORY "/Developer")
1468 -- set(OSX_DEVELOPER_ROOT "/Developer")
1469 --else()
1470 -+#execute_process(COMMAND xcode-select -print-path
1471 -+# OUTPUT_VARIABLE _stdout
1472 -+# OUTPUT_STRIP_TRAILING_WHITESPACE
1473 -+# ERROR_VARIABLE _stderr
1474 -+# RESULT_VARIABLE _failed)
1475 -+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
1476 -+# set(OSX_DEVELOPER_ROOT ${_stdout})
1477 -+#elseif(IS_DIRECTORY "/Developer")
1478 -+# set(OSX_DEVELOPER_ROOT "/Developer")
1479 -+#else()
1480 - set(OSX_DEVELOPER_ROOT "")
1481 --endif()
1482 -+#endif()
1483 -
1484 - execute_process(COMMAND sw_vers -productVersion
1485 - OUTPUT_VARIABLE CURRENT_OSX_VERSION
1486 -@@ -91,10 +91,10 @@
1487 - # CMAKE_OSX_DEPLOYMENT_TARGET
1488 -
1489 - # Set cache variable - end user may change this during ccmake or cmake-gui configure.
1490 --if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
1491 -- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
1492 -- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
1493 --endif()
1494 -+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
1495 -+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
1496 -+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
1497 -+#endif()
1498 -
1499 - #----------------------------------------------------------------------------
1500 - # CMAKE_OSX_SYSROOT
1501
1502 diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
1503 deleted file mode 100644
1504 index e0cefa9..0000000
1505 --- a/dev-util/cmake/files/cmake-2.8.10-desktop.patch
1506 +++ /dev/null
1507 @@ -1,13 +0,0 @@
1508 -diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
1509 -index 645eb76..7be495f 100644
1510 ---- a/Source/QtDialog/CMake.desktop
1511 -+++ b/Source/QtDialog/CMake.desktop
1512 -@@ -3,7 +3,7 @@ Version=1.0
1513 - Name=CMake
1514 - Comment=Cross-platform buildsystem
1515 - Exec=cmake-gui %f
1516 --Icon=CMakeSetup32.png
1517 -+Icon=CMakeSetup32
1518 - Terminal=false
1519 - X-MultipleArgs=false
1520 - Type=Application
1521
1522 diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch
1523 deleted file mode 100644
1524 index 052cc30..0000000
1525 --- a/dev-util/cmake/files/cmake-2.8.10-libform.patch
1526 +++ /dev/null
1527 @@ -1,51 +0,0 @@
1528 -diff --git a/CMakeLists.txt b/CMakeLists.txt
1529 -index ea1c033..ae479ce 100644
1530 ---- a/CMakeLists.txt
1531 -+++ b/CMakeLists.txt
1532 -@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
1533 - else ()
1534 - set(BUILD_CursesDialog 0)
1535 - endif ()
1536 -- if(BUILD_CursesDialog)
1537 -- add_subdirectory(Source/CursesDialog/form)
1538 -- endif()
1539 - endmacro ()
1540 -
1541 - #-----------------------------------------------------------------------
1542 -diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
1543 -index 96e28b4..4102379 100644
1544 ---- a/Source/CursesDialog/CMakeLists.txt
1545 -+++ b/Source/CursesDialog/CMakeLists.txt
1546 -@@ -25,13 +25,16 @@ set( CURSES_SRCS
1547 - CursesDialog/ccmake
1548 - )
1549 -
1550 --include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
1551 -- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
1552 - include_directories(${CURSES_INCLUDE_PATH})
1553 -
1554 -
1555 - add_executable(ccmake ${CURSES_SRCS} )
1556 - target_link_libraries(ccmake CMakeLib)
1557 --target_link_libraries(ccmake cmForm)
1558 -+TARGET_LINK_LIBRARIES(ccmake form)
1559 -+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
1560 -+IF(CURSES_EXTRA_LIBRARY)
1561 -+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
1562 -+ENDIF(CURSES_EXTRA_LIBRARY)
1563 -+
1564 -
1565 - install_targets(/bin ccmake)
1566 -diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
1567 -index b157a28..f131ea4 100644
1568 ---- a/Source/CursesDialog/cmCursesStandardIncludes.h
1569 -+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
1570 -@@ -15,8 +15,6 @@
1571 - #define _MSE_INT_H
1572 - #endif
1573 -
1574 --#include <cmFormConfigure.h>
1575 --
1576 - #if defined(__hpux)
1577 - # define _BOOL_DEFINED
1578 - # include <sys/time.h>
1579
1580 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
1581 deleted file mode 100644
1582 index a7e8688..0000000
1583 --- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
1584 +++ /dev/null
1585 @@ -1,22 +0,0 @@
1586 ---- Modules/FindPythonInterp.cmake
1587 -+++ Modules/FindPythonInterp.cmake
1588 -@@ -60,6 +60,10 @@
1589 -
1590 - list(APPEND _Python_NAMES python)
1591 -
1592 -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
1593 -+ set(_Python_NAMES python)
1594 -+endif()
1595 -+
1596 - # Search for the current active python version first
1597 - find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
1598 -
1599 -@@ -76,7 +80,7 @@
1600 - unset(_PYTHON3_VERSIONS)
1601 -
1602 - # Search for newest python version if python executable isn't found
1603 --if(NOT PYTHON_EXECUTABLE)
1604 -+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
1605 - foreach(_CURRENT_VERSION ${_Python_VERSIONS})
1606 - set(_Python_NAMES python${_CURRENT_VERSION})
1607 - if(WIN32)
1608
1609 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
1610 deleted file mode 100644
1611 index 2a83ff7..0000000
1612 --- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
1613 +++ /dev/null
1614 @@ -1,24 +0,0 @@
1615 -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
1616 -index bffa9fb..8fc90ee 100644
1617 ---- a/Modules/FindPythonLibs.cmake
1618 -+++ b/Modules/FindPythonLibs.cmake
1619 -@@ -74,6 +74,19 @@ set(_Python_VERSIONS
1620 - ${_PYTHON_FIND_OTHER_VERSIONS}
1621 - )
1622 -
1623 -+# Gentoo portage requires that you use exactly the given python version
1624 -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
1625 -+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
1626 -+ OUTPUT_VARIABLE _Gentoo_Python_VERSION)
1627 -+ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
1628 -+ if (_Gentoo_Python_INDEX EQUAL -1)
1629 -+ # the current Gentoo python version is not compatible with what is requested
1630 -+ set(_Python_VERSIONS)
1631 -+ else ()
1632 -+ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
1633 -+ endif ()
1634 -+endif()
1635 -+
1636 - unset(_PYTHON_FIND_OTHER_VERSIONS)
1637 - unset(_PYTHON1_VERSIONS)
1638 - unset(_PYTHON2_VERSIONS)
1639
1640 diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
1641 deleted file mode 100644
1642 index 02e44fb..0000000
1643 --- a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
1644 +++ /dev/null
1645 @@ -1,48 +0,0 @@
1646 ---- b/Modules/FindBLAS.cmake
1647 -+++ a/Modules/FindBLAS.cmake
1648 -@@ -1,3 +1,9 @@
1649 -+#
1650 -+# Version modified for Gentoo Linux
1651 -+# If a valid PkgConfig configuration for blas is found, this overrides and cancels
1652 -+# all further checks.
1653 -+#
1654 -+
1655 - # - Find BLAS library
1656 - # This module finds an installed fortran library that implements the BLAS
1657 - # linear-algebra interface (see http://www.netlib.org/blas/).
1658 -@@ -40,6 +46,26 @@
1659 - # (To distribute this file outside of CMake, substitute the full
1660 - # License text for the above reference.)
1661 -
1662 -+#
1663 -+# first, try PkgConfig
1664 -+#
1665 -+find_package(PkgConfig REQUIRED)
1666 -+pkg_check_modules(PC_BLAS blas)
1667 -+if(PC_BLAS_FOUND)
1668 -+ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
1669 -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
1670 -+ if (NOT ${PC_LIB}_LIBRARY)
1671 -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
1672 -+ endif (NOT ${PC_LIB}_LIBRARY)
1673 -+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
1674 -+ endforeach(PC_LIB)
1675 -+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
1676 -+ mark_as_advanced(BLAS_LIBRARIES)
1677 -+else(PC_BLAS_FOUND)
1678 -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
1679 -+
1680 -+
1681 -+
1682 - include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
1683 - include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
1684 -
1685 -@@ -604,3 +630,8 @@
1686 - endif()
1687 -
1688 - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
1689 -+
1690 -+
1691 -+endif(PC_BLAS_FOUND)
1692 -+
1693 -+
1694
1695 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
1696 deleted file mode 100644
1697 index 36f4ded..0000000
1698 --- a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
1699 +++ /dev/null
1700 @@ -1,130 +0,0 @@
1701 -From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
1702 -From: Michael Palimaka <kensington@g.o>
1703 -Date: Tue, 6 Nov 2012 23:35:34 +1100
1704 -Subject: [PATCH] Set some proper paths to make cmake find our tools.
1705 -
1706 -The ebuild now adds an extra / at the end of $EPREFIX so that it is
1707 -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
1708 -correct)
1709 -
1710 -Original patch by Heiko Przybyl.
1711 -Updated by Chris Reffett (cmake-2.8.8)
1712 -Updated by Johannes Huber (cmake-2.8.9)
1713 -Updated by Michael Palimaka (cmake-2.8.10)
1714 -Updated by Chris Reffett (cmake-2.8.11)
1715 -
1716 ---- a/Modules/Platform/Darwin.cmake
1717 -+++ b/Modules/Platform/Darwin.cmake
1718 -@@ -252,9 +252,9 @@
1719 - "<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>")
1720 -
1721 -
1722 --# default to searching for frameworks first
1723 -+# default to searching for frameworks last
1724 - if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
1725 -- set(CMAKE_FIND_FRAMEWORK FIRST)
1726 -+ set(CMAKE_FIND_FRAMEWORK LAST)
1727 - endif()
1728 -
1729 - # Older OS X linkers do not report their framework search path
1730 -@@ -276,6 +276,8 @@
1731 -
1732 - # set up the default search directories for frameworks
1733 - set(CMAKE_SYSTEM_FRAMEWORK_PATH
1734 -+ @GENTOO_PORTAGE_EPREFIX@Frameworks
1735 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib
1736 - ~/Library/Frameworks
1737 - /Library/Frameworks
1738 - /Network/Library/Frameworks
1739 -@@ -298,13 +300,15 @@
1740 - endif()
1741 - endif()
1742 -
1743 --# default to searching for application bundles first
1744 -+# default to searching for application bundles last
1745 - if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
1746 -- set(CMAKE_FIND_APPBUNDLE FIRST)
1747 -+ set(CMAKE_FIND_APPBUNDLE LAST)
1748 - endif()
1749 - # set up the default search directories for application bundles
1750 - set(_apps_paths)
1751 - foreach(_path
1752 -+ @GENTOO_PORTAGE_EPREFIX@Applications
1753 -+ @GENTOO_PORTAGE_EPREFIX@usr/bin
1754 - "~/Applications"
1755 - "/Applications"
1756 - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
1757 ---- a/Modules/Platform/UnixPaths.cmake
1758 -+++ b/Modules/Platform/UnixPaths.cmake
1759 -@@ -33,6 +33,7 @@
1760 - # search types.
1761 - list(APPEND CMAKE_SYSTEM_PREFIX_PATH
1762 - # Standard
1763 -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
1764 - /usr/local /usr /
1765 -
1766 - # CMake install location
1767 -@@ -44,43 +45,41 @@
1768 -
1769 - # List common include file locations not under the common prefixes.
1770 - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
1771 -- # Windows API on Cygwin
1772 -- /usr/include/w32api
1773 --
1774 -- # X11
1775 -- /usr/X11R6/include /usr/include/X11
1776 --
1777 -- # Other
1778 -- /usr/pkg/include
1779 -- /opt/csw/include /opt/include
1780 -- /usr/openwin/include
1781 -+ @GENTOO_PORTAGE_EPREFIX@usr/include
1782 - )
1783 -
1784 - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
1785 -- # Windows API on Cygwin
1786 -- /usr/lib/w32api
1787 --
1788 -- # X11
1789 -- /usr/X11R6/lib /usr/lib/X11
1790 --
1791 -- # Other
1792 -- /usr/pkg/lib
1793 -- /opt/csw/lib /opt/lib
1794 -- /usr/openwin/lib
1795 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
1796 -+ @GENTOO_PORTAGE_GCCLIBDIR@
1797 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
1798 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
1799 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
1800 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib
1801 -+ @GENTOO_PORTAGE_EPREFIX@lib
1802 - )
1803 -
1804 - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
1805 -- /usr/pkg/bin
1806 -+ @GENTOO_PORTAGE_EPREFIX@usr/bin
1807 -+ @GENTOO_PORTAGE_EPREFIX@bin
1808 - )
1809 -
1810 - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
1811 -- /lib /usr/lib /usr/lib32 /usr/lib64
1812 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
1813 -+ @GENTOO_PORTAGE_GCCLIBDIR@
1814 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
1815 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
1816 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
1817 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib
1818 -+ @GENTOO_PORTAGE_EPREFIX@lib
1819 -+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
1820 - )
1821 -
1822 - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
1823 -+ @GENTOO_PORTAGE_EPREFIX@usr/include
1824 - /usr/include
1825 - )
1826 - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
1827 -+ @GENTOO_PORTAGE_EPREFIX@usr/include
1828 - /usr/include
1829 - )
1830 -
1831
1832 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
1833 deleted file mode 100644
1834 index 6dc244c..0000000
1835 --- a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
1836 +++ /dev/null
1837 @@ -1,43 +0,0 @@
1838 -From: Julian Ospald <hasufell@g.o>
1839 -Date: Sun Dec 8 13:38:06 UTC 2013
1840 -Subject: fix check for freetype-2.5.1
1841 -
1842 ---- Modules/FindFreetype.cmake
1843 -+++ Modules/FindFreetype.cmake
1844 -@@ -64,6 +64,19 @@
1845 - PATH_SUFFIXES include/freetype2 include
1846 - )
1847 -
1848 -+if(NOT FREETYPE_INCLUDE_DIR_freetype2)
1849 -+ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
1850 -+ HINTS
1851 -+ ENV FREETYPE_DIR
1852 -+ PATHS
1853 -+ /usr/X11R6
1854 -+ /usr/local/X11R6
1855 -+ /usr/local/X11
1856 -+ /usr/freeware
1857 -+ PATH_SUFFIXES include/freetype2 include
1858 -+ )
1859 -+endif()
1860 -+
1861 - find_library(FREETYPE_LIBRARY
1862 - NAMES freetype libfreetype freetype219
1863 - HINTS
1864 -@@ -82,8 +95,14 @@
1865 - endif()
1866 - set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
1867 -
1868 --if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
1869 -- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
1870 -+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
1871 -+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
1872 -+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
1873 -+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
1874 -+endif()
1875 -+
1876 -+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
1877 -+ file(STRINGS "${FREETYPE_H}" freetype_version_str
1878 - REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
1879 -
1880 - unset(FREETYPE_VERSION_STRING)
1881
1882 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
1883 deleted file mode 100644
1884 index b094f17..0000000
1885 --- a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
1886 +++ /dev/null
1887 @@ -1,23 +0,0 @@
1888 ---- Modules/FindImageMagick.cmake
1889 -+++ Modules/FindImageMagick.cmake
1890 -@@ -147,17 +147,17 @@
1891 - )
1892 - if(component STREQUAL "Magick++")
1893 - FIND_IMAGEMAGICK_API(Magick++ Magick++.h
1894 -- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
1895 -+ 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
1896 - )
1897 - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
1898 - elseif(component STREQUAL "MagickWand")
1899 - FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
1900 -- 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
1901 -+ 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
1902 - )
1903 - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
1904 - elseif(component STREQUAL "MagickCore")
1905 - FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
1906 -- 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
1907 -+ 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
1908 - )
1909 - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
1910 - else()
1911
1912 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
1913 deleted file mode 100644
1914 index 4a5474a..0000000
1915 --- a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
1916 +++ /dev/null
1917 @@ -1,77 +0,0 @@
1918 ---- Modules/FindBoost.cmake
1919 -+++ Modules/FindBoost.cmake
1920 -@@ -905,6 +905,15 @@
1921 -
1922 - set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
1923 - set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
1924 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
1925 -+ # Get version of Python.
1926 -+ if (NOT PYTHON_EXECUTABLE)
1927 -+ #if a certain version of python was detected by cmake before use that one
1928 -+ set(PYTHON_EXECUTABLE "python")
1929 -+ endif (NOT PYTHON_EXECUTABLE)
1930 -+ 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)
1931 -+ endif()
1932 -+
1933 -
1934 - #
1935 - # Find RELEASE libraries
1936 -@@ -915,6 +924,14 @@
1937 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
1938 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
1939 - ${Boost_LIB_PREFIX}boost_${COMPONENT} )
1940 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
1941 -+ list(APPEND _boost_RELEASE_NAMES
1942 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
1943 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
1944 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
1945 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
1946 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
1947 -+ endif()
1948 - if(_boost_STATIC_RUNTIME_WORKAROUND)
1949 - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
1950 - list(APPEND _boost_RELEASE_NAMES
1951 -@@ -922,6 +939,13 @@
1952 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
1953 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1954 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
1955 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
1956 -+ list(APPEND _boost_RELEASE_NAMES
1957 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1958 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
1959 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1960 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
1961 -+ endif()
1962 - endif()
1963 - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
1964 - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
1965 -@@ -951,6 +975,15 @@
1966 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
1967 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
1968 - ${Boost_LIB_PREFIX}boost_${COMPONENT} )
1969 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
1970 -+ list(APPEND _boost_DEBUG_NAMES
1971 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
1972 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
1973 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
1974 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
1975 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
1976 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
1977 -+ endif()
1978 - if(_boost_STATIC_RUNTIME_WORKAROUND)
1979 - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
1980 - list(APPEND _boost_DEBUG_NAMES
1981 -@@ -958,6 +991,13 @@
1982 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
1983 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1984 - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
1985 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
1986 -+ list(APPEND _boost_DEBUG_NAMES
1987 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1988 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
1989 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
1990 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
1991 -+ endif()
1992 - endif()
1993 - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
1994 - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
1995
1996 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
1997 deleted file mode 100644
1998 index 43a2a7f..0000000
1999 --- a/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch
2000 +++ /dev/null
2001 @@ -1,42 +0,0 @@
2002 ---- cmake-2.8.12.1-orig/Modules/FindCurses.cmake 2013-11-06 06:07:22.000000000 +1100
2003 -+++ cmake-2.8.12.1/Modules/FindCurses.cmake 2014-01-17 21:55:40.630142386 +1100
2004 -@@ -30,7 +30,7 @@
2005 - find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
2006 - set(CURSES_USE_NCURSES FALSE)
2007 -
2008 --if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY)
2009 -+if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
2010 - set(CURSES_USE_NCURSES TRUE)
2011 - endif()
2012 - # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
2013 -@@ -125,10 +125,20 @@
2014 - CACHE FILEPATH "The curses library" ${FORCE_IT})
2015 - endif()
2016 -
2017 -+ CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
2018 -+ cbreak "" CURSES_NCURSES_HAS_CBREAK)
2019 -+ if(NOT CURSES_NCURSES_HAS_CBREAK)
2020 -+ find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
2021 -+ find_library(CURSES_EXTRA_LIBRARY tinfo )
2022 -+ CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
2023 -+ cbreak "" CURSES_TINFO_HAS_CBREAK)
2024 -+ endif()
2025 - endif()
2026 -
2027 --find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
2028 --find_library(CURSES_EXTRA_LIBRARY cur_colr )
2029 -+if (NOT CURSES_TINFO_HAS_CBREAK)
2030 -+ find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
2031 -+ find_library(CURSES_EXTRA_LIBRARY cur_colr )
2032 -+endif()
2033 -
2034 - find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
2035 - find_library(CURSES_FORM_LIBRARY form )
2036 -@@ -172,5 +182,7 @@
2037 - CURSES_INCLUDE_DIR
2038 - CURSES_CURSES_HAS_WSYNCUP
2039 - CURSES_NCURSES_HAS_WSYNCUP
2040 -+ CURSES_NCURSES_HAS_CBREAK
2041 -+ CURSES_TINFO_HAS_CBREAK
2042 - )
2043 -
2044
2045 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
2046 deleted file mode 100644
2047 index 99e39a2..0000000
2048 --- a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch
2049 +++ /dev/null
2050 @@ -1,27 +0,0 @@
2051 -diff --git a/CompileFlags.cmake b/CompileFlags.cmake
2052 -index 20f5dec..24ac58d 100644
2053 ---- a/CompileFlags.cmake
2054 -+++ b/CompileFlags.cmake
2055 -@@ -66,5 +66,5 @@ endif ()
2056 - # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
2057 - # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
2058 - if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
2059 -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
2060 -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
2061 - endif ()
2062 -diff --git a/bootstrap b/bootstrap
2063 -index 9784d5d..51d067e 100755
2064 ---- a/bootstrap
2065 -+++ b/bootstrap
2066 -@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then
2067 - # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
2068 - # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
2069 - if ${cmake_machine_parisc}; then
2070 -- # if -O[s23] is given the effect is inverted, so do not use the flag then
2071 -- if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then
2072 -- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
2073 -- fi
2074 -+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*"
2075 - fi
2076 - fi
2077 -
2078
2079 diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
2080 deleted file mode 100644
2081 index 6808b80..0000000
2082 --- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
2083 +++ /dev/null
2084 @@ -1,44 +0,0 @@
2085 -diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake
2086 ---- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100
2087 -+++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100
2088 -@@ -1,3 +1,9 @@
2089 -+#
2090 -+# Version modified for Gentoo Linux
2091 -+# If a valid PkgConfig configuration is found, this overrides and cancels
2092 -+# all further checks.
2093 -+#
2094 -+
2095 - # - Find LAPACK library
2096 - # This module finds an installed fortran library that implements the LAPACK
2097 - # linear-algebra interface (see http://www.netlib.org/lapack/).
2098 -@@ -36,6 +42,24 @@
2099 - # (To distribute this file outside of CMake, substitute the full
2100 - # License text for the above reference.)
2101 -
2102 -+#
2103 -+# first, try PkgConfig
2104 -+#
2105 -+find_package(PkgConfig REQUIRED)
2106 -+pkg_check_modules(PC_LAPACK lapack)
2107 -+if(PC_LAPACK_FOUND)
2108 -+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
2109 -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
2110 -+ if (NOT ${PC_LIB}_LIBRARY)
2111 -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
2112 -+ endif (NOT ${PC_LIB}_LIBRARY)
2113 -+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
2114 -+ endforeach(PC_LIB)
2115 -+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
2116 -+ mark_as_advanced(LAPACK_LIBRARIES)
2117 -+else(PC_LAPACK_FOUND)
2118 -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
2119 -+
2120 - set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
2121 -
2122 - get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
2123 -@@ -305,3 +329,5 @@
2124 - endif(BLA_F95)
2125 -
2126 - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
2127 -+
2128 -+endif(PC_LAPACK_FOUND)
2129
2130 diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
2131 deleted file mode 100644
2132 index c5e17c5..0000000
2133 --- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
2134 +++ /dev/null
2135 @@ -1,18 +0,0 @@
2136 -diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
2137 -index c47f583..5783d37 100644
2138 ---- a/Modules/FindPkgConfig.cmake
2139 -+++ b/Modules/FindPkgConfig.cmake
2140 -@@ -87,7 +87,12 @@
2141 - set(PKG_CONFIG_VERSION 1)
2142 - set(PKG_CONFIG_FOUND 0)
2143 -
2144 --find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
2145 -+if(NOT PKG_CONFIG_EXECUTABLE)
2146 -+ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG})
2147 -+ if(NOT PKG_CONFIG_EXECUTABLE)
2148 -+ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
2149 -+ endif(NOT PKG_CONFIG_EXECUTABLE)
2150 -+endif(NOT PKG_CONFIG_EXECUTABLE)
2151 - mark_as_advanced(PKG_CONFIG_EXECUTABLE)
2152 -
2153 - if(PKG_CONFIG_EXECUTABLE)
2154
2155 diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
2156 deleted file mode 100644
2157 index 86c5dc7..0000000
2158 --- a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
2159 +++ /dev/null
2160 @@ -1,43 +0,0 @@
2161 ---- Modules/FindBLAS.cmake
2162 -+++ Modules/FindBLAS.cmake
2163 -@@ -4,6 +4,10 @@
2164 - #
2165 - # Find BLAS library
2166 - #
2167 -+# Version modified for Gentoo Linux.
2168 -+# If a valid PkgConfig configuration is found, this overrides and cancels
2169 -+# all further checks.
2170 -+#
2171 - # This module finds an installed fortran library that implements the
2172 - # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
2173 - # list of libraries searched for is taken from the autoconf macro file,
2174 -@@ -50,6 +54,23 @@
2175 - # (To distribute this file outside of CMake, substitute the full
2176 - # License text for the above reference.)
2177 -
2178 -+# first, try PkgConfig
2179 -+#
2180 -+find_package(PkgConfig REQUIRED)
2181 -+pkg_check_modules(PC_BLAS blas)
2182 -+if(PC_BLAS_FOUND)
2183 -+ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
2184 -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
2185 -+ if (NOT ${PC_LIB}_LIBRARY)
2186 -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
2187 -+ endif (NOT ${PC_LIB}_LIBRARY)
2188 -+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
2189 -+ endforeach(PC_LIB)
2190 -+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
2191 -+ mark_as_advanced(BLAS_LIBRARIES)
2192 -+else(PC_BLAS_FOUND)
2193 -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
2194 -+
2195 - include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
2196 - include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
2197 -
2198 -@@ -688,3 +709,5 @@
2199 - endif()
2200 -
2201 - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
2202 -+
2203 -+endif(PC_BLAS_FOUND)
2204
2205 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
2206 deleted file mode 100644
2207 index a6291d2..0000000
2208 --- a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
2209 +++ /dev/null
2210 @@ -1,93 +0,0 @@
2211 -From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001
2212 -From: Michael Palimaka <kensington@g.o>
2213 -Date: Thu, 19 Jun 2014 00:17:48 +1000
2214 -Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
2215 - wrt bug #400969.
2216 -
2217 ----
2218 - Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++
2219 - 1 file changed, 41 insertions(+)
2220 -
2221 -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
2222 -index dfd4460..70bfb4f 100644
2223 ---- a/Modules/FindBoost.cmake
2224 -+++ b/Modules/FindBoost.cmake
2225 -@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
2226 - set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
2227 - set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
2228 -
2229 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
2230 -+ # Get version of Python.
2231 -+ if (NOT PYTHON_EXECUTABLE)
2232 -+ #if a certain version of python was detected by cmake before use that one
2233 -+ set(PYTHON_EXECUTABLE "python")
2234 -+ endif (NOT PYTHON_EXECUTABLE)
2235 -+ 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)
2236 -+ endif()
2237 -+
2238 - # Compute component-specific hints.
2239 - set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
2240 - if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
2241 -@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
2242 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
2243 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
2244 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
2245 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
2246 -+ list(APPEND _boost_RELEASE_NAMES
2247 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
2248 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
2249 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
2250 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
2251 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
2252 -+ endif()
2253 -+
2254 - if(_boost_STATIC_RUNTIME_WORKAROUND)
2255 - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
2256 - list(APPEND _boost_RELEASE_NAMES
2257 -@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
2258 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
2259 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
2260 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
2261 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
2262 -+ list(APPEND _boost_RELEASE_NAMES
2263 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
2264 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
2265 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
2266 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
2267 -+ endif()
2268 - endif()
2269 - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
2270 - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
2271 -@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
2272 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
2273 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
2274 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
2275 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
2276 -+ list(APPEND _boost_DEBUG_NAMES
2277 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
2278 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
2279 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
2280 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
2281 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
2282 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
2283 -+ endif()
2284 - if(_boost_STATIC_RUNTIME_WORKAROUND)
2285 - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
2286 - list(APPEND _boost_DEBUG_NAMES
2287 -@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
2288 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
2289 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
2290 - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
2291 -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
2292 -+ list(APPEND _boost_DEBUG_NAMES
2293 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
2294 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
2295 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
2296 -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
2297 -+ endif()
2298 - endif()
2299 - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
2300 - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
2301 ---
2302 -1.8.5.5
2303 -
2304
2305 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
2306 deleted file mode 100644
2307 index 1cee3bc..0000000
2308 --- a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
2309 +++ /dev/null
2310 @@ -1,142 +0,0 @@
2311 -From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001
2312 -From: Michael Palimaka <kensington@g.o>
2313 -Date: Thu, 19 Jun 2014 00:08:13 +1000
2314 -Subject: [PATCH] Set some proper paths to make cmake find our tools.
2315 -
2316 -The ebuild now adds an extra / at the end of $EPREFIX so that it is
2317 -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
2318 -correct)
2319 -
2320 -Original patch by Heiko Przybyl.
2321 -Updated by Chris Reffett (cmake-2.8.8)
2322 -Updated by Johannes Huber (cmake-2.8.9)
2323 -Updated by Michael Palimaka (cmake-2.8.10)
2324 -Updated by Chris Reffett (cmake-2.8.11)
2325 -Updated by Michael Palimaka (cmake-3.0.0)
2326 ----
2327 - Modules/Platform/Darwin.cmake | 12 +++++++----
2328 - Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
2329 - 2 files changed, 29 insertions(+), 26 deletions(-)
2330 -
2331 -diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
2332 -index e25df1e..9b22a6a 100644
2333 ---- a/Modules/Platform/Darwin.cmake
2334 -+++ b/Modules/Platform/Darwin.cmake
2335 -@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
2336 - set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
2337 - set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
2338 -
2339 --# default to searching for frameworks first
2340 -+# default to searching for frameworks last
2341 - if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
2342 -- set(CMAKE_FIND_FRAMEWORK FIRST)
2343 -+ set(CMAKE_FIND_FRAMEWORK LAST)
2344 - endif()
2345 -
2346 - # Older OS X linkers do not report their framework search path
2347 -@@ -156,6 +156,8 @@ endif()
2348 -
2349 - # set up the default search directories for frameworks
2350 - set(CMAKE_SYSTEM_FRAMEWORK_PATH
2351 -+ @GENTOO_PORTAGE_EPREFIX@Frameworks
2352 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib
2353 - ~/Library/Frameworks
2354 - )
2355 - if(_CMAKE_OSX_SYSROOT_PATH)
2356 -@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
2357 - endif()
2358 - endif()
2359 -
2360 --# default to searching for application bundles first
2361 -+# default to searching for application bundles last
2362 - if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
2363 -- set(CMAKE_FIND_APPBUNDLE FIRST)
2364 -+ set(CMAKE_FIND_APPBUNDLE LAST)
2365 - endif()
2366 - # set up the default search directories for application bundles
2367 - set(_apps_paths)
2368 - foreach(_path
2369 -+ @GENTOO_PORTAGE_EPREFIX@Applications
2370 -+ @GENTOO_PORTAGE_EPREFIX@usr/bin
2371 - "~/Applications"
2372 - "/Applications"
2373 - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
2374 -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
2375 -index 20ee1d1..3481ca8 100644
2376 ---- a/Modules/Platform/UnixPaths.cmake
2377 -+++ b/Modules/Platform/UnixPaths.cmake
2378 -@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
2379 - # search types.
2380 - list(APPEND CMAKE_SYSTEM_PREFIX_PATH
2381 - # Standard
2382 -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
2383 - /usr/local /usr /
2384 -
2385 - # CMake install location
2386 -@@ -53,43 +54,41 @@ endif()
2387 -
2388 - # List common include file locations not under the common prefixes.
2389 - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
2390 -- # Windows API on Cygwin
2391 -- /usr/include/w32api
2392 --
2393 -- # X11
2394 -- /usr/X11R6/include /usr/include/X11
2395 --
2396 -- # Other
2397 -- /usr/pkg/include
2398 -- /opt/csw/include /opt/include
2399 -- /usr/openwin/include
2400 -+ @GENTOO_PORTAGE_EPREFIX@usr/include
2401 - )
2402 -
2403 - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
2404 -- # Windows API on Cygwin
2405 -- /usr/lib/w32api
2406 --
2407 -- # X11
2408 -- /usr/X11R6/lib /usr/lib/X11
2409 --
2410 -- # Other
2411 -- /usr/pkg/lib
2412 -- /opt/csw/lib /opt/lib
2413 -- /usr/openwin/lib
2414 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
2415 -+ @GENTOO_PORTAGE_GCCLIBDIR@
2416 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
2417 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
2418 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
2419 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib
2420 -+ @GENTOO_PORTAGE_EPREFIX@lib
2421 - )
2422 -
2423 - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
2424 -- /usr/pkg/bin
2425 -+ @GENTOO_PORTAGE_EPREFIX@usr/bin
2426 -+ @GENTOO_PORTAGE_EPREFIX@bin
2427 - )
2428 -
2429 - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
2430 -- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
2431 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
2432 -+ @GENTOO_PORTAGE_GCCLIBDIR@
2433 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
2434 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
2435 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
2436 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib
2437 -+ @GENTOO_PORTAGE_EPREFIX@lib
2438 -+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
2439 - )
2440 -
2441 - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
2442 -+ @GENTOO_PORTAGE_EPREFIX@usr/include
2443 - /usr/include
2444 - )
2445 - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
2446 -+ @GENTOO_PORTAGE_EPREFIX@usr/include
2447 - /usr/include
2448 - )
2449 -
2450 ---
2451 -1.8.5.5
2452 -
2453
2454 diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
2455 deleted file mode 100644
2456 index 57250e4..0000000
2457 --- a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
2458 +++ /dev/null
2459 @@ -1,43 +0,0 @@
2460 ---- Modules/FindLAPACK.cmake.orig 2014-09-15 23:50:11.377111987 +0200
2461 -+++ Modules/FindLAPACK.cmake 2014-09-15 23:52:54.734388375 +0200
2462 -@@ -4,6 +4,10 @@
2463 - #
2464 - # Find LAPACK library
2465 - #
2466 -+# Version modified for Gentoo Linux.
2467 -+# If a valid PkgConfig configuration is found, this overrides and cancels
2468 -+# all further checks.
2469 -+#
2470 - # This module finds an installed fortran library that implements the
2471 - # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
2472 - #
2473 -@@ -140,6 +144,23 @@
2474 -
2475 - endmacro()
2476 -
2477 -+#
2478 -+# first, try PkgConfig
2479 -+#
2480 -+find_package(PkgConfig REQUIRED)
2481 -+pkg_check_modules(PC_LAPACK lapack)
2482 -+if(PC_LAPACK_FOUND)
2483 -+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
2484 -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
2485 -+ if (NOT ${PC_LIB}_LIBRARY)
2486 -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
2487 -+ endif (NOT ${PC_LIB}_LIBRARY)
2488 -+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
2489 -+ endforeach(PC_LIB)
2490 -+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
2491 -+ mark_as_advanced(LAPACK_LIBRARIES)
2492 -+else(PC_LAPACK_FOUND)
2493 -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
2494 -
2495 - set(LAPACK_LINKER_FLAGS)
2496 - set(LAPACK_LIBRARIES)
2497 -@@ -348,3 +369,5 @@
2498 - endif()
2499 -
2500 - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
2501 -+
2502 -+endif(PC_LAPACK_FOUND)
2503
2504 diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
2505 deleted file mode 100644
2506 index 78f622d..0000000
2507 --- a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
2508 +++ /dev/null
2509 @@ -1,29 +0,0 @@
2510 ---- Modules/FindPythonInterp.cmake.orig 2015-01-06 11:50:03.376357898 +0100
2511 -+++ Modules/FindPythonInterp.cmake 2015-01-06 12:25:48.614989290 +0100
2512 -@@ -75,6 +75,11 @@
2513 - else()
2514 - set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
2515 - endif()
2516 -+
2517 -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
2518 -+ set(_Python_NAMES python)
2519 -+endif()
2520 -+
2521 - find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
2522 -
2523 - # Set up the versions we know about, in the order we will search. Always add
2524 -@@ -99,12 +104,13 @@
2525 - unset(_PYTHON3_VERSIONS)
2526 -
2527 - # Search for newest python version if python executable isn't found
2528 --if(NOT PYTHON_EXECUTABLE)
2529 -+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
2530 - foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
2531 - set(_Python_NAMES python${_CURRENT_VERSION})
2532 - if(WIN32)
2533 - list(APPEND _Python_NAMES python)
2534 - endif()
2535 -+
2536 - find_program(PYTHON_EXECUTABLE
2537 - NAMES ${_Python_NAMES}
2538 - PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]
2539
2540 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
2541 deleted file mode 100644
2542 index 119001a..0000000
2543 --- a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
2544 +++ /dev/null
2545 @@ -1,48 +0,0 @@
2546 -Do not detect Xcode and set -isysroot for its SDK, since that messes up
2547 -our toolchain, and hence makes any compilation fail, bug #445308
2548 -
2549 ---- Modules/Platform/Darwin-Initialize.cmake
2550 -+++ Modules/Platform/Darwin-Initialize.cmake
2551 -@@ -1,16 +1,16 @@
2552 - # Ask xcode-select where to find /Developer or fall back to ancient location.
2553 --execute_process(COMMAND xcode-select -print-path
2554 -- OUTPUT_VARIABLE _stdout
2555 -- OUTPUT_STRIP_TRAILING_WHITESPACE
2556 -- ERROR_VARIABLE _stderr
2557 -- RESULT_VARIABLE _failed)
2558 --if(NOT _failed AND IS_DIRECTORY ${_stdout})
2559 -- set(OSX_DEVELOPER_ROOT ${_stdout})
2560 --elseif(IS_DIRECTORY "/Developer")
2561 -- set(OSX_DEVELOPER_ROOT "/Developer")
2562 --else()
2563 -+#execute_process(COMMAND xcode-select -print-path
2564 -+# OUTPUT_VARIABLE _stdout
2565 -+# OUTPUT_STRIP_TRAILING_WHITESPACE
2566 -+# ERROR_VARIABLE _stderr
2567 -+# RESULT_VARIABLE _failed)
2568 -+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
2569 -+# set(OSX_DEVELOPER_ROOT ${_stdout})
2570 -+#elseif(IS_DIRECTORY "/Developer")
2571 -+# set(OSX_DEVELOPER_ROOT "/Developer")
2572 -+#else()
2573 - set(OSX_DEVELOPER_ROOT "")
2574 --endif()
2575 -+#endif()
2576 -
2577 - execute_process(COMMAND sw_vers -productVersion
2578 - OUTPUT_VARIABLE CURRENT_OSX_VERSION
2579 -@@ -91,10 +91,10 @@
2580 - # CMAKE_OSX_DEPLOYMENT_TARGET
2581 -
2582 - # Set cache variable - end user may change this during ccmake or cmake-gui configure.
2583 --if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
2584 -- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
2585 -- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
2586 --endif()
2587 -+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
2588 -+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
2589 -+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
2590 -+#endif()
2591 -
2592 - #----------------------------------------------------------------------------
2593 - # CMAKE_OSX_SYSROOT
2594
2595 diff --git a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch
2596 deleted file mode 100644
2597 index 604cb22..0000000
2598 --- a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch
2599 +++ /dev/null
2600 @@ -1,45 +0,0 @@
2601 -Ensure that the correct version of Qt is always used.
2602 -
2603 -With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
2604 -/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
2605 -
2606 -There is no guarantee to which version of Qt these symlinks might point, so it
2607 -is necessary to find the correct version explicitly.
2608 -
2609 -Once qmake is found, it is queried for the correct location of all other items.
2610 -
2611 -Gentoo-bug: 547222
2612 -
2613 ---- Modules/FindQt4.cmake
2614 -+++ Modules/FindQt4.cmake
2615 -@@ -482,13 +482,23 @@
2616 -
2617 - get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
2618 -
2619 -- find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
2620 -- PATHS
2621 -- ENV QTDIR
2622 -- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
2623 -- PATH_SUFFIXES bin
2624 -- DOC "The qmake executable for the Qt installation to use"
2625 -- )
2626 -+ if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
2627 -+ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
2628 -+ PATHS
2629 -+ @GENTOO_PORTAGE_EPREFIX@/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
2630 -+ @GENTOO_PORTAGE_EPREFIX@/usr/bin
2631 -+ NO_DEFAULT_PATH
2632 -+ DOC "The qmake executable for the Qt installation to use"
2633 -+ )
2634 -+ else()
2635 -+ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
2636 -+ PATHS
2637 -+ ENV QTDIR
2638 -+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
2639 -+ PATH_SUFFIXES bin
2640 -+ DOC "The qmake executable for the Qt installation to use"
2641 -+ )
2642 -+ endif()
2643 -
2644 - set(major 0)
2645 - if (QT_QMAKE_EXECUTABLE)
2646
2647 diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
2648 deleted file mode 100644
2649 index 2808ed7..0000000
2650 --- a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
2651 +++ /dev/null
2652 @@ -1,25 +0,0 @@
2653 -Don't use .so for modules on darwin/macos. Use .bundle instead.
2654 -Patch by Heiko Przybyl
2655 -
2656 -Forward-ported from 2.8.10 to 3.4.0-rc1
2657 -
2658 ---- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
2659 -+++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
2660 -@@ -26,7 +26,7 @@
2661 - set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
2662 - set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
2663 - set(CMAKE_SHARED_MODULE_PREFIX "lib")
2664 --set(CMAKE_SHARED_MODULE_SUFFIX ".so")
2665 -+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
2666 - set(CMAKE_MODULE_EXISTS 1)
2667 - set(CMAKE_DL_LIBS "")
2668 -
2669 -@@ -53,7 +53,7 @@
2670 - set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
2671 - set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
2672 - set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
2673 --set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
2674 -+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
2675 -
2676 - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
2677 - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
2678
2679 diff --git a/dev-util/cmake/files/cmake-3.4.3-utimensat-test.patch b/dev-util/cmake/files/cmake-3.4.3-utimensat-test.patch
2680 deleted file mode 100644
2681 index 42a06a5..0000000
2682 --- a/dev-util/cmake/files/cmake-3.4.3-utimensat-test.patch
2683 +++ /dev/null
2684 @@ -1,33 +0,0 @@
2685 -Before linux-2.6.22, utimensat does not exist in the kernel.
2686 ->=glibc-2.6 exposes it, but would always fail if the kernel
2687 -does not has an implementation.
2688 -
2689 -Just compiling utimensat does not mean it is usable. Thus
2690 -runtime test is necessary.
2691 -
2692 -Index: cmake-3.4.3/Source/kwsys/CMakeLists.txt
2693 -===================================================================
2694 ---- cmake-3.4.3.orig/Source/kwsys/CMakeLists.txt
2695 -+++ cmake-3.4.3/Source/kwsys/CMakeLists.txt
2696 -@@ -509,7 +509,7 @@ IF(KWSYS_USE_SystemTools)
2697 - "Checking whether CXX compiler has environ in stdlib.h" DIRECT)
2698 - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_UTIMES
2699 - "Checking whether CXX compiler has utimes" DIRECT)
2700 -- KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_UTIMENSAT
2701 -+ KWSYS_PLATFORM_CXX_TEST_RUN(KWSYS_CXX_HAS_UTIMENSAT
2702 - "Checking whether CXX compiler has utimensat" DIRECT)
2703 - SET_PROPERTY(SOURCE SystemTools.cxx APPEND PROPERTY COMPILE_DEFINITIONS
2704 - KWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV}
2705 -Index: cmake-3.4.3/Source/kwsys/kwsysPlatformTestsCXX.cxx
2706 -===================================================================
2707 ---- cmake-3.4.3.orig/Source/kwsys/kwsysPlatformTestsCXX.cxx
2708 -+++ cmake-3.4.3/Source/kwsys/kwsysPlatformTestsCXX.cxx
2709 -@@ -272,7 +272,7 @@ int main()
2710 - int main()
2711 - {
2712 - struct timespec times[2] = {{0,UTIME_OMIT},{0,UTIME_NOW}};
2713 -- return utimensat(AT_FDCWD, "/example", times, AT_SYMLINK_NOFOLLOW);
2714 -+ return utimensat(AT_FDCWD, ".", times, AT_SYMLINK_NOFOLLOW);
2715 - }
2716 - #endif
2717 -
2718
2719 diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
2720 deleted file mode 100644
2721 index 5cecd7d..0000000
2722 --- a/dev-util/cmake/files/cmake.vim
2723 +++ /dev/null
2724 @@ -1,3 +0,0 @@
2725 -autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim
2726 -autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake
2727 -autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake
2728
2729 diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
2730 deleted file mode 100644
2731 index 437189f..0000000
2732 --- a/dev-util/cmake/metadata.xml
2733 +++ /dev/null
2734 @@ -1,11 +0,0 @@
2735 -<?xml version="1.0" encoding="UTF-8"?>
2736 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2737 -<pkgmetadata>
2738 - <maintainer type="project">
2739 - <email>kde@g.o</email>
2740 - <name>Gentoo KDE Project</name>
2741 - </maintainer>
2742 - <use>
2743 - <flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
2744 - </use>
2745 -</pkgmetadata>