diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog new file mode 100644 --- /dev/null +++ b/dev-util/cmake/ChangeLog @@ -0,0 +1,624 @@ +# ChangeLog for dev-util/cmake +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.144 2010/09/11 15:13:49 armin76 Exp $ + + 11 Sep 2010; Raúl Porcel cmake-2.8.1-r2.ebuild: + ia64/s390/sh/sparc stable wrt #325845 + + 10 Sep 2010; Tobias Klausmann cmake-2.8.1-r2.ebuild: + Stable on alpha, bug #325845 + + 11 Aug 2010; Markus Meier cmake-2.8.1-r2.ebuild: + arm stable, bug #325845 + + 10 Aug 2010; Tomáš Chvátal + -files/cmake-2.8.0-more-no_host_paths.patch, -cmake-2.8.1.ebuild, + -cmake-2.8.1-r1.ebuild: + Drop older stuff. + + 06 Aug 2010; Christian Faulhammer + cmake-2.8.1-r2.ebuild: + stable x86, bug 325845 + + 06 Aug 2010; Samuli Suominen cmake-2.8.1-r2.ebuild: + Run bootstrap with FEATURES="test" wrt #315223 by Thomas Kahle. + + 27 Jul 2010; Jeroen Roovers cmake-2.8.1-r2.ebuild: + Stable for HPPA PPC (bug #325845). + + 07 Jul 2010; Maciej Mrozowski cmake-2.8.1-r2.ebuild: + export JAVA_HOME gathered from java-config, bug 315229 + + 06 Jul 2010; Markos Chandras cmake-2.8.1-r2.ebuild: + Stable on amd64 wrt bug #325845 + + 04 Jul 2010; Samuli Suominen cmake-2.8.1-r2.ebuild: + ppc64 stable wrt #325845 + +*cmake-2.8.1-r2 (27 May 2010) + + 27 May 2010; Justin Lecher cmake-2.8.1-r1.ebuild, + +cmake-2.8.1-r2.ebuild, +files/cmake-2.8.1-mpi.patch: + Fixing problem with detecting mpi libs through FindMPI module + +*cmake-2.8.1-r1 (13 Apr 2010) + + 13 Apr 2010; Tomáš Chvátal + -cmake-2.8.0-r3.ebuild, +cmake-2.8.1-r1.ebuild, + +files/cmake-2.8.1-FindBoost.patch, +files/cmake-2.8.1-libform.patch: + Revision bump from overlay. Fix boost issues and bundled libform. Remove + old. + + 17 Mar 2010; Fabian Groffen cmake-2.8.1.ebuild, + +files/cmake-2.8.1-more-no_host_paths.patch: + Port more-no_host_paths patch since it is really necessary for proper + operation in Prefix, bump to EAPI=3. + +*cmake-2.8.1 (17 Mar 2010) + + 17 Mar 2010; Tomáš Chvátal +cmake-2.8.1.ebuild: + Version bump. + +*cmake-2.8.0-r3 (17 Mar 2010) + + 17 Mar 2010; Tomáš Chvátal -cmake-2.8.0.ebuild, + -cmake-2.8.0-r1.ebuild, -cmake-2.8.0-r2.ebuild, +cmake-2.8.0-r3.ebuild: + Update deps to match latest curl IUSE update. + + 26 Feb 2010; Fabian Groffen cmake-2.8.0-r2.ebuild: + Marked ~x64-macos, thanks Ramon van Alteren, bug #305367 + + 10 Feb 2010; Fabian Groffen cmake-2.8.0-r2.ebuild, + +files/cmake-2.8.0-darwin-no-app-with-qt.patch: + Add patch by Heiko Przybyl not to build an .app on OSX with USE=qt4 + +*cmake-2.8.0-r2 (31 Jan 2010) + + 31 Jan 2010; Fabian Groffen +cmake-2.8.0-r2.ebuild, + +files/cmake-2.8.0-darwin-default-install_name.patch: + Revision bump, add patch to set a default install_name on Darwin. This is + sufficient for most cases, and allows us to revert some install_name_tool + hacks for cmake-based packages. + + 24 Jan 2010; Tomáš Chvátal + cmake-2.8.0-r1.ebuild: + Fix typo. + +*cmake-2.8.0-r1 (24 Jan 2010) + + 24 Jan 2010; Tomáš Chvátal + +cmake-2.8.0-r1.ebuild: + Drop some deps. Still needs work on ncurses are harddep when bootstraping + but optional otherwise. + + 11 Jan 2010; Jonathan Callen + +files/cmake-2.6.0-interix.patch, +files/cmake-2.6.3-darwin-bundle.patch, + +files/cmake-2.6.3-fix_broken_lfs_on_aix.patch, + +files/cmake-2.6.3-no-duplicates-in-rpath.patch, cmake-2.8.0.ebuild, + +files/cmake-2.8.0-more-no_host_paths.patch: + Add prefix keywords, patches + + 05 Dec 2009; Jonathan Callen -cmake-2.6.4.ebuild, + -cmake-2.6.4-r1.ebuild: + Drop old ebuilds + + 29 Nov 2009; Tomáš Chvátal cmake-2.8.0.ebuild: + Update deps so the tests are not failing, and features are not missing. + Per bug #295070. + + 24 Nov 2009; Raúl Porcel cmake-2.6.4-r3.ebuild: + ia64/s390/sh/sparc stable wrt #290723 + + 19 Nov 2009; Markus Meier cmake-2.6.4-r3.ebuild: + arm stable, bug #290723 + + 18 Nov 2009; Brent Baude cmake-2.6.4-r3.ebuild: + Marking cmake-2.6.4-r3 ppc64 for bug 290723 + +*cmake-2.8.0 (14 Nov 2009) + + 14 Nov 2009; Tomáš Chvátal + -cmake-2.8.0_rc4.ebuild, +cmake-2.8.0.ebuild: + Version bump for new 2.8.0 release. Remove old rc. Tests are fatal, 100% + pased on all my machines right now. + + 11 Nov 2009; Jeroen Roovers cmake-2.6.4-r3.ebuild: + Stable for HPPA (bug #290723). + + 08 Nov 2009; Tobias Klausmann cmake-2.6.4-r3.ebuild: + Stable on alpha, bug #290723 + + 08 Nov 2009; Mounir Lamouri cmake-2.6.4-r3.ebuild: + Stable for ppc, bug 290723 + +*cmake-2.8.0_rc4 (03 Nov 2009) + + 03 Nov 2009; Marcus D. Hanwell -cmake-2.8.0_rc3.ebuild, + +cmake-2.8.0_rc4.ebuild: + Version bump, new rc. Dropped JNI patch - no longer applies. + + 02 Nov 2009; Markus Meier cmake-2.6.4-r3.ebuild: + amd64/x86 stable, bug #290723 + + 19 Oct 2009; Tomáš Chvátal + -cmake-2.6.2-r1.ebuild, -cmake-2.6.3-r1.ebuild: + Drop old. + +*cmake-2.8.0_rc3 (10 Oct 2009) + + 10 Oct 2009; Marcus D. Hanwell -cmake-2.8.0_rc2.ebuild, + +cmake-2.8.0_rc3.ebuild: + Version bump, new rc. + + 05 Oct 2009; Dominik Kapusta cmake-2.6.2-r1.ebuild: + Removed alternative dependency on Qt metapackage + +*cmake-2.8.0_rc2 (02 Oct 2009) + + 02 Oct 2009; Marcus D. Hanwell -cmake-2.8.0_rc1.ebuild, + +cmake-2.8.0_rc2.ebuild: + New release candidate, removed old one. + +*cmake-2.6.4-r3 (01 Oct 2009) + + 01 Oct 2009; Arfrever Frehtes Taifersar Arahesis + -cmake-2.6.4-r2.ebuild, +cmake-2.6.4-r3.ebuild, cmake-2.8.0_rc1.ebuild, + -files/cmake-python-3.patch, files/cmake-FindPythonLibs.patch, + metadata.xml: + FindPythonLibs.cmake should use currently active Python version (bug + #287143). Remove no longer needed "python3" USE flag. + +*cmake-2.8.0_rc1 (01 Oct 2009) + + 01 Oct 2009; Marcus D. Hanwell +cmake-2.8.0_rc1.ebuild: + Version bump, in package.mask initially for further testing. + +*cmake-2.6.4-r2 (28 Jul 2009) + + 28 Jul 2009; Arfrever Frehtes Taifersar Arahesis + +cmake-2.6.4-r2.ebuild, +files/cmake-python-3.patch, + files/cmake-FindPythonInterp.patch, files/cmake-FindPythonLibs.patch, + metadata.xml: + Add "python3" USE flag. + + 26 Jul 2009; Marcus D. Hanwell cmake-2.6.4.ebuild, + cmake-2.6.4-r1.ebuild: + Bumped to depend on >=dev-libs/xmlrpc-c-1.06.27[curl], fixes bug 276333. + + 24 Jul 2009; Arfrever Frehtes Taifersar Arahesis + files/cmake-FindPythonInterp.patch, files/cmake-FindPythonLibs.patch: + Support more Python versions. + +*cmake-2.6.4-r1 (17 Jul 2009) + + 17 Jul 2009; Arfrever Frehtes Taifersar Arahesis + +cmake-2.6.4-r1.ebuild, +files/cmake-2.6.4-FindBoost.patch: + Support more Boost versions. + + 31 May 2009; Markus Meier cmake-2.6.4.ebuild: + amd64 stable, bug #271444 + + 31 May 2009; Brent Baude cmake-2.6.4.ebuild: + Marking cmake-2.6.4 ppc64 for bug 271444 + + 30 May 2009; nixnut cmake-2.6.4.ebuild: + ppc stable #271444 + + 30 May 2009; Raúl Porcel cmake-2.6.4.ebuild: + alpha/arm/ia64/s390/sh stable wrt #271444 + + 28 May 2009; Tomáš Chvátal cmake-2.6.4.ebuild: + Add einfo informing about the test that might fail. + + 28 May 2009; Christian Faulhammer cmake-2.6.4.ebuild: + stable x86, bug 271444 + + 28 May 2009; Ferris McCormick cmake-2.6.4.ebuild: + Sparc stable, Bug #271444 (which see for comments). + + 27 May 2009; Jeroen Roovers cmake-2.6.4.ebuild: + Stable for HPPA (bug #271444). + + 03 May 2009; Arfrever Frehtes Taifersar Arahesis + cmake-2.6.4.ebuild: + Fix syntax. + + 03 May 2009; Marcus D. Hanwell cmake-2.6.4: + Fixed to the bootstrap logic. + +*cmake-2.6.4 (02 May 2009) + + 02 May 2009; Marcus D. Hanwell +cmake-2.6.4.ebuild: + Version bump, applied patch from bug 266383. + + 13 Apr 2009; Tomas Chvatal cmake-2.6.3-r1.ebuild: + Fix the has_version check. Current eclass does not support cmake 2.4... + + 11 Apr 2009; Joshua Kinard cmake-2.6.3-r1.ebuild: + Added ~mips to KEYWORDS. + +*cmake-2.6.3-r1 (04 Apr 2009) + + 04 Apr 2009; Tomas Chvatal + -files/cmake-2.0.6-rpath-fix.patch, -files/cmake-2.4.7-findkde4.patch, + -files/FindSWIG.cmake, +files/cmake-FindJNI.patch, -cmake-2.4.7-r1.ebuild, + -cmake-2.4.8.ebuild, -cmake-2.6.3.ebuild, +cmake-2.6.3-r1.ebuild: + Revision bump. Introduce some fixes. Remove old. + + 15 Mar 2009; Tomas Chvatal -cmake-2.4.6-r1.ebuild, + -cmake-2.6.2.ebuild: + Remove old. + + 14 Mar 2009; Raúl Porcel cmake-2.6.2-r1.ebuild: + arm/ia64/s390/sh/sparc stable wrt #259741 + + 11 Mar 2009; Brent Baude cmake-2.6.2-r1.ebuild: + Marking cmake-2.6.2-r1 ppc64 for bug 259741 + + 08 Mar 2009; Markus Meier cmake-2.6.2-r1.ebuild: + x86 stable, bug #259741 + + 07 Mar 2009; Jeremy Olexa cmake-2.6.2-r1.ebuild: + amd64 stable, bug 259741 + + 01 Mar 2009; nixnut cmake-2.6.2-r1.ebuild: + ppc stable #259741 + +*cmake-2.6.3 (01 Mar 2009) + + 01 Mar 2009; Tomas Chvatal +cmake-2.6.3.ebuild: + Version bump. + + 22 Feb 2009; Tobias Klausmann cmake-2.6.2-r1.ebuild: + Stable on alpha, bug #259741 + + 20 Feb 2009; Jeroen Roovers cmake-2.6.2-r1.ebuild: + Stable for HPPA (bug #259741). + + 03 Feb 2009; Tomas Chvatal cmake-2.6.2-r1.ebuild: + Fix src_configure. Per bug #254898. + + 21 Jan 2009; Markus Meier cmake-2.4.8.ebuild: + amd64/x86 stable + +*cmake-2.6.2-r1 (03 Jan 2009) + + 03 Jan 2009; Tomas Chvatal + +files/cmake-FindPythonInterp.patch, +cmake-2.6.2-r1.ebuild: + Add patch for python lib detection. Per bug #253593. Thanks to Oldrich + Jedlicka for patch. + + 02 Dec 2008; Tomas Chvatal + -files/cmake-2.6.1-gc-sections.patch, -files/cmake-2.6.1-rpath.patch, + -cmake-2.6.1.ebuild, cmake-2.6.2.ebuild: + Dupe old. Update current to eapi2. Fixes bug #226153. + +*cmake-2.6.2 (27 Sep 2008) + + 27 Sep 2008; Marcus D. Hanwell -cmake-2.6.0.ebuild, + +cmake-2.6.2.ebuild: + Version bump and removed old version. + +*cmake-2.6.1 (27 Aug 2008) + + 27 Aug 2008; Timo Gurr + +files/cmake-2.6.1-gc-sections.patch, +files/cmake-2.6.1-rpath.patch, + +cmake-2.6.1.ebuild: + Version bump. Big thanks to Brad King from kitware, thewtex and Arfrever + Frehtes Taifersar Arahesis and everyone else involved. Fixes bug #224901, + #232111, #233772 and #235731. + +*cmake-2.6.0 (08 May 2008) + + 08 May 2008; Marcus D. Hanwell + +files/cmake-FindPythonLibs.patch, +cmake-2.6.0.ebuild: + Version bump, masked for now until it receives wider testing. + + 22 Feb 2008; Ingmar Vanhassel -cmake-2.0.6-r1.ebuild, + -cmake-2.4.3.ebuild, -cmake-2.4.4.ebuild, -cmake-2.4.5.ebuild, + -cmake-2.4.6.ebuild, -cmake-2.4.7.ebuild, -cmake-2.4.7-r2.ebuild, + -cmake-2.4.8_rc12.ebuild: + Old. + + 11 Feb 2008; Diego Pettenò cmake-2.4.7-r2.ebuild, + cmake-2.4.8_rc12.ebuild, cmake-2.4.8.ebuild: + Remove --no-as-needed, xmlrpc-c caused the bug and is now fixed. If you want + to build cmake with --as-needed rebuild your xmlrpc-c. + +*cmake-2.4.8 (09 Feb 2008) + + 09 Feb 2008; Bo Ørsted Andresen +cmake-2.4.8.ebuild: + Version bump (bug #208618). + +*cmake-2.4.8_rc12 (14 Jan 2008) + + 14 Jan 2008; Ingmar Vanhassel + +cmake-2.4.8_rc12.ebuild: + Bump to latest RC. + + 13 Jan 2008; Wulf C. Krueger + cmake-2.4.7-r2.ebuild: + Dropped ~mips to get bug 194031 out of the way. Filed bug 205633 for + re-keywording. + + 17 Dec 2007; Wulf C. Krueger + cmake-2.4.7-r2.ebuild: + Added a check to make sure dev-libs/xmlrpc-c has been installed with + suitable USE flags. Fixes bug 194405. + + 10 Oct 2007; Christian Heim cmake-2.4.6-r1.ebuild, + cmake-2.4.7.ebuild, cmake-2.4.7-r1.ebuild, cmake-2.4.7-r2.ebuild: + Fixing #156800 by issuing -fno-stack-protector if we are having a GCC_MAJOR + equal to 3. + +*cmake-2.4.7-r2 (27 Sep 2007) + + 27 Sep 2007; Wulf C. Krueger + +files/FindSWIG.cmake, +cmake-2.4.7-r2.ebuild: + cmake-2.4.7-r2 now uses the system libraries during the bootstrap process + instead of the bundled versions. Fixes bug 178999. Furthermore, it features + a new FindSWIG.cmake module as provided by Axel Roebel on upstream bug 4145. + Fixes our bug 192594. + +*cmake-2.4.7-r1 (07 Sep 2007) + + 07 Sep 2007; Wulf C. Krueger + +files/cmake-2.4.7-findkde4.patch, +cmake-2.4.7-r1.ebuild: + Added an upstream patch to fix cmake failing to detect an existing KDE4 + installation if the program being built is not going to be installed in the + same directory as KDE4. Fixes bug 191412. Thanks, Zephyrus, for reporting + this and providing the patch! + + 19 Jul 2007; Marcus D. Hanwell cmake-2.4.7.ebuild: + Moved to testing, fixes bug 185832. Sorry. + +*cmake-2.4.7 (18 Jul 2007) + + 18 Jul 2007; Marcus D. Hanwell +cmake-2.4.7.ebuild: + Version bump. + + 26 Jun 2007; Lars Weiler cmake-2.4.6-r1.ebuild: + Stable on ppc; bug #182724. + + 21 Jun 2007; Raúl Porcel cmake-2.4.6-r1.ebuild: + alpha/ia64/x86 stable wrt #182724 + + 21 Jun 2007; Jeroen Roovers cmake-2.4.6-r1.ebuild: + Stable for HPPA (bug #182724). + + 21 Jun 2007; Gustavo Zacarias cmake-2.4.6-r1.ebuild: + Stable on sparc wrt #182724 + + 21 Jun 2007; Joshua Kinard cmake-2.4.6-r1.ebuild: + Stable on mips, per #182724. + + 20 Jun 2007; Christoph Mende cmake-2.4.6-r1.ebuild: + Stable on amd64 wrt bug 182724 + + 20 Jun 2007; Markus Rothe cmake-2.4.6-r1.ebuild: + Stable on ppc64; bug #182724 + +*cmake-2.4.6-r1 (07 Jun 2007) + + 07 Jun 2007; Wulf C. Krueger + +files/50cmake-gentoo.el, +files/cmake.vim, +cmake-2.4.6-r1.ebuild: + Added patches by Jack Kelly from bug 180667 to add vim and emacs syntax + files. Thanks, Jack! + +*cmake-2.4.6 (29 Jan 2007) + + 29 Jan 2007; Diego Pettenò +cmake-2.4.6.ebuild: + Version bump, closes bug #163487. + + 04 Jan 2007; Diego Pettenò cmake-2.0.6-r1.ebuild: + Get rid of debug.eclass usage. + + 16 Dec 2006; Stefan Schweizer cmake-2.4.5.ebuild: + inherit qt3 to avoid sandbox violations thanks to Johannes Hirte + and Mike Arthur in bug + 158161 + +*cmake-2.4.5 (13 Dec 2006) + + 13 Dec 2006; Stefan Schweizer + -files/cmake-2.0.6-rpath-fix.patch, -files/cmake-2.2.0-rpath-fix.patch, + -files/cmake-2.2.1-rpath-fix.patch, -files/cmake-2.2.2-rpath-fix.patch, + -files/cmake-2.2.3-rpath-fix.patch, -files/cmake-2.4.2-kde.patch, + -files/cmake-2.4.2-rpath-fix.patch, -cmake-2.0.6-r1.ebuild, + -cmake-2.2.0-r1.ebuild, -cmake-2.2.1.ebuild, -cmake-2.2.2.ebuild, + -cmake-2.2.3.ebuild, -cmake-2.4.2.ebuild, -cmake-2.4.2-r1.ebuild, + +cmake-2.4.5.ebuild: + version bump + + 08 Dec 2006; Jeroen Roovers cmake-2.4.3.ebuild: + Stable for HPPA (bug #155307). + + 06 Dec 2006; Bryan Østergaard cmake-2.4.3.ebuild: + Stable on Alpha. + + 01 Dec 2006; Gustavo Zacarias cmake-2.4.3.ebuild: + Stable on sparc wrt #155307 + + 30 Nov 2006; Markus Rothe cmake-2.4.3.ebuild: + Stable on ppc64; bug #155307 + + 30 Nov 2006; Christian Faulhammer cmake-2.4.3.ebuild: + stable x86, bug #155307 + + 30 Nov 2006; Lars Weiler cmake-2.4.3.ebuild: + Stable on ppc; bug #155307. + + 29 Nov 2006; Steve Dibb cmake-2.4.3.ebuild: + amd64 stable, fixed some copyright headers too, bug 155307 + +*cmake-2.4.4 (29 Nov 2006) + + 29 Nov 2006; Stefan Schweizer +cmake-2.4.4.ebuild: + Version bump thanks to Didier Link in bug 156582 + + 21 Oct 2006; Tobias Scherbaum cmake-2.2.1.ebuild: + ppc stable + + 24 Sep 2006; Daniel Black metadata.xml: + herd kde to take maintainence thanks Diego + +*cmake-2.4.3 (16 Sep 2006) + + 16 Sep 2006; Daniel Black +cmake-2.4.3.ebuild: + version bump as per bug #143337 thanks to Nick Bowler et al + + 20 Jul 2006; cmake-2.0.6-r1.ebuild: + stable on mips + +*cmake-2.4.2-r1 (30 Jun 2006) + + 30 Jun 2006; Daniel Black + +files/cmake-2.4.2-kde.patch, +cmake-2.4.2-r1.ebuild: + removed rpath patch - nolonger needed as per bug #137918 thanks Dan. KDE + plugin path added as per bug #137918 thanks to Michael. KDE plugin path patch + thanks to Andreas Beckermann kde bug #129737 + + 25 May 2006; Diego Pettenò cmake-2.4.2.ebuild: + Add ~x86-fbsd keyword. + +*cmake-2.4.2 (24 May 2006) + + 24 May 2006; Daniel Black + +files/cmake-2.4.2-rpath-fix.patch, +cmake-2.4.2.ebuild: + verion bump as per bug #131080 thanks to Tobias Roeser, Diego, and others + + 29 Apr 2006; Jason Wever cmake-2.0.6-r1.ebuild: + Stable on SPARC. + + 06 Feb 2006; Aron Griffis cmake-2.2.1.ebuild: + Mark 2.2.1 stable on alpha + + 04 Feb 2006; Aron Griffis cmake-2.2.1.ebuild: + Mark 2.2.1 stable on ia64 + +*cmake-2.2.3 (16 Jan 2006) + + 16 Jan 2006; Lisa Seelye + +files/cmake-2.2.3-rpath-fix.patch, +cmake-2.2.3.ebuild: + Version bump to solve bug #118822 + +*cmake-2.2.2 (08 Nov 2005) + + 08 Nov 2005; Lisa Seelye + +files/cmake-2.2.2-rpath-fix.patch, +cmake-2.2.2.ebuild: + version bump to solve bug #111881 + + 29 Oct 2005; Daniel Goller cmake-2.2.1.ebuild: + Stable on amd64 + + 02 Oct 2005; Daniel Black -cmake-2.0.5.ebuild, + -cmake-2.0.6.ebuild: + remove rpath vulnerable versions: bug 105721 + + 02 Oct 2005; Bryan Østergaard cmake-2.0.6-r1.ebuild: + Stable on ia64, bug 105721. + + 29 Sep 2005; Fernando J. Pereda cmake-2.0.6-r1.ebuild: + stable on alpha wrt bug #105721 + + 26 Sep 2005; Stefan Briesenick cmake-2.2.1.ebuild: + fixing parallel build problem (emake -j1). + +*cmake-2.2.1 (26 Sep 2005) +*cmake-2.2.0-r1 (26 Sep 2005) +*cmake-2.0.6-r1 (26 Sep 2005) + + 26 Sep 2005; Daniel Black + +files/cmake-2.0.6-rpath-fix.patch, +files/cmake-2.2.0-rpath-fix.patch, + +files/cmake-2.2.1-rpath-fix.patch, +cmake-2.0.6-r1.ebuild, + -cmake-2.2.0.ebuild, +cmake-2.2.0-r1.ebuild, +cmake-2.2.1.ebuild: + insecure runpaths as per security bug #105721 resulted in 2.2.0-r1 and + 2.0.6-r1. Thanks Ashu Tiwary. version bump to 2.2.1 as per bug #106781 by + David Somers + + 02 Sep 2005; Michael Hanselmann cmake-2.0.6.ebuild: + Stable on ppc. + + 23 Aug 2005; Aron Griffis cmake-2.0.6.ebuild: + stable on ia64 + +*cmake-2.2.0 (20 Aug 2005) + + 20 Aug 2005; Daniel Black -cmake-2.0.3.ebuild, + cmake-2.0.6.ebuild, +cmake-2.2.0.ebuild: + version bump (bug #99045). thanks david somers. x86 stable on 2.0.6. old + version removal + + 05 Aug 2005; Aaron Walker cmake-2.0.6.ebuild: + Added ~mips. + + 02 Jul 2005; Bryan Østergaard cmake-2.0.5.ebuild: + Stable on alpha. + + 12 May 2005; Aron Griffis cmake-2.0.6.ebuild: + add ~ia64 + + 24 Apr 2005; Michael Hanselmann cmake-2.0.5.ebuild: + Stable on ppc. + +*cmake-2.0.6 (21 Apr 2005) + + 21 Apr 2005; Daniel Black +metadata.xml, + +cmake-2.0.6.ebuild: + Version bump as per bug #89394. Thanks to david somers + + + 23 Mar 2005; Daniel Black -cmake-2.0.2.ebuild, + cmake-2.0.5.ebuild: + x86 stable as per bug #86292. Old version removal. Thanks to david somers + + + 18 Jan 2005; Bryan Østergaard cmake-2.0.3.ebuild: + Stable on alpha. + +*cmake-2.0.5 (01 Jan 2005) + + 01 Jan 2005; Daniel Black -cmake-1.8.2.ebuild, + -cmake-1.8.3.ebuild, cmake-2.0.2.ebuild, cmake-2.0.3.ebuild, + +cmake-2.0.5.ebuild: + version bump as per bug #76291.x86 keywords to 2.0.2 and 2.0.3. Remove + old version 1.8.3. Thanks to david somers for + the notification. + + 31 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 24 Nov 2004; Karol Wojtaszek cmake-2.0.3.ebuild: + Added to ~amd64, bug #72299 + +*cmake-2.0.3 (10 Aug 2004) + + 10 Aug 2004; Mike Frysinger +cmake-2.0.3.ebuild: + Version bump. + +*cmake-2.0.2 (02 Jul 2004) + + 02 Jul 2004; Lisa Seelye +cmake-2.0.2.ebuild: + version bump for bug #55558 + + 03 Jun 2004; Bryan Østergaard cmake-1.8.3.ebuild: + Stable on alpha. + +*cmake-1.8.3 (24 Feb 2004) + + 24 Feb 2004; Lisa Seelye cmake-1.8.1.ebuild, + cmake-1.8.2.ebuild, cmake-1.8.3.ebuild: + Remove old 1.8.1, bump 1.8.2 to stable on x86, add 1.8.3 to the tree to close + bug #42613 + +*cmake-1.8.2 (09 Jan 2004) + + 09 Jan 2004; Lisa Seelye cmake-1.8.2.ebuild: + Version bump, closes bug #36619. + +*cmake-1.8.1 (08 Dec 2003) + + 08 Dec 2003; Lisa Seelye cmake-1.8.1.ebuild: + Initial checkin. Submitted by Sam Yates to close bug + 25334. + diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest new file mode 100644 --- /dev/null +++ b/dev-util/cmake/Manifest @@ -0,0 +1,22 @@ +AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 +AUX cmake-2.6.0-interix.patch 1657 RMD160 fe2e9675da5b66c041d8ae5f1c667cf605494674 SHA1 d21fa5346a939411d579ab308005f7867f012975 SHA256 944401813cd66fdefc68935778fc3fe2328f17a2f00d559dac8add63bb37faf7 +AUX cmake-2.6.3-darwin-bundle.patch 952 RMD160 157295c7080e3fa5a1414c6f7efba4877049c5e7 SHA1 595740c64fd64e93763d7b1f59d341f9f8117482 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca +AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 RMD160 38094f9f8516656cc30d6ead147bc1e2ae41f429 SHA1 5458b92849292d9e8ca3003654a94e339cb4a48c SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 +AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 RMD160 d927ce8bb08d57f452db3371a0b2e11d252b96c9 SHA1 6f88171a816c1157ddcf3c3d5c3e3ec080471883 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 +AUX cmake-2.6.4-FindBoost.patch 1094 RMD160 58cbed09bcb5fadf166cf64481f9605b5882f6a2 SHA1 5a3a91737b436e9de50c955bdb3e32b8fa7bed30 SHA256 a3f266086335b96af8e0dd848a05a10373762de9b9d6cc3b8af4b27fb43d362c +AUX cmake-2.8.0-darwin-default-install_name.patch 911 RMD160 6261482ff3f989ce455ea87cd5c540385420149b SHA1 6c473a538204826210f62fabdfafb2f5f19087bb SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d +AUX cmake-2.8.0-darwin-no-app-with-qt.patch 2983 RMD160 088b54f0c1fd7d43867c0479deee0caada3a5fcd SHA1 1737e954c7bbb55f007226c48feac596ac290c45 SHA256 f678cb03ee646a231eedda894e8965bf7bc83b693b249e1ecd4590e933323224 +AUX cmake-2.8.1-FindBoost.patch 714 RMD160 8f7d2be9cc63289a3e4f79b43f4b8baa6d980810 SHA1 37925b584dc471148f756bd41158740704dbec37 SHA256 f110d2387c362c518480d804bf1ce9f4881af67755cafd41bb639b09a8afca88 +AUX cmake-2.8.1-libform.patch 1818 RMD160 ca954dfe966cd73836ef9e01ffe8f0eda85f2f91 SHA1 8f8e9a0002b4a95cea7dcfc36c2df16c47008bec SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5 +AUX cmake-2.8.1-more-no_host_paths.patch 2981 RMD160 fea9f1d96d8c29f55e424389fb4f2471dfe514d8 SHA1 90fdc2ad69aeb54530d1faf4867e40c233caf084 SHA256 0c3fbe76684851ee444be92a99f91e5a5e8dfef02d7426722e10025aeca03412 +AUX cmake-2.8.1-mpi.patch 857 RMD160 d41e4dd445b1a79d0a82619a8ad7371e80d937a8 SHA1 0192124d023953d35cb5fb0da148c914525099e6 SHA256 64092fbf637bfe625cf58abe93844aab2e75ba22a00e5ffdb05188961b7f51d7 +AUX cmake-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA1 c463daa6e7d3a1d7065607f97993b5da3486e7e1 SHA256 c5390550c192aea18415087ed891f7e5192b2a385c9c72f4cda0c19b13f6bfbb +AUX cmake-FindPythonInterp.patch 498 RMD160 a4113724d0c2bdb53e7c947790d8a7e337759c84 SHA1 abd7754549fef5aae515361acd6a509c98227bf5 SHA256 8c3d4dc1898eae4adaa392b556286076594470277bc7c1bddbe2a28213fff7c0 +AUX cmake-FindPythonLibs.patch 546 RMD160 429021001f1b464d8321703052890a34141a34ec SHA1 e5d62feab16058f123e1399e0504a50f50ee5a88 SHA256 86a5e78ff4e62cf8987401255197f7ba4ae70d00c257df3048372c5dcc035bdd +AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 +DIST cmake-2.6.4.tar.gz 3285371 RMD160 e4217067537f76e52317514cb5bb0cf38733d16a SHA1 c7e295683e061c2ed19773a1f0444972f75db092 SHA256 9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2 +DIST cmake-2.8.1.tar.gz 3605611 RMD160 38b0876597def32a535d5305fb8f706ff29beabe SHA1 fb93c8766a3bd71f2a824291717700c118d29be5 SHA256 4b65b819c00874c34196640411f6f9e877abf23733ba0ef68f73b4fafd3b3022 +EBUILD cmake-2.6.4-r3.ebuild 3476 RMD160 e20f6f85b5291ced7e3ee53ff933a0da704b8f14 SHA1 72bb72aeea2261d1c5c5642018234803c35c32c5 SHA256 1c4a2f60dffb72d1134932b580e46d07a7784420a0c786f204d4b71dbfd928f0 +EBUILD cmake-2.8.1-r2.ebuild 4280 RMD160 21636bcf357ae6916086f9080e72a34b0dae0470 SHA1 2fe97a4b03a7a10e4e61b60b51d5df15ee12e43a SHA256 e9a1455b178c92869f1901dd41b5b7dc04af6e3dda43d4521b2f7ba0d110cf60 +MISC ChangeLog 22268 RMD160 b82eb02cdec9651f80133a5fffb60cbd47e8f685 SHA1 94ee1050e03df0786f21a953125b013e024e62b6 SHA256 72cda74eda7fe611ad56c29fda05d5192ce832e9654e76936944a5b2d8d591ce +MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 diff --git a/dev-util/cmake/cmake-2.6.4-r3.ebuild b/dev-util/cmake/cmake-2.6.4-r3.ebuild new file mode 100644 --- /dev/null +++ b/dev-util/cmake/cmake-2.6.4-r3.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.4-r3.ebuild,v 1.8 2009/11/24 15:59:55 armin76 Exp $ + +EAPI="2" + +inherit elisp-common toolchain-funcs eutils versionator flag-o-matic cmake-utils + +MY_PV="${PV/rc/RC-}" +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 ~sparc-fbsd ~x86-fbsd" +SLOT="0" +IUSE="emacs qt4 vim-syntax" + +DEPEND=" + >=net-misc/curl-7.16.4 + >=dev-libs/expat-2.0.1 + >=dev-libs/libxml2-2.6.28 + >=dev-libs/xmlrpc-c-1.06.27[curl] + emacs? ( virtual/emacs ) + qt4? ( x11-libs/qt-gui:4 ) + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + ) +" +RDEPEND="${DEPEND}" + +SITEFILE="50${PN}-gentoo.el" +VIMFILE="${PN}.vim" + +S="${WORKDIR}/${MY_P}" + +CMAKE_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}/${PN}-FindJNI.patch" + "${FILESDIR}/${PN}-FindPythonLibs.patch" + "${FILESDIR}/${PN}-FindPythonInterp.patch" + "${FILESDIR}/${P}-FindBoost.patch" +) + +src_configure() { + local qt_arg par_arg + + if [[ "$(gcc-major-version)" -eq "3" ]] ; then + append-flags "-fno-stack-protector" + fi + + bootstrap=0 + has_version ">=dev-util/cmake-2.6.1" || bootstrap=1 + if [[ ${bootstrap} = 0 ]]; then + # Required version of CMake found, now test if it works + cmake --version &> /dev/null + if ! [[ $? = 0 ]]; then + bootstrap=1 + fi + fi + + if [[ ${bootstrap} = 1 ]]; then + tc-export CC CXX LD + + if use qt4; then + qt_arg="--qt-gui" + else + qt_arg="--no-qt-gui" + fi + + 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 + + ./bootstrap \ + --system-libs \ + --prefix=/usr \ + --docdir=/share/doc/${PF} \ + --datadir=/share/${PN} \ + --mandir=/share/man \ + "$qt_arg" \ + "$par_arg" || die "./bootstrap failed" + else + # this is way much faster so we should preffer it if some cmake is + # around. + use qt4 && qt_arg="ON" || qt_arg="OFF" + mycmakeargs="-DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DBUILD_CursesDialog=ON + -DBUILD_QtDialog=${qt_arg}" + cmake-utils_src_configure + fi +} + +src_compile() { + cmake-utils_src_compile + if use emacs; then + elisp-compile Docs/cmake-mode.el || die "elisp compile failed" + fi +} + +src_test() { + einfo "Please note that test \"58 - SimpleInstall-Stage2\" might fail." + einfo "If any package installs with cmake, it means test failed but cmake work." + emake test +} + +src_install() { + cmake-utils_src_install + if use emacs; then + elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins "${S}"/Docs/cmake-syntax.vim + + insinto /usr/share/vim/vimfiles/indent + doins "${S}"/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/cmake-2.8.1-r2.ebuild b/dev-util/cmake/cmake-2.8.1-r2.ebuild new file mode 100644 --- /dev/null +++ b/dev-util/cmake/cmake-2.8.1-r2.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header $ + +EAPI="3" + +inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils + +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=" + >=net-misc/curl-7.20.0-r1[ssl] + >=dev-libs/expat-2.0.1 + 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 + ) + ) +" + +SITEFILE="50${PN}-gentoo.el" +VIMFILE="${PN}.vim" + +S="${WORKDIR}/${MY_P}" + +CMAKE_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-FindPythonLibs.patch + "${FILESDIR}"/${PN}-FindPythonInterp.patch + "${FILESDIR}"/${PN}-2.6.0-interix.patch + "${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.0-darwin-no-app-with-qt.patch + "${FILESDIR}"/${PN}-2.8.1-more-no_host_paths.patch + "${FILESDIR}"/${PN}-2.8.1-FindBoost.patch + "${FILESDIR}"/${PN}-2.8.1-libform.patch + "${FILESDIR}"/${PN}-2.8.1-mpi.patch +) + +src_prepare() { + base_src_prepare + + # 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" +} + +src_configure() { + if [[ "$(gcc-major-version)" -eq "3" ]] ; then + append-flags "-fno-stack-protector" + fi + + # make things work with gentoo java setup + # in case java-config cannot be run, the variable just becomes unset + export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) + + bootstrap=0 + has_version ">=dev-util/cmake-2.6.1" || bootstrap=1 + if [[ ${bootstrap} = 0 ]]; then + # Required version of CMake found, now test if it works + cmake --version &> /dev/null || bootstrap=1 + fi + + use test && bootstrap=1 #315223 + + if [[ ${bootstrap} = 1 ]]; then + local qt_arg par_arg + tc-export CC CXX LD + + if use qt4; then + qt_arg="--qt-gui" + else + qt_arg="--no-qt-gui" + fi + + 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 + + ./bootstrap \ + --system-libs \ + --prefix="${EPREFIX}"/usr \ + --docdir=/share/doc/${PF} \ + --datadir=/share/${PN} \ + --mandir=/share/man \ + "$qt_arg" \ + "$par_arg" || die "./bootstrap failed" + else + # this is way much faster so we should prefer it if some cmake is + # around. + 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 + fi +} + +src_compile() { + cmake-utils_src_compile + if use emacs; then + elisp-compile Docs/cmake-mode.el || die "elisp compile failed" + fi +} + +src_test() { + emake test || die "Tests failed" +} + +src_install() { + cmake-utils_src_install + if use emacs; then + elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed" + 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/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/50cmake-gentoo.el @@ -0,0 +1,4 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) +(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) +(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) diff --git a/dev-util/cmake/files/cmake-2.6.0-interix.patch b/dev-util/cmake/files/cmake-2.6.0-interix.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.0-interix.patch @@ -0,0 +1,48 @@ +diff -ruN cmake-2.6.0.orig/Modules/Platform/Interix.cmake cmake-2.6.0/Modules/Platform/Interix.cmake +--- cmake-2.6.0.orig/Modules/Platform/Interix.cmake 1970-01-01 01:00:00 +0100 ++++ cmake-2.6.0/Modules/Platform/Interix.cmake 2008-06-02 14:22:45 +0200 +@@ -0,0 +1,31 @@ ++# This is a proposed Platform definition for Interix GCC/G++ ++ ++SET(CMAKE_DL_LIBS "dl") ++SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") ++SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") ++SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") ++SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") ++SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") ++SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-h,") ++SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-h,") ++ ++SET(UNIX 1) ++ ++# also add the install directory of the running cmake to the search directories ++# CMAKE_ROOT is CMAKE_INSTALL_PREFIX/share/cmake, so we need to go two levels up ++GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH) ++GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) ++ ++LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH ++ "${_CMAKE_INSTALL_DIR}" ++ "${CMAKE_INSTALL_PREFIX}" ++ ) ++ ++LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ++ "${CMAKE_INSTALL_PREFIX}"/include ++ ) ++ ++LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ++ "${CMAKE_INSTALL_PREFIX}"/lib ++ ) ++ +diff -ruN cmake-2.6.0.orig/Utilities/cmtar/encode.c cmake-2.6.0/Utilities/cmtar/encode.c +--- cmake-2.6.0.orig/Utilities/cmtar/encode.c 2008-06-02 13:00:44 +0200 ++++ cmake-2.6.0/Utilities/cmtar/encode.c 2008-06-02 14:02:39 +0200 +@@ -24,6 +24,9 @@ + # include + #endif + ++#ifdef HAVE_SYS_MKDEV_H ++# include ++#endif + + /* magic, version, and checksum */ + void diff --git a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch @@ -0,0 +1,23 @@ +Don't use .so for modules on darwin/macos. Use .bundle instead. +Patch by Heiko Przybyl + +--- Modules/Platform/Darwin.cmake ++++ Modules/Platform/Darwin.cmake +@@ -23,7 +23,7 @@ + SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") + SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") + SET(CMAKE_SHARED_MODULE_PREFIX "lib") +-SET(CMAKE_SHARED_MODULE_SUFFIX ".so") ++SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle") + SET(CMAKE_MODULE_EXISTS 1) + SET(CMAKE_DL_LIBS "") + +@@ -45,7 +45,7 @@ + SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") + SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") + SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") +-SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") ++SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") + + # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree + # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch @@ -0,0 +1,39 @@ +http://public.kitware.com/Bug/view.php?id=7933 + +diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx +--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 ++++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 +@@ -38,6 +38,13 @@ + int main() { return 0; } + #endif + ++#ifdef TEST_KWSYS_LFS_SUPPORT ++#define _LARGE_FILES ++#include ++int main() { return 0; } ++#endif ++ ++ + #ifdef TEST_KWSYS_IOS_HAVE_STD + #include + void f(std ::ostream*) {} +diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap +--- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 ++++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 +@@ -1005,6 +1005,16 @@ + echo "${cmake_cxx_compiler} does not have stl iterator_traits" + fi + ++if cmake_try_run "${cmake_cxx_compiler}" \ ++ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ ++ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then ++ KWSYS_LFS_AVAILABLE=1 ++ echo "LFS support available" ++else ++ KWSYS_LFS_AVAILABLE=0 ++ echo "LFS support unavailable, disabled" ++fi ++ + if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then + if cmake_try_run "${cmake_cxx_compiler}" \ + "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch @@ -0,0 +1,19 @@ +Patch by Heiko Przybyl + +--- Source/cmComputeLinkInformation.cxx ++++ Source/cmComputeLinkInformation.cxx +@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge + for(std::vector::const_iterator ri = runtimeDirs.begin(); + ri != runtimeDirs.end(); ++ri) + { ++ // Do not add duplicates. ++ // I'd like to have that check already in the list generation code ++ // but that would need lots of more changes, even in ExpandListArgument(). ++ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) ++ { ++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; ++ continue; ++ } + // Separate from previous path. + rpath += sep; + sep = this->GetRuntimeSep().c_str(); diff --git a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch b/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch @@ -0,0 +1,22 @@ +--- Modules/FindBoost.cmake ++++ Modules/FindBoost.cmake +@@ -57,7 +57,8 @@ + # + # Currently this module searches for the following version numbers: + # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, +-# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0 ++# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0, ++# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0 + # + # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should + # add both 1.x and 1.x.0 as shown above. Official Boost include directories +@@ -271,7 +272,8 @@ + # The user has not requested an exact version. Among known + # versions, find those that are acceptable to the user request. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} +- "1.38.0" "1.38" "1.37.0" "1.37" ++ "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42" "1.41.0" "1.41" ++ "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" + "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0" + "1.34" "1.33.1" "1.33.0" "1.33") + set(_boost_TEST_VERSIONS) diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch @@ -0,0 +1,20 @@ +The install_name of a library can be compared to the ELF soname, setting +it to just the library name (libx.1.dylib) is not sufficient on Mach-O, +as it uses full paths. Most apps have no clue about that, so they don't +do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html + +Provide a sane default that will allow merging most cmake-based +packages. If this location is not correct, Portage's QA checks will +catch that. + +--- Source/cmTarget.cxx ++++ Source/cmTarget.cxx +@@ -974,7 +974,7 @@ + this->Makefile->IsOn("MINGW")); + + // Setup default property values. +- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); ++ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); + this->SetPropertyDefault("INSTALL_RPATH", ""); + this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); + this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch @@ -0,0 +1,74 @@ +Description: Don't build the GUI's app-bundle. +Author: Heiko Przybyl +--- cmake-2.8.0/CMakeLists.txt.orig 2010-02-10 19:38:03 +0100 ++++ cmake-2.8.0/CMakeLists.txt 2010-02-10 19:38:49 +0100 +@@ -381,7 +381,7 @@ IF(BUILD_CursesDialog) + ENDIF(BUILD_CursesDialog) + + IF(BUILD_QtDialog) +- IF(APPLE) ++ IF(FALSE) + SET(CMAKE_BUNDLE_NAME + "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}") + SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") +@@ -394,7 +394,7 @@ IF(BUILD_QtDialog) + ENDIF(NOT "${ENDCH}" STREQUAL "/") + SET(CMAKE_INSTALL_PREFIX + "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents") +- ENDIF(APPLE) ++ ENDIF(FALSE) + + SET(QT_NEED_RPATH FALSE) + IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64") +--- cmake-2.8.0/Source/QtDialog/CMakeLists.txt.orig 2010-02-10 19:39:59 +0100 ++++ cmake-2.8.0/Source/QtDialog/CMakeLists.txt 2010-02-10 19:42:12 +0100 +@@ -66,12 +66,12 @@ ELSE(NOT QT4_FOUND) + IF(Q_WS_WIN) + SET(SRCS ${SRCS} CMakeSetup.rc) + ENDIF(Q_WS_WIN) +- IF(Q_WS_MAC) ++ IF(FALSE) + SET(SRCS ${SRCS} CMakeSetup.icns) + SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) + SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES + MACOSX_PACKAGE_LOCATION Resources) +- ENDIF(Q_WS_MAC) ++ ENDIF(FALSE) + + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) +@@ -79,13 +79,13 @@ ELSE(NOT QT4_FOUND) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + +- ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) ++ ADD_EXECUTABLE(cmake-gui WIN32 ${SRCS}) + TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}) + IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) +- IF(APPLE) ++ IF(FALSE) + SET_TARGET_PROPERTIES(cmake-gui PROPERTIES + OUTPUT_NAME ${CMAKE_BUNDLE_NAME}) +- ENDIF(APPLE) ++ ENDIF(FALSE) + SET(CMAKE_INSTALL_DESTINATION_ARGS + BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}") + ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) +@@ -101,7 +101,7 @@ ELSE(NOT QT4_FOUND) + INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages ) + ENDIF(UNIX) + +- IF(APPLE) ++ IF(FALSE) + SET(CMAKE_POSTFLIGHT_SCRIPT + "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") + SET(CMAKE_POSTUPGRADE_SCRIPT +@@ -115,7 +115,7 @@ ELSE(NOT QT4_FOUND) + INSTALL(CODE "set(input_file + \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}\")") + INSTALL(SCRIPT "${CMake_SOURCE_DIR}/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake") +- ENDIF(APPLE) ++ ENDIF(FALSE) + CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in" + "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY) + ENDIF(NOT QT4_FOUND) \ No newline at end of file diff --git a/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch @@ -0,0 +1,14 @@ +diff -u -r cmake-2.8.1.orig/Modules/FindBoost.cmake cmake-2.8.1/Modules/FindBoost.cmake +--- cmake-2.8.1.orig/Modules/FindBoost.cmake 2010-03-16 21:29:29.000000000 +0100 ++++ cmake-2.8.1/Modules/FindBoost.cmake 2010-04-04 19:52:50.000000000 +0200 +@@ -70,7 +70,9 @@ + # omit the 3rd version number from include paths if it is 0 although not all + # binary Boost releases do so. + # +-# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0") ++SET(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" ++ "1.47.0" "1.47" "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" ++ "1.43" "1.42.0" "1.42") + # + # ===================================== ============= ======================== + # diff --git a/dev-util/cmake/files/cmake-2.8.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.1-libform.patch @@ -0,0 +1,50 @@ +diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt +--- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100 ++++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200 +@@ -314,9 +314,6 @@ + ELSE (UNIX) + SET(BUILD_CursesDialog 0) + ENDIF (UNIX) +- IF(BUILD_CursesDialog) +- ADD_SUBDIRECTORY(Source/CursesDialog/form) +- ENDIF(BUILD_CursesDialog) + ENDMACRO (CMAKE_BUILD_UTILITIES) + + +diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt +--- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100 ++++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200 +@@ -25,13 +25,18 @@ + CursesDialog/ccmake + ) + +-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form +- ${CMake_BINARY_DIR}/Source/CursesDialog/form) + INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) + + + ADD_EXECUTABLE(ccmake ${CURSES_SRCS} ) + TARGET_LINK_LIBRARIES(ccmake CMakeLib) +-TARGET_LINK_LIBRARIES(ccmake cmForm) ++TARGET_LINK_LIBRARIES(ccmake form) ++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) ++IF(CURSES_EXTRA_LIBRARY) ++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) ++ENDIF(CURSES_EXTRA_LIBRARY) ++ + + INSTALL_TARGETS(/bin ccmake) ++ ++ +diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h +--- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100 ++++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200 +@@ -15,8 +15,6 @@ + #define _MSE_INT_H + #endif + +-#include +- + #if defined(__hpux) + # define _BOOL_DEFINED + # include diff --git a/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch @@ -0,0 +1,108 @@ +Set some proper paths to make cmake find our tools. +Original patch by Heiko Przybyl + +The ebuild now adds an extra / at the end of $EPREFIX so that it is +never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains +correct) + +--- cmake-2.8.0/Modules/Platform/Darwin.cmake ++++ cmake-2.8.0/Modules/Platform/Darwin.cmake +@@ -213,19 +213,23 @@ + + + +-# default to searching for frameworks first +-SET(CMAKE_FIND_FRAMEWORK FIRST) ++# default to searching for frameworks last ++SET(CMAKE_FIND_FRAMEWORK LAST) + # set up the default search directories for frameworks + SET(CMAKE_SYSTEM_FRAMEWORK_PATH ++ @GENTOO_PORTAGE_EPREFIX@Frameworks ++ @GENTOO_PORTAGE_EPREFIX@usr/lib + ~/Library/Frameworks + /Library/Frameworks + /Network/Library/Frameworks + /System/Library/Frameworks) + +-# default to searching for application bundles first +-SET(CMAKE_FIND_APPBUNDLE FIRST) ++# default to searching for application bundles last ++SET(CMAKE_FIND_APPBUNDLE LAST) + # set up the default search directories for application bundles + SET(CMAKE_SYSTEM_APPBUNDLE_PATH ++ @GENTOO_PORTAGE_EPREFIX@Applications ++ @GENTOO_PORTAGE_EPREFIX@usr/bin + ~/Applications + /Applications + /Developer/Applications) +--- cmake-2.8.0/Modules/Platform/UnixPaths.cmake ++++ cmake-2.8.0/Modules/Platform/UnixPaths.cmake +@@ -33,6 +33,7 @@ + # search types. + LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard ++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ + /usr/local /usr / + + # CMake install location +@@ -44,43 +45,39 @@ + + # List common include file locations not under the common prefixes. + LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /opt/local/include /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include ++ @GENTOO_PORTAGE_EPREFIX@usr/include + ) + + LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /opt/local/lib /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib ++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc ++ @GENTOO_PORTAGE_GCCLIBDIR@ ++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib ++ @GENTOO_PORTAGE_EPREFIX@lib + ) + + LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ @GENTOO_PORTAGE_EPREFIX@usr/bin ++ @GENTOO_PORTAGE_EPREFIX@bin + ) + + LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc ++ @GENTOO_PORTAGE_GCCLIBDIR@ ++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib ++ @GENTOO_PORTAGE_EPREFIX@lib + /lib /usr/lib /usr/lib32 /usr/lib64 + ) + + LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ++ @GENTOO_PORTAGE_EPREFIX@usr/include + /usr/include + ) + LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ++ @GENTOO_PORTAGE_EPREFIX@usr/include + /usr/include + ) + diff --git a/dev-util/cmake/files/cmake-2.8.1-mpi.patch b/dev-util/cmake/files/cmake-2.8.1-mpi.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.1-mpi.patch @@ -0,0 +1,20 @@ +diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake +index 481b0e9..43e97e8 100644 +--- a/Modules/FindMPI.cmake ++++ b/Modules/FindMPI.cmake +@@ -263,13 +263,13 @@ elseif (MPI_COMPILE_CMDLINE) + + # Extract the set of libraries to link against from the link command + # line +- string(REGEX MATCHALL "-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") ++ string(REGEX MATCHALL " -l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") + + # Determine full path names for all of the libraries that one needs + # to link against in an MPI program + set(MPI_LIBRARIES) + foreach(LIB ${MPI_LIBNAMES}) +- string(REGEX REPLACE "^-l" "" LIB ${LIB}) ++ string(REGEX REPLACE "^ -l" "" LIB ${LIB}) + set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE) + find_library(MPI_LIB ${LIB} HINTS ${MPI_LINK_PATH}) + if (MPI_LIB) diff --git a/dev-util/cmake/files/cmake-FindJNI.patch b/dev-util/cmake/files/cmake-FindJNI.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-FindJNI.patch @@ -0,0 +1,71 @@ +diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake +--- ./Modules/FindJNI.cmake 2009-02-21 21:36:50.000000000 +0100 ++++ ../a/Modules/FindJNI.cmake 2008-11-24 04:44:06.000000000 +0100 +@@ -2,7 +2,7 @@ + # This module finds if Java is installed and determines where the + # include files and libraries are. It also determines what the name of + # the library is. This code sets the following variables: +-# ++# + # JNI_INCLUDE_DIRS = the include dirs to use + # JNI_LIBRARIES = the libraries to use + # JAVA_AWT_LIBRARY = the path to the jawt library +@@ -51,6 +51,8 @@ + "${dir}" + "${dir}/client" + "${dir}/server" ++ "${dir}/j9vm" ++ "${dir}/classic" + ) + ENDFOREACH(dir) + +@@ -60,7 +62,7 @@ + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" + $ENV{JAVA_HOME}/include +- /usr/include ++ /usr/include + /usr/local/include + /usr/lib/java/include + /usr/local/lib/java/include +@@ -126,7 +128,7 @@ + ) + ENDIF(JAVA_HAVE_FRAMEWORK) + ELSE(APPLE) +- FIND_LIBRARY(JAVA_AWT_LIBRARY jawt ++ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt + PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES} + ) + FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM +@@ -134,18 +136,23 @@ + ) + ENDIF(APPLE) + +-# add in the include path +-FIND_PATH(JAVA_INCLUDE_PATH jni.h ++# add in the include path ++FIND_PATH(JAVA_INCLUDE_PATH jni.h + ${JAVA_AWT_INCLUDE_DIRECTORIES} + ) + +-FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h ++FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h + ${JAVA_AWT_INCLUDE_DIRECTORIES} + ${JAVA_INCLUDE_PATH}/win32 + ${JAVA_INCLUDE_PATH}/linux + ${JAVA_INCLUDE_PATH}/freebsd + ) + ++FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h ++ ${JAVA_AWT_INCLUDE_DIRECTORIES} ++ ${JAVA_INCLUDE_PATH} ++) ++ + FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h + ${JAVA_AWT_INCLUDE_DIRECTORIES} + ${JAVA_INCLUDE_PATH} +@@ -169,4 +176,3 @@ + ${JAVA_INCLUDE_PATH2} + ${JAVA_AWT_INCLUDE_PATH} + ) +- diff --git a/dev-util/cmake/files/cmake-FindPythonInterp.patch b/dev-util/cmake/files/cmake-FindPythonInterp.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-FindPythonInterp.patch @@ -0,0 +1,11 @@ +--- Modules/FindPythonInterp.cmake ++++ Modules/FindPythonInterp.cmake +@@ -7,7 +7,7 @@ + # + + FIND_PROGRAM(PYTHON_EXECUTABLE +- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python ++ NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake-FindPythonLibs.patch @@ -0,0 +1,13 @@ +--- Modules/FindPythonLibs.cmake ++++ Modules/FindPythonLibs.cmake +@@ -14,7 +14,9 @@ + # Search for the python framework on Apple. + CMAKE_FIND_FRAMEWORKS(Python) + +-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) ++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" ++ OUTPUT_VARIABLE _PYTHON_VERSION) ++FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION}) + STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) + IF(WIN32) + FIND_LIBRARY(PYTHON_DEBUG_LIBRARY diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim new file mode 100644 --- /dev/null +++ b/dev-util/cmake/files/cmake.vim @@ -0,0 +1,3 @@ +autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim +autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake +autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml new file mode 100644 --- /dev/null +++ b/dev-util/cmake/metadata.xml @@ -0,0 +1,5 @@ + + + + kde +