diff options
| -rw-r--r-- | dev-util/cmake/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/cmake/Manifest | 23 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.6-r4.ebuild | 181 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch | 12 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch | 34 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch | 35 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch | 34 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.6-testsvn17.patch | 30 |
8 files changed, 17 insertions, 340 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 6c473f7475ce..56178b814e84 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.207 2012/07/08 18:16:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.208 2012/07/08 23:35:54 johu Exp $ + + 08 Jul 2012; Johannes Huber <johu@gentoo.org> -cmake-2.8.6-r4.ebuild, + -files/cmake-2.8.3-ruby_libname.patch, -files/cmake-2.8.6-CodeBlocks.patch, + -files/cmake-2.8.6-FindBLAS-2.patch, -files/cmake-2.8.6-FindLAPACK-2.patch, + -files/cmake-2.8.6-testsvn17.patch: + Remove old. 08 Jul 2012; Raúl Porcel <armin76@gentoo.org> cmake-2.8.7-r5.ebuild: alpha/ia64/s390/sh/sparc stable wrt #4143807 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index b2c3b94f1c6f..df7859a92ddc 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX 50cmake-gentoo.el 244 SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb WHIRLPOOL aa60ffe7e5edd00fdbb32ce2c9aee24fddd6e4d064b8bde55c7ff3b42196c3420596653aade9cc447a3293050c5ab23a27a556f26806e4d67139d264a38d1aaa AUX cmake-2.6.3-darwin-bundle.patch 952 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca SHA512 c355e4f7e578d9837bc172ce22104103f9783390b97cec7bdd2e167880d2c70bc115a1c1146a125e1c501c42c9045d0997ce966edd69fbd791841365fe92c9e0 WHIRLPOOL ecd7cf46c1f07b8bccc8948904710895dd581764f12af5cf0ca0770e9c3b89a30019f59429dc628a42e320e67039ab985e982a3ad6932c7d42c2877af1c9aa7b @@ -8,13 +8,8 @@ AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 SHA256 908ea65a9db5ca85b2061ad6 AUX cmake-2.8.0-darwin-default-install_name.patch 911 SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d SHA512 53308a020f2fba9e398a3adfc87af57a270cd2aad2aa982ea41a80fc4af9b64f4bfce4499ef7c64794fe1a11b60f28ab4dd95600378523c9397c5d8ab9f94611 WHIRLPOOL b9db2843408df967e6bb07cb34ea56a90982d5e640e59a10ae39436ca9312c32f7b4b4ce058ff8ec06bddd1400957930574191a793af7f930def5ba17f457453 AUX cmake-2.8.1-libform.patch 1818 SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5 SHA512 10ca910bc86c19beb00dc532c076bd0645b9e54a7472e24438f46a6eedce00855017cbe360b5552df05fec9ca5233cd1c2ca13d6f2e103791e9be2a5e23c1c68 WHIRLPOOL 7ea84d6b61a847d70e60380c7a7842e7e0c7d9e55d19c28557ad63e332f48adf0db58b946d00eeaf0842e51d52a2a90a30aca11bf45e6a21ea01b7f8e0fe3557 AUX cmake-2.8.3-more-no_host_paths.patch 3052 SHA256 55165d67bad9def6b349bf67d02ede28a2fc291d28a2a5296897e25980ce623c SHA512 99eb1b0df254d290843e8f2ebd22a97b7e64784c33e82c5cdac28dbc97ebc6e2c66c39a5afe017af2877702cb5c390951a74a28aba26a6743fe38d466e9a91ed WHIRLPOOL b9409153464b9e954e8f0ec3061199ac4427145096155eae707774caf2908146c73401251d36a37121d3b7e9a9ebc46e7186581f656b3f4a364e9e5a38e5f35b -AUX cmake-2.8.3-ruby_libname.patch 558 SHA256 8205e354d78827b2a4cf67fb9d88fee39696398db07d1fa4f8d33c2bbeda3748 SHA512 1bcaedc91b9aeaa0998375582560615f7264bd7b12b1c009b424916ee4832c134b42eb31f29fd20b4de18f1f754d0e1813b2ee73bd3f74272734e0356200aae1 WHIRLPOOL a34883598724c467acd802d7dea0cb6ef78d90c62a7cf99b698c607469d579b992c12c788a7a5be2c9df3f6e1e3b4c2f00d0a57bc4fed2c6d9d927f43583f5c2 AUX cmake-2.8.4-FindBoost.patch 635 SHA256 3c4d42b772b85e6838eaaecdb71ea345630fe519102d7c2f2234bcf8b9c63154 SHA512 4745469570c4a3d2bc969c743b5617e878058d2e0a4de2edf8d3e1c820e115a88d028256fca7e123d477c0c90b7e6a172ef398a3ba874a1376611d9dc5103580 WHIRLPOOL ddbcc8118dacc85e73422e34d247d16ab9809634f00d7271545b726a8cd9e2b2abc149c5e507f313b93865f0c5275752dc6e6e9053547e7a43570acb751b53ce AUX cmake-2.8.4-FindPythonLibs.patch 642 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3 SHA512 5baa7080e920cf835fcb9defa1298ebb7fde87eb322d6eacde79ae344870a97a4f7d58d307da77c1f4d2beffc1c76058aaa7189b3f4fdd79c6270f6d3f387065 WHIRLPOOL a289a2e82976d7aa3ef2f86aeb394c46df391780d751d2f463ef816a9cf0b7c723cdab32d120ffd90be38daeb4b4baef00cb8597c3e9f9c98a36e6d57ae6b5be -AUX cmake-2.8.6-CodeBlocks.patch 1171 SHA256 b274e3d9c82f5f7ffb21c44234a3b42bb671b9b8ad3314b09baa329c18447458 SHA512 966a887cb9962a9ca604fdf0186fc75ffc17cc60376bcd9d8549333e29de3a544e6b82bab173fb40a051b7361c5d0969010c097e0089a7d2dc3c5d7611bbe5e8 WHIRLPOOL 740863293986acd1801736236fe08551f1d1db98c091acd4e947fbf329c4d174dc01e56487e8c0676800b3b9f33e3bfdc2d627e9a9c835cacdf62fe4616375b2 -AUX cmake-2.8.6-FindBLAS-2.patch 1119 SHA256 295999abe12fd8103bfccc22606ff2c730831f495c44d52d80dfe8952815874f SHA512 2df7eacb5c3b8d1eaaf0e1df720c8509275202acf04eb6943e9c7f316cc6649ca81c63da5d99d4bca2e8791ea13621a9ccc821fcb183cc5feefeea2602543e6a WHIRLPOOL 4a5ee2ca6c7225d9fddf3a3ac04e7b52315b27ff8de95c3d22961afc7b2b2001bee41b670b7e338d3d0c46841b079f688720c8a00eefaade3be94b6c4a735ca7 -AUX cmake-2.8.6-FindLAPACK-2.patch 1158 SHA256 2caacc85c393d9ad09f2c92d0595480d1e02b8db6285aa35f270858075465425 SHA512 a0f6c86e512bbb306f44d231b6545e54fc99c77213bb921684e940527626eb7f2af25901e79299015b29b9f8b7e53a4be30c1925bfd4bc327f360b69adea3fa8 WHIRLPOOL 092d32b6cdafe82d567822abae2b9292dc21b4ca39697dcaddf247256d11e1b95221bba3433d3ea744430ca6fdeb0e33306e1d76c4f90db257829c7ac2a974f3 -AUX cmake-2.8.6-testsvn17.patch 1033 SHA256 6d90df7a5472eeb8be81a70ee4a5f5850bb9d469ef9390af930ba7d6d528183b SHA512 87dd20fd06f0729db6466049b00947cf0558af4bbea1b1c45926d147b7d1d4136fd10f17e5f90a85e98806125d12df2c5cfb4ebaaceff925ac4752f0906c3723 WHIRLPOOL acc04882a8a5ff5e557cf06245649d1cdaf4e60ffcf92ddffdd164b467340d4cf66d9bf5c26d5edcd82382c4831534ddb7bf7916e3490d2445bf80586a205158 AUX cmake-2.8.7-FindBLAS.patch 1641 SHA256 be0d7ce6b59171c9e32ce7fe2ab4ae4a351640a7fa07920ae9230047eb0495ac SHA512 91a38e22d183ca4b501b305e6ba5068397b09b02bd39e7bdf27bf4a7771f432acaf099d0840260ce815f4d254d704036d022aaeec5b8c27dea1e4ca78112731b WHIRLPOOL e9734f0671918be36c5c1ec78f5185b21b17ef3a216b2c988d0951652db8c705e587df80f3e2c544c6e5a5080d5fc403a6554724c82055e3448f661df147205a AUX cmake-2.8.7-FindBoost-python.patch 5334 SHA256 1f7ab1facbb332cf6a2d6f770ea77eff00cd7137990d3254ee6c1a9ecd22ed68 SHA512 81d6ef46f006a42d1234f7a2aec3e18052ff5f5cca3019b42a5b3be77978babf75265db61eb32b4b28156a320506fbb6f7dc1038c9b01d13ed92cb7d0a25da4e WHIRLPOOL 3f6a52259e85d07e3209b6639fc1ccceda67f80a99f94ebe8a069a67d706e1e6cf16e30c8da0be6eff67793b30c49e006ea9b8d3f7a8cad562f90db5f7eebcdc AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1ec32d409d91de9558f7e8f567323e SHA512 c5dab9c697df3593b8fb5222e619ccc1b1cc82beae0cd685ecabb1a0e31193cf663e95dc4d556e338c9f45e451fcb0fbc1a5f0bc39a65c67e6d9d9193f049990 WHIRLPOOL bc42012b830f998c5b8b892b84314fbc5ec6fdbdae627c2364d112a3e48c5350df9334b17e8b91bb4bd6377f10cc927fd3c3c8008370343fc19d43eef1fda005 @@ -24,18 +19,20 @@ AUX cmake-2.8.8-more-no_host_paths.patch 3253 SHA256 8cd923e2b9e9f588e5eb00ea7de AUX cmake-2.8.8-pkgconfig.patch 2773 SHA256 6e9fd1a691b74facf59dbce344d1dd92fc95da0e8acfc77feb8bf5bab06f50bd SHA512 a17aa40104651841741fd7ea560b96c083096edfee30b21a242efd18f7fb994010f5875bbf3b444627418dd17e5045d55febe1bbcedc721ec4ffe61e8dd5335b WHIRLPOOL 1472d76e96d4a1755f5f13ac053af3f5f9b78465ef7ab753d366ab3b8e13d6cece137e0da88a9252bb16af56dcccd5c4bd4cc3e6a2563972f27ae14e63233867 AUX cmake-2.8.8-tests.patch 2492 SHA256 07800482bcbf336eafc9132037a26dc16bffc3d31cda8732604c847ea1c1c860 SHA512 675dae75ca54a264f285c7d678669a75f02438de13c6abed52bcd8223e968a8d0474660f0a7e2432d2b90caaf85cdee0489db90366226bcf7b09067b58088611 WHIRLPOOL dd5ce7c898a5cf5776277be2f9d7ee6b51adbe7bcc6dfa0b02df9230f7dab2bbc4bd4dd8ce1fe740b6570714cc93bdfcd759cab40dadb389e8010e3971df6b98 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc -DIST cmake-2.8.6.tar.gz 5583905 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e SHA512 68e097a95dc4184248ddc4e3f5f3513c2082c576a89ab8bcd45edc0abde5c256f2b0215535787662f49d006de39b46e2251ab989914e4b18176730e10ff9be3e WHIRLPOOL 87dd2500ef2c8fd1f510b918892fccfd024653d1c8b113b5765ae4d2312b98445d94ae5215501c312a54548a1f658902cd8d1beeda91ae123d426a06565f9ebe DIST cmake-2.8.7.tar.gz 5667409 SHA256 130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f SHA512 2b48bd922a2fcd7569e610c823cbaa061178b112e045de2c97da5fd9591224ebb211e2e8688af0eb140d9762e87fa5e41d1324a80c57a933870a801914ba6431 WHIRLPOOL 2da491bf1c44eff57ca71c038e054a781d3cfdd7bd42219b26f18524e994019812c95c07c881734db57e8ce31f5af5d1df238e2f0c4676b559f9caa89db2f169 DIST cmake-2.8.8.tar.gz 5691656 SHA256 2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46 SHA512 db31b1335c9964504a080a665c9e23010e081e973ba948b2d55a5adff76183271677c94830f2b604b06337df110eec29a8e8749795576c662c0b2f50fe69c882 WHIRLPOOL 2d0f388de643801cf2f389e9a84d218f09be28226e9b2e11d4a1f60222e3dfdd861b603f919b4b321c926612035944a4903ba4efd1d5397ae56068bfef40e6bd -EBUILD cmake-2.8.6-r4.ebuild 4947 SHA256 8920d240da6e40fd446aef6af707b9b2736d2ecfa118de302275357171f80aaf SHA512 329d594f371d2fb9deda8b6d2dc4e1afb06eb1b2d606a09bb47d0c9b42e2126100586f63a92ec13a9da440bf58d7b7d752ab03090bca601cb7366612d48aa551 WHIRLPOOL e2cd16043ace5f50e6c6d342e7f5ca6c7d11eb12e3685105e3b8835cb2a292ac3a2e00976a1c6218fd8e1c719828b5b1798b1bd774d9fc840091ffc4556f3688 EBUILD cmake-2.8.7-r5.ebuild 4913 SHA256 c4aa09162bf1ae121c66d2241c3c41ec721cceeb6b62585f9e4e45df07cfc8fc SHA512 65aff1283c36b40459c64c6f29be0b06de15b3b7b77cb5e2089c0c117b57c6be0310acc936b0bb5b25f2e1d93ab19775f362e8ea9980e88a8736ea021fb4ebd5 WHIRLPOOL 7cbbfa08604cff15d23906dd53ee81412cc39998ca95ab7b288e74ccafdfaaf199644f3d7491407f90d5db2319385c48ba1e9c0c5585a00d81906d221a980864 EBUILD cmake-2.8.8-r3.ebuild 4933 SHA256 d83360b71b01519b0b1b40074cbe2159e242ae438c6d37dac994f6ccad7eddb8 SHA512 5cdb8ebe79c73a65197ea2a2a38e3c8a91354363c34b9db52dec555ce96b626ebeaac74c6c3f2066cb7e1c7756e9bdf8de5c9ba87e56b9680068ffb9b205670e WHIRLPOOL 391c5cb84a5904cfaab43282efb24306d205766801deb6f6fe504d7901364cfba8621d147ead7bb7a198195b8fd1a88cdc6feb9add5e606203b792d0aa215f92 -MISC ChangeLog 33505 SHA256 33cd424416d908eaf59bc8014cc39aa60d2582a9f198d0c215da6b43179bdc5d SHA512 a77a59e8c50b50c8c20cf905f54420e3d7a097a12165cfc493980fb0c722a9fa2470592cdfa7f293daae9242b25a4713ba418abcee642aad201de17517e75e04 WHIRLPOOL e49a6e9388af2068f9cc8de2f18482f1b3cfa375aa83c52533c1b8a9fe6e6ca335555f3e127cedce9ce2df590b37d0515e8f8e03bdc1ec21cdf23c204ea304bc +MISC ChangeLog 33783 SHA256 d5edaf0f55e9533eade8ffe306f00f505b2c44993269427cf69ece7774e07fe9 SHA512 9c1ffa7ac529c70496a45b6282b49638cf0971320d948e44e4e7ce4bc2354599795c8581af481366a8b137c4665a36cbba7b247b3631e7bdc96c995359e391df WHIRLPOOL 153cadaa42c0c6eae17d542976639aa0890e129b782df70a1e3235568ac9a2a07640c45b6ca77dbda5e23600f2465ae12f8a4b1776956baee3370ceab8fe7b37 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk/5znYACgkQuQc30/atMkBulACfULrD8twPNqRGTIR3oyuQqGN/ -YXEAnAlKNlpECgumeuxfhLwfTK4tXx3O -=unfL +iQEcBAEBCgAGBQJP+hlZAAoJEO+t9ga+3I3ar78H/1JCfp/6X70eJURqVw42nr+0 +5zx7xMF9FKjW6dkRYo036D4Il8cbAlQQnHBpUW0Th114+JKklJWr/cVaUEcpKPT9 +IKsH2bM+MSG2cuxcN3FQgl+vCryDndaf4UBXGDThqGbiB4Ip59+e+VyDW9dEQ6lz +oDiP+EhHOZ6dIYVskPZFcuIpigOIGUz/VO9ZxZdWkSLXUJo7ODnBxu5YxszsRZPQ +BuTu8FuQ7Q1pd14Uqj5VYAPgS/bEN89WGNJCkhPISiKYxoaUEXWypIwjug5mGlro +TbUrEWr8KXCDo2XnCSfBL2KfeKmJRVwXi4FEqtDJb5QwQK509VRRhfJPWZIEY0c= +=iv0D -----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.8.6-r4.ebuild b/dev-util/cmake/cmake-2.8.6-r4.ebuild deleted file mode 100644 index 62df8f133ec3..000000000000 --- a/dev-util/cmake/cmake-2.8.6-r4.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.10 2012/07/03 13:41:21 kensington Exp $ - -EAPI=4 - -CMAKE_REMOVE_MODULES="no" -inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx - -MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="emacs ncurses qt4 vim-syntax" - -DEPEND=" - >=app-arch/libarchive-2.8.0 - >=net-misc/curl-7.20.0-r1[ssl] - >=dev-libs/expat-2.0.1 - virtual/pkgconfig - sys-libs/zlib - ncurses? ( sys-libs/ncurses ) - qt4? ( x11-libs/qt-gui:4 ) -" -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" - -# bug 390533 -RESTRICT="test" - -SITEFILE="50${PN}-gentoo.el" -VIMFILE="${PN}.vim" - -S="${WORKDIR}/${MY_P}" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -# Fixme: -# Boost patchset is foobared and should respect eselect / slotting -PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch - "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch - "${FILESDIR}"/${PN}-2.8.1-libform.patch - "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch - "${FILESDIR}"/${PN}-2.8.4-FindBoost.patch - "${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch - "${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch - "${FILESDIR}"/${PN}-2.8.6-CodeBlocks.patch - "${FILESDIR}"/${PN}-2.8.6-testsvn17.patch -) -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - tc-export CC CXX LD - - ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir test - # this is altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die - - pushd "${CMAKE_BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test - # as it was never intended to be used this way. - "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E BootstrapTest SimpleCOnly_sdcc \ - || die "Tests failed" - - popd > /dev/null -} - -pkg_setup() { - einfo "Fixing java access violations ..." - # bug 387227 - addpredict /proc/self/coredump_filter -} - -src_prepare() { - base_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - # make things work with gentoo java setup - # in case java-config cannot be run, the variable just becomes unset - # per bug #315229 - export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - $(cmake-utils_use_build ncurses CursesDialog) - $(cmake-utils_use_build qt4 QtDialog) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Docs/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - if use emacs; then - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins Docs/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Docs/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${VIMFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch deleted file mode 100644 index 45d2b162c5b7..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake ---- cmake-2.8.3.orig//Modules/FindRuby.cmake 2010-12-25 16:56:42.597163498 +0100 -+++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0100 -@@ -180,7 +180,7 @@ - - - # Determine the list of possible names for the ruby library --SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT}) -+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT}) - - IF(WIN32) - SET( _RUBY_MSVC_RUNTIME "" ) diff --git a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch deleted file mode 100644 index 8a8fe6f392a8..000000000000 --- a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001 -From: Clinton Stimpson <clinton@elemtech.com> -Date: Wed, 5 Oct 2011 10:02:32 -0600 -Subject: [PATCH] Fix XML safety issue with adding preprocessor defines in CodeBlocks project. - ---- - Source/cmExtraCodeBlocksGenerator.cxx | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx -index 7db91c7..9a0b1ea 100644 ---- a/Source/cmExtraCodeBlocksGenerator.cxx -+++ b/Source/cmExtraCodeBlocksGenerator.cxx -@@ -19,6 +19,7 @@ - #include "cmGeneratedFileStream.h" - #include "cmTarget.h" - #include "cmSystemTools.h" -+#include "cmXMLSafe.h" - - #include <cmsys/SystemTools.hxx> - -@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, - for(std::vector<std::string>::const_iterator di = defs.begin(); - di != defs.end(); ++di) - { -- fout <<" <Add option=\"-D" << di->c_str() << "\" />\n"; -+ cmXMLSafe safedef(di->c_str()); -+ fout <<" <Add option=\"-D" << safedef.str() << "\" />\n"; - } - } - --- -1.7.0 - diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch deleted file mode 100644 index 16b6480f577b..000000000000 --- a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake ---- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-04 18:09:24.000000000 +0200 -+++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-11-22 23:04:17.000000000 +0100 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration for blas is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find BLAS library - # This module finds an installed fortran library that implements the BLAS - # linear-algebra interface (see http://www.netlib.org/blas/). -@@ -39,6 +45,14 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(BLAS blas) -+if(NOT BLAS_FOUND) -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") -+ - include(CheckFunctionExists) - include(CheckFortranFunctionExists) - -@@ -622,3 +636,6 @@ - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(NOT BLAS_FOUND) -+ diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch deleted file mode 100644 index 579a07d880a1..000000000000 --- a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800 -+++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find LAPACK library - # This module finds an installed fortran library that implements the LAPACK - # linear-algebra interface (see http://www.netlib.org/lapack/). -@@ -36,6 +42,14 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(LAPACK lapack) -+if(NOT LAPACK_FOUND) -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") -+ - set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - - get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) -@@ -304,4 +318,6 @@ - endif(NOT LAPACK_FIND_QUIETLY) - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(NOT LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch deleted file mode 100644 index 77467676c841..000000000000 --- a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in -index 97b2a07..edafb4ef 100644 ---- a/Tests/CTestUpdateSVN.cmake.in -+++ b/Tests/CTestUpdateSVN.cmake.in -@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config) - set(SVNCMD ${SVN} --config-dir ${TOP}/config) - set(SVNUSER --username "test author" --non-interactive) - -+# Configure for this svn version. -+execute_process( -+ COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add -+ ) -+if("${help_add}" MATCHES "--depth") -+ set(depth_empty "--depth=empty") -+else() -+ set(depth_empty "") -+endif() -+ - #----------------------------------------------------------------------------- - # Initialize the testing directory. - message("Creating test directory...") -@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added) - if(dirs_added) - run_child( - WORKING_DIRECTORY ${TOP}/user-source -- COMMAND ${SVNCMD} add ${dirs_added} -+ COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added} - ) - endif(dirs_added) - run_child( |