diff options
| author |   Justin Riley <justin.t.riley@gmail.com> | 2014-03-27 10:37:27 -0400 |
|---|---|---|
| committer | Justin Riley <justin.t.riley@gmail.com> | 2014-03-27 10:37:27 -0400 |
| commit | f5c10b6d0834c24d1f8e1bcb3d75e2c24978ef1a (patch) | |
| tree | 392beb2354b051bd17d2bc73fc7fd46c24e5f915 | |
| parent | add patched nmon-14i.ebuild (fixes #505114) (diff) | |
| download | jtriley-f5c10b6d0834c24d1f8e1bcb3d75e2c24978ef1a.tar.gz jtriley-f5c10b6d0834c24d1f8e1bcb3d75e2c24978ef1a.tar.bz2 jtriley-f5c10b6d0834c24d1f8e1bcb3d75e2c24978ef1a.zip | |
cmake-2.8.12.2: fix ncurses tinfo bug #468622
31 files changed, 2594 insertions, 0 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog new file mode 100644 index 0000000..9e2faee --- /dev/null +++ b/dev-util/cmake/ChangeLog @@ -0,0 +1,1192 @@ +# ChangeLog for dev-util/cmake +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.274 2014/03/25 09:05:03 nimiux Exp $ + + 25 Mar 2014; Chema Alonso <nimiux@gentoo.org> cmake-2.8.12.2.ebuild: + Stable for amd64 wrt bug #504794 + + 22 Mar 2014; Jeroen Roovers <jer@gentoo.org> cmake-2.8.12.2.ebuild: + Stable for HPPA (bug #504794). + + 05 Feb 2014; Michael Palimaka <kensington@gentoo.org> + +files/cmake-2.8.12.2-hppa-bootstrap.patch, cmake-2.8.12.2.ebuild: + Backport patch from upstream fixing linking during bootstrap on HPPA wrt bug + #499922. + +*cmake-2.8.12.2 (29 Jan 2014) + + 29 Jan 2014; Chris Reffett <creffett@gentoo.org> +cmake-2.8.12.2.ebuild: + Version bump + + 27 Jan 2014; Akinori Hattori <hattya@gentoo.org> cmake-2.8.11.2.ebuild: + ia64 stable wrt bug #488586 + +*cmake-2.8.12.1-r4 (24 Jan 2014) + + 24 Jan 2014; Chris Reffett <creffett@gentoo.org> +cmake-2.8.12.1-r4.ebuild, + -cmake-2.8.12.1-r2.ebuild, -cmake-2.8.12.1-r3.ebuild: + Revision bump. Fix installation of bash completion files wrt bug 498056, + credit to Alex Turbov for the fix. Drop old. + + 15 Jan 2014; Jeroen Roovers <jer@gentoo.org> + files/cmake-2.8.11.2-hppa-bootstrap.patch: + Fix HPPA bootstrap/linker patch to properly handle C++ code by Guy Martin. + +*cmake-2.8.12.1-r3 (10 Jan 2014) + + 10 Jan 2014; Michael Palimaka <kensington@gentoo.org> + +cmake-2.8.12.1-r3.ebuild: + Install vim syntax files unconditionally wrt bug #497528. + + 03 Jan 2014; Matt Turner <mattst88@gentoo.org> cmake-2.8.11.2.ebuild: + alpha stable, bug 488586. + +*cmake-2.8.12.1-r2 (14 Dec 2013) + + 14 Dec 2013; Johannes Huber <johu@gentoo.org> +cmake-2.8.12.1-r2.ebuild, + +files/cmake-2.8.12.1-FindFreetype.patch, -cmake-2.8.12.1-r1.ebuild: + Revision bump add patch by Julian Ospald <hasufell@gentoo.org> to unbreak find + logic for media-libs/freetype-2.5.1, bug #493656. + + 30 Nov 2013; Johannes Huber <johu@gentoo.org> cmake-2.8.11.2.ebuild: + x86 stable wrt bug #488586 + + 30 Nov 2013; Jeroen Roovers <jer@gentoo.org> cmake-2.8.11.2.ebuild: + Stable for HPPA (bug #488586). + + 30 Nov 2013; Johannes Huber <johu@gentoo.org> + +files/cmake-2.8.11.2-hppa-bootstrap.patch, cmake-2.8.11.2.ebuild: + Add upstream patch to fix linking while bootstrap on hppa fixes bug #473276. + +*cmake-2.8.12.1-r1 (13 Nov 2013) + + 13 Nov 2013; Johannes Huber <johu@gentoo.org> +cmake-2.8.12.1-r1.ebuild, + +files/cmake-2.8.12.1-FindImageMagick.patch, -cmake-2.8.12.1.ebuild: + Revision bump adds patch by Arfrever Frehtes Taifersar Arahesis + <arfrever.fta@gmail.com>. Patch is for compatibility with media- + gfx/imagemagick[q32] and media-gfx/imagemagick[q64] wrt bug #491124. + +*cmake-2.8.12.1 (12 Nov 2013) + + 12 Nov 2013; Johannes Huber <johu@gentoo.org> +cmake-2.8.12.1.ebuild, + -cmake-2.8.12.ebuild: + Version bump wrt bug #490194. + + 28 Oct 2013; Markus Meier <maekke@gentoo.org> cmake-2.8.11.2.ebuild: + arm stable, bug #488586 + + 26 Oct 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.11.2.ebuild: + Stable for amd64, wrt bug #488586 + + 21 Oct 2013; Fabian Groffen <grobian@gentoo.org> cmake-2.8.12.ebuild: + Fix compilation on Solaris + +*cmake-2.8.12 (21 Oct 2013) + + 21 Oct 2013; Chris Reffett <creffett@gentoo.org> +cmake-2.8.12.ebuild: + Move from KDE overlay wrt bug 487604 + + 19 Oct 2013; Johannes Huber <johu@gentoo.org> -cmake-2.8.11.1.ebuild, + -files/cmake-2.8.10-FindPythonLibs.patch, -files/cmake-2.8.10-tests.patch, + -files/cmake-2.8.10.2-qt5.patch: + Remove old. + +*cmake-2.8.11.2 (11 Sep 2013) + + 11 Sep 2013; Michael Palimaka <kensington@gentoo.org> +cmake-2.8.11.2.ebuild: + Version bump wrt bug #483150. + + 10 Jul 2013; Johannes Huber <johu@gentoo.org> + files/cmake-2.8.10.2-FindPythonLibs.patch: + Format patch with dos2unix, bug #476064. + + 14 Jun 2013; Michael Palimaka <kensington@gentoo.org> cmake-2.8.11.1.ebuild: + Fix tests by David Leverton <levertond@googlemail.com> wrt bug #467720. + + 11 Jun 2013; Fabian Groffen <grobian@gentoo.org> cmake-2.8.11.1.ebuild: + Add dropped darwin-isysroot patch to fix compilation, bug #472922 + + 10 Jun 2013; Johannes Huber <johu@gentoo.org> cmake-2.8.11.1.ebuild: + Drop qt4 default enabled wrt bug #472876. + +*cmake-2.8.11.1 (09 Jun 2013) + + 09 Jun 2013; Johannes Huber <johu@gentoo.org> +cmake-2.8.11.1.ebuild, + +files/cmake-2.8.11-FindBLAS.patch, + +files/cmake-2.8.11-FindBoost-python.patch, + +files/cmake-2.8.11-FindImageMagick.patch, + +files/cmake-2.8.11-more-no_host_paths.patch: + Version bump by several people in kde overlay. Fixes bug #436540. + + 21 May 2013; Johannes Huber <johu@gentoo.org> -cmake-2.8.10.2-r1.ebuild, + -cmake-2.8.9.ebuild, -files/cmake-2.6.3-darwin-bundle.patch, + -files/cmake-2.8.1-libform.patch, -files/cmake-2.8.4-FindPythonLibs.patch, + -files/cmake-2.8.8-tests.patch, -files/cmake-2.8.9-more-no_host_paths.patch: + Remove old. + + 20 May 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for s390, wrt bug #464648 + + 08 May 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for sh, wrt bug #464648 + + 07 May 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for ppc64, wrt bug #464648 + + 07 May 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for sparc, wrt bug #464648 + + 07 May 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for ia64, wrt bug #464648 + + 05 May 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for alpha, wrt bug #464648 + + 05 May 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for arm, wrt bug #464648 + + 03 May 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for ppc, wrt bug #464648 + + 30 Apr 2013; Jeroen Roovers <jer@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for HPPA (bug #464648). + + 27 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for x86, wrt bug #464648 + + 27 Apr 2013; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.10.2-r2.ebuild: + Stable for amd64, wrt bug #464648 + + 23 Apr 2013; Fabian Groffen <grobian@gentoo.org> + +files/cmake-2.8.10-darwin-isysroot.patch, cmake-2.8.10.2-r2.ebuild: + Fix compilation on Darwin, bug #445308 + + 15 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> cmake-2.8.9.ebuild, + cmake-2.8.10.2-r1.ebuild: + Block >=media-gfx/imagemagick-6.8 to prevent incompatible + FindImageMagick.cmake from being installed wrt #465898 + +*cmake-2.8.10.2-r2 (14 Apr 2013) + + 14 Apr 2013; Michael Palimaka <kensington@gentoo.org> + +cmake-2.8.10.2-r2.ebuild, +files/cmake-2.8.10.2-FindImageMagick.patch, + +files/cmake-2.8.10.2-FindPythonInterp.patch, + +files/cmake-2.8.10.2-FindPythonLibs.patch: + Revision bump to fix detection of python (bug #405181) and newer imagemagic + (bug #465898). + + 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> cmake-2.8.10.2-r1.ebuild, + cmake-2.8.9.ebuild: + Move Qt dependencies to the new category + + 22 Feb 2013; Zac Medico <zmedico@gentoo.org> cmake-2.8.10.2-r1.ebuild: + Add ~arm-linux keyword. + + 07 Jan 2013; Michael Palimaka <kensington@gentoo.org> + +files/cmake-2.8.10.2-qt5.patch, cmake-2.8.10.2-r1.ebuild: + Fix Qt5 automagic. + +*cmake-2.8.10.2-r1 (01 Jan 2013) + + 01 Jan 2013; Chris Reffett <creffett@gentoo.org> +cmake-2.8.10.2-r1.ebuild, + +files/cmake-2.8.10.2-implicit-include.patch, -cmake-2.8.10.2.ebuild: + Revision bump. Add patch to fix stripping implicit include dirs, bug 444340. + Add shell-script magic in ebuild to strip extra jobs values in MAKEOPTS (which + causes build failures), bug 447040. + +*cmake-2.8.10.2 (27 Nov 2012) + + 27 Nov 2012; Chris Reffett <creffett@gentoo.org> +cmake-2.8.10.2.ebuild, + -cmake-2.8.10.1.ebuild: + Version bump to 2.8.10.2, fixes bug 444906. Remove old. + +*cmake-2.8.10.1 (18 Nov 2012) + + 18 Nov 2012; Michael Palimaka <kensington@gentoo.org> +cmake-2.8.10.1.ebuild, + +files/cmake-2.8.10-FindPythonLibs.patch, + +files/cmake-2.8.10-darwin-bundle.patch, +files/cmake-2.8.10-desktop.patch, + +files/cmake-2.8.10-libform.patch, + +files/cmake-2.8.10-more-no_host_paths.patch, +files/cmake-2.8.10-tests.patch, + -cmake-2.8.9-r1.ebuild, -files/cmake-2.8.9-tests.patch: + Version bump, remove old. + +*cmake-2.8.9-r1 (02 Oct 2012) + + 02 Oct 2012; Michael Palimaka <kensington@gentoo.org> +cmake-2.8.9-r1.ebuild, + +files/cmake-2.8.9-tests.patch: + Disable TestUpload test since it requires network access, wrt bug #436188. + + 01 Oct 2012; Johannes Huber <johu@gentoo.org> -cmake-2.8.8-r3.ebuild, + -files/cmake-2.8.8-more-no_host_paths.patch, + -files/cmake-2.8.8-pkgconfig.patch: + Remove old. + + 30 Sep 2012; Raúl Porcel <armin76@gentoo.org> cmake-2.8.9.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #435730 + + 24 Sep 2012; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.9.ebuild: + Stable for X86, wrt bug #435730 + + 24 Sep 2012; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.9.ebuild: + Stable for amd64, wrt bug #435730 + + 24 Sep 2012; Jeroen Roovers <jer@gentoo.org> cmake-2.8.9.ebuild: + Stable for HPPA (bug #435730). + + 23 Sep 2012; Anthony G. Basile <blueness@gentoo.org> cmake-2.8.9.ebuild: + stable arm, bug #435730 + + 22 Sep 2012; Anthony G. Basile <blueness@gentoo.org> cmake-2.8.9.ebuild: + stable ppc ppc64, bug #435730 + + 10 Sep 2012; Johannes Huber <johu@gentoo.org> + +files/cmake-2.8.4-FindPythonLibs.patch: + Restore patch that was unfortunately dropped, bug #434524. + + 09 Sep 2012; Johannes Huber <johu@gentoo.org> -cmake-2.8.7-r5.ebuild, + -files/cmake-2.8.3-more-no_host_paths.patch, + -files/cmake-2.8.4-FindBoost.patch, -files/cmake-2.8.4-FindPythonLibs.patch, + -files/cmake-2.8.7-FindOpenMP.patch: + Remove old. + + 09 Sep 2012; Raúl Porcel <armin76@gentoo.org> cmake-2.8.8-r3.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #431520 + + 23 Aug 2012; Markus Meier <maekke@gentoo.org> cmake-2.8.8-r3.ebuild: + arm stable, bug #431520 + +*cmake-2.8.9 (19 Aug 2012) + + 19 Aug 2012; Johannes Huber <johu@gentoo.org> +cmake-2.8.9.ebuild, + +files/cmake-2.8.9-more-no_host_paths.patch: + Version bump wrt bug #431946. + + 18 Aug 2012; Johannes Huber <johu@gentoo.org> cmake-2.8.8-r3.ebuild: + Stable for x86, wrt bug #431520 + + 16 Aug 2012; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.8-r3.ebuild: + Stable for amd64, wrt bug #422021 + + 15 Aug 2012; Anthony G. Basile <blueness@gentoo.org> cmake-2.8.8-r3.ebuild: + Stable ppc, bug #431520 + + 15 Aug 2012; Anthony G. Basile <blueness@gentoo.org> cmake-2.8.8-r3.ebuild: + Stable ppc64, bug #431520 + + 15 Aug 2012; Jeroen Roovers <jer@gentoo.org> cmake-2.8.8-r3.ebuild: + Stable for HPPA (bug #431520). + + 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 + + 03 Jul 2012; Michael Palimaka <kensington@gentoo.org> cmake-2.8.6-r4.ebuild, + cmake-2.8.7-r5.ebuild: + Restrict tests wrt bug #390533 and #423637. + + 28 Jun 2012; Michael Palimaka <kensington@gentoo.org> -cmake-2.8.7-r4.ebuild, + -cmake-2.8.8-r2.ebuild, -files/cmake-2.8.3-fix_assembler_test.patch, + -files/cmake-2.8.4-FindPythonInterp.patch, -files/cmake-2.8.4-FindQt4.patch: + Remove old versions and unused patches. + + 17 Jun 2012; Fabian Groffen <grobian@gentoo.org> cmake-2.8.8-r3.ebuild: + Run bootstrap with CONFIG_SHELL or (Prefix) sh, since the script is not + /bin/sh compatible + +*cmake-2.8.8-r3 (14 Jun 2012) + + 14 Jun 2012; Michael Palimaka <kensington@gentoo.org> +cmake-2.8.8-r3.ebuild, + files/cmake-2.8.8-more-no_host_paths.patch: + Add support for x32 ABI, wrt bug #393673. Patch by Tim Harder + <radhermit@gentoo.org>. + + 23 May 2012; Brent Baude <ranger@gentoo.org> cmake-2.8.7-r5.ebuild: + Marking cmake-2.8.7-r5 ppc64 for bug 413807 + + 22 May 2012; Brent Baude <ranger@gentoo.org> cmake-2.8.7-r5.ebuild: + Marking cmake-2.8.7-r5 ppc for bug 413807 + + 16 May 2012; Jeroen Roovers <jer@gentoo.org> cmake-2.8.7-r5.ebuild: + Stable for HPPA (bug #413807). + + 12 May 2012; Alexis Ballier <aballier@gentoo.org> cmake-2.8.8-r2.ebuild: + ~amd64-fbsd keywords were dropped for no reason... rekeyword + + 12 May 2012; Markus Meier <maekke@gentoo.org> cmake-2.8.7-r5.ebuild: + arm stable, bug #413807 + + 09 May 2012; Jeff Horelick <jdhore@gentoo.org> cmake-2.8.7-r5.ebuild: + marked x86 per bug 413807 + + 09 May 2012; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.7-r5.ebuild: + Stable for amd64, wrt bug #413807 + +*cmake-2.8.8-r2 (06 May 2012) + + 06 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> + -cmake-2.8.8-r1.ebuild, +cmake-2.8.8-r2.ebuild, + +files/cmake-2.8.8-pkgconfig.patch: + Add fix for pkgconfig usage, bug 414659 and others + + 06 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.8-r1.ebuild: + Remove keywords until bug 414659 is fixed + + 02 May 2012; Jeff Horelick <jdhore@gentoo.org> cmake-2.8.6-r4.ebuild, + cmake-2.8.7-r4.ebuild, cmake-2.8.7-r5.ebuild, cmake-2.8.8-r1.ebuild: + dev-util/pkgconfig -> virtual/pkgconfig + +*cmake-2.8.8-r1 (02 May 2012) + + 02 May 2012; Johannes Huber <johu@gentoo.org> +cmake-2.8.8-r1.ebuild, + +files/cmake-2.8.8-FindPkgConfig.patch, + +files/cmake-2.8.8-more-no_host_paths.patch, +files/cmake-2.8.8-tests.patch: + Version bump by me and Chris Reffett <geekboy72@gmail.com> wrt bug #412925. + Adds patch for FindPkgConfig to respect PKG_CONFIG environment variable by + DaboD <daiderek@gmail.com> bug #414037. + + 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> cmake-2.8.7-r5.ebuild: + keyword ~amd64-fbsd + +*cmake-2.8.7-r5 (09 Mar 2012) + + 09 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org> + -cmake-2.8.7-r3.ebuild, +cmake-2.8.7-r5.ebuild, + +files/cmake-2.8.7-FindLAPACK.patch: + Respect pkg-config library path also in FindLAPACK, bug 399755; thanks to + Christoph Junghans for the patches + +*cmake-2.8.7-r4 (08 Mar 2012) + + 08 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org> + +cmake-2.8.7-r4.ebuild, +files/cmake-2.8.7-FindBLAS.patch: + Respect pkg-config library path in FindBLAS, bug 399755 + + 03 Mar 2012; Johannes Huber <johu@gentoo.org> -cmake-2.8.4-r1.ebuild, + -cmake-2.8.7-r1.ebuild, -cmake-2.8.7-r2.ebuild: + Remove old. + + 02 Mar 2012; Brent Baude <ranger@gentoo.org> cmake-2.8.6-r4.ebuild: + Marking cmake-2.8.6-r4 ppc64 for bug 391425 + +*cmake-2.8.7-r3 (06 Feb 2012) + + 06 Feb 2012; Justin Lecher <jlec@gentoo.org> +cmake-2.8.7-r3.ebuild, + +files/cmake-2.8.7-FindOpenMP.patch: + Adding patch for language selective openmp support testing, + http://public.kitware.com/Bug/view.php?id=11910 ; approved by tampakrap + +*cmake-2.8.7-r2 (30 Jan 2012) + + 30 Jan 2012; Theo Chatzimichos <tampakrap@gentoo.org> +cmake-2.8.7-r2.ebuild, + +files/cmake-2.8.7-FindBoost-python.patch: + Fix detection of PYTHON_ABI-versioned Boost Python libraries of >=dev- + libs/boost-1.48, bug 400969 + + 28 Jan 2012; Raúl Porcel <armin76@gentoo.org> cmake-2.8.6-r4.ebuild: + alpha/arm/ia64/s390/sh/sparc stable wrt #391425 + +*cmake-2.8.7-r1 (21 Jan 2012) + + 21 Jan 2012; Johannes Huber <johu@gentoo.org> +cmake-2.8.7-r1.ebuild: + Version bump wrt bug #399045. + + 04 Jan 2012; Brent Baude <ranger@gentoo.org> cmake-2.8.6-r4.ebuild: + Marking cmake-2.8.6-r4 ppc for bug 391425 + + 14 Dec 2011; Agostino Sarubbo <ago@gentoo.org> cmake-2.8.6-r4.ebuild: + Stable for AMD64, wrt bug #391425 + + 01 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> cmake-2.8.6-r4.ebuild: + x86 stable wrt bug #391425 + + 25 Nov 2011; Jeroen Roovers <jer@gentoo.org> cmake-2.8.6-r4.ebuild: + Stable for HPPA (bug #391425). + + 23 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.6-r4.ebuild, + +files/cmake-2.8.6-testsvn17.patch: + Fix test CTest.UpdateSVN with subversion-1.7, bug 390533 + + 22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> + -files/cmake-2.8.5-FindBLAS.patch, -files/cmake-2.8.5-FindLAPACK.patch, + -cmake-2.8.6-r2.ebuild, -cmake-2.8.6-r3.ebuild, + -files/cmake-2.8.6-FindBLAS.patch, -files/cmake-2.8.6-FindLAPACK.patch: + Cleanup + +*cmake-2.8.6-r4 (22 Nov 2011) + + 22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.6-r3.ebuild, + +cmake-2.8.6-r4.ebuild, +files/cmake-2.8.6-FindBLAS-2.patch: + Fix logic bug in FindBLAS patch + +*cmake-2.8.6-r3 (30 Oct 2011) + + 30 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> + +cmake-2.8.6-r3.ebuild, +files/cmake-2.8.6-CodeBlocks.patch: + Add upstream fix for QtCreator and CodeBlocks support, bug 388695 + + 30 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -cmake-2.8.5.ebuild, + -cmake-2.8.5-r2.ebuild: + Remove old + +*cmake-2.8.6-r2 (29 Oct 2011) + + 29 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> + -cmake-2.8.6-r1.ebuild, +cmake-2.8.6-r2.ebuild, + +files/cmake-2.8.6-FindLAPACK-2.patch: + Fix FindLAPACK, bug 388757 + + 19 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.6-r1.ebuild: + Fix java 7 sandbox violation, bug 387227 + +*cmake-2.8.6-r1 (15 Oct 2011) + + 15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> + +cmake-2.8.6-r1.ebuild, +files/cmake-2.8.6-FindBLAS.patch, + +files/cmake-2.8.6-FindLAPACK.patch: + Version bump (thanks johu!) + +*cmake-2.8.5-r2 (18 Jul 2011) + + 18 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.4-r1.ebuild, + cmake-2.8.5.ebuild, +cmake-2.8.5-r2.ebuild, + +files/cmake-2.8.5-FindBLAS.patch, +files/cmake-2.8.5-FindLAPACK.patch: + Patch FindBLAS and FindLAPACK to try PkgConfig first and skip all other tests + if that succeeds; prepare for additional eclass feature of automated cmake + module removal in $S, which should NOT happen in the cmake ebuild itself. + +*cmake-2.8.5 (11 Jul 2011) + + 11 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> +cmake-2.8.5.ebuild: + Version bump to 2.8.5. Recompiled everything using cmake and all tests pass. + Fixes bug #374665. Tests needs to state some deps like cvs/git/... + + 08 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -files/cmake-2.6.0-interix.patch, -files/cmake-2.6.4-FindBoost.patch, + -files/cmake-2.8.0-darwin-no-app-with-qt.patch, -cmake-2.8.1-r2.ebuild, + -files/cmake-2.8.1-FindBoost.patch, + -files/cmake-2.8.1-more-no_host_paths.patch, -files/cmake-2.8.1-mpi.patch, + -files/cmake-2.8.3-FindLibArchive.patch, + -files/cmake-2.8.3-FindPythonInterp.patch, + -files/cmake-2.8.3-FindPythonLibs.patch, + -files/cmake-2.8.3-buffer_overflow.patch, -files/cmake-FindJNI.patch, + -files/cmake-FindPythonInterp.patch, -files/cmake-FindPythonLibs.patch: + Drop older stuff. Keep just latest stable. + + 07 May 2011; Raúl Porcel <armin76@gentoo.org> cmake-2.8.4-r1.ebuild: + ia64/s390/sh/sparc stable wrt #357771 + + 02 May 2011; Thomas Kahle <tomka@gentoo.org> cmake-2.8.4-r1.ebuild: + x86 stable per bug 357771 + + 28 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cmake-2.8.4.ebuild, + cmake-2.8.4-r1.ebuild: + Move keywords from 2.8.4 to r1 (even the stable ones), because the only + change is in the cross-compilation finder, not really requiring the + restabilisation. + +*cmake-2.8.4-r1 (18 Apr 2011) + + 18 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cmake-2.8.3-r1.ebuild, + +cmake-2.8.4-r1.ebuild, +files/cmake-2.8.4-FindQt4.patch: + Revision bump to fix bug #358317. + + 07 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.4.ebuild: + Inherit virtualx.eclass to fix bug #362389 + + 27 Mar 2011; Tobias Klausmann <klausman@gentoo.org> cmake-2.8.4.ebuild: + Stable on alpha, bug #357771 + + 25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> cmake-2.8.4.ebuild: + ppc64 stable wrt #357771 + + 21 Mar 2011; Brent Baude <ranger@gentoo.org> cmake-2.8.4.ebuild: + Marking cmake-2.8.4 ppc for bug 357771 + + 18 Mar 2011; Markus Meier <maekke@gentoo.org> cmake-2.8.4.ebuild: + arm stable, bug #357771 + + 09 Mar 2011; Jeroen Roovers <jer@gentoo.org> cmake-2.8.4.ebuild: + Stable for HPPA (bug #357771). + + 08 Mar 2011; Markos Chandras <hwoarang@gentoo.org> cmake-2.8.4.ebuild: + Stable on amd64 wrt bug #357771 + + 07 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.4.ebuild: + Revert to eapi3 for now so it can go stable. + + 23 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.4.ebuild: + Use only one -E exclude parameter, obviously duplication is not working. + + 21 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.4.ebuild: + Exclude sdcc test. + + 21 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.4.ebuild: + Exclude bootstraptest because it is pointless for us. + +*cmake-2.8.4 (21 Feb 2011) + + 21 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> +cmake-2.8.4.ebuild, + +files/cmake-2.8.4-FindBoost.patch, + +files/cmake-2.8.4-FindPythonInterp.patch, + +files/cmake-2.8.4-FindPythonLibs.patch: + Version bump to the latest (some tests still fail, to be fixed). + + 17 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.3-r1.ebuild: + Fix tests per bug #315223. + + 26 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> -cmake-2.6.4-r3.ebuild, + -cmake-2.8.3.ebuild: + old + + 25 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.3-r1.ebuild, + +files/cmake-2.8.3-fix_assembler_test.patch: + Fix assembler test bug #338627. Thanks to Anthony (blueness) for the + solution. + +*cmake-2.8.3-r1 (25 Dec 2010) + + 25 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> +cmake-2.8.3-r1.ebuild, + +files/cmake-2.8.3-buffer_overflow.patch, + +files/cmake-2.8.3-ruby_libname.patch: + Fix ruby finding per bug #345993 and buffer overflowing per bug #329043. + + 20 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.3.ebuild: + Fix dependency on libarchive version. Fixes bug #348887. + + 16 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.1-r2.ebuild, + cmake-2.8.3.ebuild: + Fix malformed headers + +*cmake-2.8.3 (16 Dec 2010) + + 16 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> +cmake-2.8.3.ebuild, + +files/cmake-2.8.3-FindLibArchive.patch, + +files/cmake-2.8.3-FindPythonInterp.patch, + +files/cmake-2.8.3-FindPythonLibs.patch, + +files/cmake-2.8.3-more-no_host_paths.patch: + Version bump. Per bug #344259. Thanks to Arseny Solokha for updated patches. + + 11 Sep 2010; Raúl Porcel <armin76@gentoo.org> cmake-2.8.1-r2.ebuild: + ia64/s390/sh/sparc stable wrt #325845 + + 10 Sep 2010; Tobias Klausmann <klausman@gentoo.org> cmake-2.8.1-r2.ebuild: + Stable on alpha, bug #325845 + + 11 Aug 2010; Markus Meier <maekke@gentoo.org> cmake-2.8.1-r2.ebuild: + arm stable, bug #325845 + + 10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -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 <fauli@gentoo.org> + cmake-2.8.1-r2.ebuild: + stable x86, bug 325845 + + 06 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> cmake-2.8.1-r2.ebuild: + Run bootstrap with FEATURES="test" wrt #315223 by Thomas Kahle. + + 27 Jul 2010; Jeroen Roovers <jer@gentoo.org> cmake-2.8.1-r2.ebuild: + Stable for HPPA PPC (bug #325845). + + 07 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org> cmake-2.8.1-r2.ebuild: + export JAVA_HOME gathered from java-config, bug 315229 + + 06 Jul 2010; Markos Chandras <hwoarang@gentoo.org> cmake-2.8.1-r2.ebuild: + Stable on amd64 wrt bug #325845 + + 04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> cmake-2.8.1-r2.ebuild: + ppc64 stable wrt #325845 + +*cmake-2.8.1-r2 (27 May 2010) + + 27 May 2010; Justin Lecher <jlec@gentoo.org> 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 <scarabeus@gentoo.org> + -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 <grobian@gentoo.org> 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 <scarabeus@gentoo.org> +cmake-2.8.1.ebuild: + Version bump. + +*cmake-2.8.0-r3 (17 Mar 2010) + + 17 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org> -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 <grobian@gentoo.org> cmake-2.8.0-r2.ebuild: + Marked ~x64-macos, thanks Ramon van Alteren, bug #305367 + + 10 Feb 2010; Fabian Groffen <grobian@gentoo.org> 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 <grobian@gentoo.org> +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 <scarabeus@gentoo.org> + cmake-2.8.0-r1.ebuild: + Fix typo. + +*cmake-2.8.0-r1 (24 Jan 2010) + + 24 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> + +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 <abcd@gentoo.org> + +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 <abcd@gentoo.org> -cmake-2.6.4.ebuild, + -cmake-2.6.4-r1.ebuild: + Drop old ebuilds + + 29 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> 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 <armin76@gentoo.org> cmake-2.6.4-r3.ebuild: + ia64/s390/sh/sparc stable wrt #290723 + + 19 Nov 2009; Markus Meier <maekke@gentoo.org> cmake-2.6.4-r3.ebuild: + arm stable, bug #290723 + + 18 Nov 2009; Brent Baude <ranger@gentoo.org> 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 <scarabeus@gentoo.org> + -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 <jer@gentoo.org> cmake-2.6.4-r3.ebuild: + Stable for HPPA (bug #290723). + + 08 Nov 2009; Tobias Klausmann <klausman@gentoo.org> cmake-2.6.4-r3.ebuild: + Stable on alpha, bug #290723 + + 08 Nov 2009; Mounir Lamouri <volkmar@gentoo.org> 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 <cryos@gentoo.org> -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 <maekke@gentoo.org> cmake-2.6.4-r3.ebuild: + amd64/x86 stable, bug #290723 + + 19 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> + -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 <cryos@gentoo.org> -cmake-2.8.0_rc2.ebuild, + +cmake-2.8.0_rc3.ebuild: + Version bump, new rc. + + 05 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> 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 <cryos@gentoo.org> -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 <arfrever@gentoo.org> + -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 <cryos@gentoo.org> +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 <arfrever@gentoo.org> + +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 <cryos@gentoo.org> 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 <arfrever@gentoo.org> + 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 <arfrever@gentoo.org> + +cmake-2.6.4-r1.ebuild, +files/cmake-2.6.4-FindBoost.patch: + Support more Boost versions. + + 31 May 2009; Markus Meier <maekke@gentoo.org> cmake-2.6.4.ebuild: + amd64 stable, bug #271444 + + 31 May 2009; Brent Baude <ranger@gentoo.org> cmake-2.6.4.ebuild: + Marking cmake-2.6.4 ppc64 for bug 271444 + + 30 May 2009; nixnut <nixnut@gentoo.org> cmake-2.6.4.ebuild: + ppc stable #271444 + + 30 May 2009; Raúl Porcel <armin76@gentoo.org> cmake-2.6.4.ebuild: + alpha/arm/ia64/s390/sh stable wrt #271444 + + 28 May 2009; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.6.4.ebuild: + Add einfo informing about the test that might fail. + + 28 May 2009; Christian Faulhammer <fauli@gentoo.org> cmake-2.6.4.ebuild: + stable x86, bug 271444 + + 28 May 2009; Ferris McCormick <fmccor@gentoo.org> cmake-2.6.4.ebuild: + Sparc stable, Bug #271444 (which see for comments). + + 27 May 2009; Jeroen Roovers <jer@gentoo.org> cmake-2.6.4.ebuild: + Stable for HPPA (bug #271444). + + 03 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + cmake-2.6.4.ebuild: + Fix syntax. + + 03 May 2009; Marcus D. Hanwell <cryos@gentoo.org> cmake-2.6.4: + Fixed to the bootstrap logic. + +*cmake-2.6.4 (02 May 2009) + + 02 May 2009; Marcus D. Hanwell <cryos@gentoo.org> +cmake-2.6.4.ebuild: + Version bump, applied patch from bug 266383. + + 13 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> cmake-2.6.3-r1.ebuild: + Fix the has_version check. Current eclass does not support cmake 2.4... + + 11 Apr 2009; Joshua Kinard <kumba@gentoo.org> cmake-2.6.3-r1.ebuild: + Added ~mips to KEYWORDS. + +*cmake-2.6.3-r1 (04 Apr 2009) + + 04 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> + -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 <scarabeus@gentoo.org> -cmake-2.4.6-r1.ebuild, + -cmake-2.6.2.ebuild: + Remove old. + + 14 Mar 2009; Raúl Porcel <armin76@gentoo.org> cmake-2.6.2-r1.ebuild: + arm/ia64/s390/sh/sparc stable wrt #259741 + + 11 Mar 2009; Brent Baude <ranger@gentoo.org> cmake-2.6.2-r1.ebuild: + Marking cmake-2.6.2-r1 ppc64 for bug 259741 + + 08 Mar 2009; Markus Meier <maekke@gentoo.org> cmake-2.6.2-r1.ebuild: + x86 stable, bug #259741 + + 07 Mar 2009; Jeremy Olexa <darkside@gentoo.org> cmake-2.6.2-r1.ebuild: + amd64 stable, bug 259741 + + 01 Mar 2009; nixnut <nixnut@gentoo.org> cmake-2.6.2-r1.ebuild: + ppc stable #259741 + +*cmake-2.6.3 (01 Mar 2009) + + 01 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> +cmake-2.6.3.ebuild: + Version bump. + + 22 Feb 2009; Tobias Klausmann <klausman@gentoo.org> cmake-2.6.2-r1.ebuild: + Stable on alpha, bug #259741 + + 20 Feb 2009; Jeroen Roovers <jer@gentoo.org> cmake-2.6.2-r1.ebuild: + Stable for HPPA (bug #259741). + + 03 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> cmake-2.6.2-r1.ebuild: + Fix src_configure. Per bug #254898. + + 21 Jan 2009; Markus Meier <maekke@gentoo.org> cmake-2.4.8.ebuild: + amd64/x86 stable + +*cmake-2.6.2-r1 (03 Jan 2009) + + 03 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> + +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 <scarabeus@gentoo.org> + -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 <cryos@gentoo.org> -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 <tgurr@gentoo.org> + +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 <cryos@gentoo.org> + +files/cmake-FindPythonLibs.patch, +cmake-2.6.0.ebuild: + Version bump, masked for now until it receives wider testing. + + 22 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -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ò <flameeyes@gentoo.org> 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 <zlin@gentoo.org> +cmake-2.4.8.ebuild: + Version bump (bug #208618). + +*cmake-2.4.8_rc12 (14 Jan 2008) + + 14 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org> + +cmake-2.4.8_rc12.ebuild: + Bump to latest RC. + + 13 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org> + 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 <philantrop@gentoo.org> + 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 <phreak@gentoo.org> 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 <philantrop@gentoo.org> + +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 <philantrop@gentoo.org> + +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 <cryos@gentoo.org> 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 <cryos@gentoo.org> +cmake-2.4.7.ebuild: + Version bump. + + 26 Jun 2007; Lars Weiler <pylon@gentoo.org> cmake-2.4.6-r1.ebuild: + Stable on ppc; bug #182724. + + 21 Jun 2007; Raúl Porcel <armin76@gentoo.org> cmake-2.4.6-r1.ebuild: + alpha/ia64/x86 stable wrt #182724 + + 21 Jun 2007; Jeroen Roovers <jer@gentoo.org> cmake-2.4.6-r1.ebuild: + Stable for HPPA (bug #182724). + + 21 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> cmake-2.4.6-r1.ebuild: + Stable on sparc wrt #182724 + + 21 Jun 2007; Joshua Kinard <kumba@gentoo.org> cmake-2.4.6-r1.ebuild: + Stable on mips, per #182724. + + 20 Jun 2007; Christoph Mende <angelos@gentoo.org> cmake-2.4.6-r1.ebuild: + Stable on amd64 wrt bug 182724 + + 20 Jun 2007; Markus Rothe <corsair@gentoo.org> 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 <philantrop@gentoo.org> + +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ò <flameeyes@gentoo.org> +cmake-2.4.6.ebuild: + Version bump, closes bug #163487. + + 04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> cmake-2.0.6-r1.ebuild: + Get rid of debug.eclass usage. + + 16 Dec 2006; Stefan Schweizer <genstef@gentoo.org> cmake-2.4.5.ebuild: + inherit qt3 to avoid sandbox violations thanks to Johannes Hirte + <johannes-hirte@web.de> and Mike Arthur <mike@mikearthur.co.uk> in bug + 158161 + +*cmake-2.4.5 (13 Dec 2006) + + 13 Dec 2006; Stefan Schweizer <genstef@gentoo.org> + -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 <jer@gentoo.org> cmake-2.4.3.ebuild: + Stable for HPPA (bug #155307). + + 06 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> cmake-2.4.3.ebuild: + Stable on Alpha. + + 01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> cmake-2.4.3.ebuild: + Stable on sparc wrt #155307 + + 30 Nov 2006; Markus Rothe <corsair@gentoo.org> cmake-2.4.3.ebuild: + Stable on ppc64; bug #155307 + + 30 Nov 2006; Christian Faulhammer <opfer@gentoo.org> cmake-2.4.3.ebuild: + stable x86, bug #155307 + + 30 Nov 2006; Lars Weiler <pylon@gentoo.org> cmake-2.4.3.ebuild: + Stable on ppc; bug #155307. + + 29 Nov 2006; Steve Dibb <beandog@gentoo.org> 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 <genstef@gentoo.org> +cmake-2.4.4.ebuild: + Version bump thanks to Didier Link <didier.link@wanadoo.fr> in bug 156582 + + 21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> cmake-2.2.1.ebuild: + ppc stable + + 24 Sep 2006; Daniel Black <dragonheart@gentoo.org> metadata.xml: + herd kde to take maintainence thanks Diego + +*cmake-2.4.3 (16 Sep 2006) + + 16 Sep 2006; Daniel Black <dragonheart@gentoo.org> +cmake-2.4.3.ebuild: + version bump as per bug #143337 thanks to Nick Bowler et al + + 20 Jul 2006; <psi29a@gentoo.org> cmake-2.0.6-r1.ebuild: + stable on mips + +*cmake-2.4.2-r1 (30 Jun 2006) + + 30 Jun 2006; Daniel Black <dragonheart@gentoo.org> + +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ò <flameeyes@gentoo.org> cmake-2.4.2.ebuild: + Add ~x86-fbsd keyword. + +*cmake-2.4.2 (24 May 2006) + + 24 May 2006; Daniel Black <dragonheart@gentoo.org> + +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 <weeve@gentoo.org> cmake-2.0.6-r1.ebuild: + Stable on SPARC. + + 06 Feb 2006; Aron Griffis <agriffis@gentoo.org> cmake-2.2.1.ebuild: + Mark 2.2.1 stable on alpha + + 04 Feb 2006; Aron Griffis <agriffis@gentoo.org> cmake-2.2.1.ebuild: + Mark 2.2.1 stable on ia64 + +*cmake-2.2.3 (16 Jan 2006) + + 16 Jan 2006; Lisa Seelye <lisa@gentoo.org> + +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 <lisa@gentoo.org> + +files/cmake-2.2.2-rpath-fix.patch, +cmake-2.2.2.ebuild: + version bump to solve bug #111881 + + 29 Oct 2005; Daniel Goller <morfic@gentoo.org> cmake-2.2.1.ebuild: + Stable on amd64 + + 02 Oct 2005; Daniel Black <dragonheart@gentoo.org> -cmake-2.0.5.ebuild, + -cmake-2.0.6.ebuild: + remove rpath vulnerable versions: bug 105721 + + 02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> cmake-2.0.6-r1.ebuild: + Stable on ia64, bug 105721. + + 29 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> cmake-2.0.6-r1.ebuild: + stable on alpha wrt bug #105721 + + 26 Sep 2005; Stefan Briesenick <sbriesen@gentoo.org> 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 <dragonheart@gentoo.org> + +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 <hansmi@gentoo.org> cmake-2.0.6.ebuild: + Stable on ppc. + + 23 Aug 2005; Aron Griffis <agriffis@gentoo.org> cmake-2.0.6.ebuild: + stable on ia64 + +*cmake-2.2.0 (20 Aug 2005) + + 20 Aug 2005; Daniel Black <dragonheart@gentoo.org> -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 <ka0ttic@gentoo.org> cmake-2.0.6.ebuild: + Added ~mips. + + 02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> cmake-2.0.5.ebuild: + Stable on alpha. + + 12 May 2005; Aron Griffis <agriffis@gentoo.org> cmake-2.0.6.ebuild: + add ~ia64 + + 24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> cmake-2.0.5.ebuild: + Stable on ppc. + +*cmake-2.0.6 (21 Apr 2005) + + 21 Apr 2005; Daniel Black <dragonheart@gentoo.org> +metadata.xml, + +cmake-2.0.6.ebuild: + Version bump as per bug #89394. Thanks to david somers + <dsomers@treSPAM_FREEvezel.com> + + 23 Mar 2005; Daniel Black <dragonheart@gentoo.org> -cmake-2.0.2.ebuild, + cmake-2.0.5.ebuild: + x86 stable as per bug #86292. Old version removal. Thanks to david somers + <dsomers@trevezel.com> + + 18 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> cmake-2.0.3.ebuild: + Stable on alpha. + +*cmake-2.0.5 (01 Jan 2005) + + 01 Jan 2005; Daniel Black <dragonheart@gentoo.org> -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 <dsomers@trevezel.com> for + the notification. + + 31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 24 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> cmake-2.0.3.ebuild: + Added to ~amd64, bug #72299 + +*cmake-2.0.3 (10 Aug 2004) + + 10 Aug 2004; Mike Frysinger <vapier@gentoo.org> +cmake-2.0.3.ebuild: + Version bump. + +*cmake-2.0.2 (02 Jul 2004) + + 02 Jul 2004; Lisa Seelye <lisa@gentoo.org> +cmake-2.0.2.ebuild: + version bump for bug #55558 + + 03 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> cmake-1.8.3.ebuild: + Stable on alpha. + +*cmake-1.8.3 (24 Feb 2004) + + 24 Feb 2004; Lisa Seelye <lisa@gentoo.org> 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 <lisa@gentoo.org> cmake-1.8.2.ebuild: + Version bump, closes bug #36619. + +*cmake-1.8.1 (08 Dec 2003) + + 08 Dec 2003; Lisa Seelye <lisa@gentoo.org> cmake-1.8.1.ebuild: + Initial checkin. Submitted by Sam Yates <sam@quux.dropbear.id.au> to close bug + 25334. diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest new file mode 100644 index 0000000..8cb098b --- /dev/null +++ b/dev-util/cmake/Manifest @@ -0,0 +1 @@ +DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29 diff --git a/dev-util/cmake/cmake-2.8.12.2.ebuild b/dev-util/cmake/cmake-2.8.12.2.ebuild new file mode 100644 index 0000000..a4d9097 --- /dev/null +++ b/dev-util/cmake/cmake-2.8.12.2.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2.ebuild,v 1.4 2014/03/25 09:05:03 nimiux Exp $ + +EAPI=5 + +CMAKE_REMOVE_MODULES="no" +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx + +MY_PV=${PV/_/-} +MY_P=${PN}-${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 ~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" +SLOT="0" +IUSE="emacs ncurses qt4 qt5" + +REQUIRED_USE="?? ( qt4 qt5 )" + +DEPEND=" + >=app-arch/libarchive-2.8.0:= + >=dev-libs/expat-2.0.1 + >=net-misc/curl-7.20.0-r1[ssl] + sys-libs/zlib + virtual/pkgconfig + ncurses? ( sys-libs/ncurses ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +RDEPEND="${DEPEND} + emacs? ( virtual/emacs ) +" + +S="${WORKDIR}/${MY_P}" + +SITEFILE="50${PN}-gentoo.el" + +CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch + "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch + "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch + "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch + "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch + "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch + "${FILESDIR}"/${PN}-2.8.10-desktop.patch + "${FILESDIR}"/${PN}-2.8.10-libform.patch + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch + "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch + "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch + "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch + "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch + "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch + "${FILESDIR}"/${PN}-2.8.12.2-FindCurses.patch +) + +cmake_src_bootstrap() { + # Cleanup args to extract only JOBS. + # Because bootstrap does not know anything else. + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null + if [ $? -eq 0 ]; then + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') + par_arg="--parallel=${par_arg}" + else + par_arg="--parallel=1" + fi + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die + fi + + tc-export CC CXX LD + + # bootstrap script isn't exactly /bin/sh compatible + ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + ${par_arg} \ + || die "Bootstrap failed" +} + +cmake_src_test() { + # fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:#IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + pushd "${BUILD_DIR}" > /dev/null + + local ctestargs + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # CTest.updatecvs, which fails to commit as root + # Qt4Deploy, which tries to break sandbox and ignores prefix + # TestUpload, which requires network access + "${BUILD_DIR}"/bin/ctest ${ctestargs} \ + -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ + || die "Tests failed" + + popd > /dev/null +} + +pkg_setup() { + # bug 387227 + addpredict /proc/self/coredump_filter +} + +src_prepare() { + cmake-utils_src_prepare + + # disable running of cmake in boostrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + + cmake_src_bootstrap +} + +src_configure() { + # 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) + ) + + if use qt4 || use qt5 ; then + mycmakeargs+=( + -DBUILD_QtDialog=ON + $(cmake-utils_use_find_package qt5 Qt5Widgets) + ) + fi + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use emacs && elisp-compile 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 + + 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}/${PN}.vim" + + dobashcomp Docs/bash-completion/{${PN},ctest,cpack} + rm -rf "${D}/usr/share/cmake/completions" || die +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el new file mode 100644 index 0000000..e4a1a6d --- /dev/null +++ b/dev-util/cmake/files/50cmake-gentoo.el @@ -0,0 +1,4 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) +(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) +(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch new file mode 100644 index 0000000..02c3011 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch @@ -0,0 +1,39 @@ +http://public.kitware.com/Bug/view.php?id=7933 + +diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx +--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 ++++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 +@@ -38,6 +38,13 @@ + int main() { return 0; } + #endif + ++#ifdef TEST_KWSYS_LFS_SUPPORT ++#define _LARGE_FILES ++#include <iostream> ++int main() { return 0; } ++#endif ++ ++ + #ifdef TEST_KWSYS_IOS_HAVE_STD + #include <iosfwd> + void f(std ::ostream*) {} +diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap +--- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 ++++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 +@@ -1005,6 +1005,16 @@ + echo "${cmake_cxx_compiler} does not have stl iterator_traits" + fi + ++if cmake_try_run "${cmake_cxx_compiler}" \ ++ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ ++ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then ++ KWSYS_LFS_AVAILABLE=1 ++ echo "LFS support available" ++else ++ KWSYS_LFS_AVAILABLE=0 ++ echo "LFS support unavailable, disabled" ++fi ++ + if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then + if cmake_try_run "${cmake_cxx_compiler}" \ + "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch new file mode 100644 index 0000000..ceb205f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch @@ -0,0 +1,19 @@ +Patch by Heiko Przybyl + +--- Source/cmComputeLinkInformation.cxx ++++ Source/cmComputeLinkInformation.cxx +@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge + for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); + ri != runtimeDirs.end(); ++ri) + { ++ // Do not add duplicates. ++ // I'd like to have that check already in the list generation code ++ // but that would need lots of more changes, even in ExpandListArgument(). ++ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) ++ { ++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; ++ continue; ++ } + // Separate from previous path. + rpath += sep; + sep = this->GetRuntimeSep().c_str(); diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch new file mode 100644 index 0000000..4ef0c7b --- /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.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch new file mode 100644 index 0000000..9cb4777 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch @@ -0,0 +1,23 @@ +Don't use .so for modules on darwin/macos. Use .bundle instead. +Patch by Heiko Przybyl + +--- Modules/Platform/Darwin.cmake ++++ Modules/Platform/Darwin.cmake +@@ -26,7 +26,7 @@ + set(CMAKE_SHARED_LIBRARY_PREFIX "lib") + set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") + set(CMAKE_SHARED_MODULE_PREFIX "lib") +-set(CMAKE_SHARED_MODULE_SUFFIX ".so") ++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") + set(CMAKE_MODULE_EXISTS 1) + set(CMAKE_DL_LIBS "") + +@@ -48,7 +48,7 @@ + set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") + set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") + set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") +-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") ++set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") + + # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree + # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch new file mode 100644 index 0000000..97c93aa --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch @@ -0,0 +1,50 @@ +Do not detect Xcode and set -isysroot for its SDK, since that messes up +our toolchain, and hence makes any compilation fail, bug #445308 + +--- Modules/Platform/Darwin.cmake ++++ Modules/Platform/Darwin.cmake +@@ -60,18 +60,18 @@ + endif() + + # Ask xcode-select where to find /Developer or fall back to ancient location. +-execute_process(COMMAND xcode-select -print-path +- OUTPUT_VARIABLE _stdout +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_VARIABLE _stderr +- RESULT_VARIABLE _failed) +-if(NOT _failed AND IS_DIRECTORY ${_stdout}) +- set(OSX_DEVELOPER_ROOT ${_stdout}) +-elseif(IS_DIRECTORY "/Developer") +- set(OSX_DEVELOPER_ROOT "/Developer") +-else() ++#execute_process(COMMAND xcode-select -print-path ++# OUTPUT_VARIABLE _stdout ++# OUTPUT_STRIP_TRAILING_WHITESPACE ++# ERROR_VARIABLE _stderr ++# RESULT_VARIABLE _failed) ++#if(NOT _failed AND IS_DIRECTORY ${_stdout}) ++# set(OSX_DEVELOPER_ROOT ${_stdout}) ++#elseif(IS_DIRECTORY "/Developer") ++# set(OSX_DEVELOPER_ROOT "/Developer") ++#else() + set(OSX_DEVELOPER_ROOT "") +-endif() ++#endif() + + execute_process(COMMAND sw_vers -productVersion + OUTPUT_VARIABLE CURRENT_OSX_VERSION +@@ -91,10 +91,10 @@ + # CMAKE_OSX_DEPLOYMENT_TARGET + + # Set cache variable - end user may change this during ccmake or cmake-gui configure. +-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) +- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING +- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") +-endif() ++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) ++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING ++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") ++#endif() + + #---------------------------------------------------------------------------- + # CMAKE_OSX_SYSROOT diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch new file mode 100644 index 0000000..e0cefa9 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-desktop.patch @@ -0,0 +1,13 @@ +diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop +index 645eb76..7be495f 100644 +--- a/Source/QtDialog/CMake.desktop ++++ b/Source/QtDialog/CMake.desktop +@@ -3,7 +3,7 @@ Version=1.0 + Name=CMake + Comment=Cross-platform buildsystem + Exec=cmake-gui %f +-Icon=CMakeSetup32.png ++Icon=CMakeSetup32 + Terminal=false + X-MultipleArgs=false + Type=Application diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch new file mode 100644 index 0000000..052cc30 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea1c033..ae479ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) + else () + set(BUILD_CursesDialog 0) + endif () +- if(BUILD_CursesDialog) +- add_subdirectory(Source/CursesDialog/form) +- endif() + endmacro () + + #----------------------------------------------------------------------- +diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt +index 96e28b4..4102379 100644 +--- a/Source/CursesDialog/CMakeLists.txt ++++ b/Source/CursesDialog/CMakeLists.txt +@@ -25,13 +25,16 @@ set( CURSES_SRCS + CursesDialog/ccmake + ) + +-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form +- ${CMake_BINARY_DIR}/Source/CursesDialog/form) + include_directories(${CURSES_INCLUDE_PATH}) + + + add_executable(ccmake ${CURSES_SRCS} ) + target_link_libraries(ccmake CMakeLib) +-target_link_libraries(ccmake cmForm) ++TARGET_LINK_LIBRARIES(ccmake form) ++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) ++IF(CURSES_EXTRA_LIBRARY) ++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) ++ENDIF(CURSES_EXTRA_LIBRARY) ++ + + install_targets(/bin ccmake) +diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h +index b157a28..f131ea4 100644 +--- a/Source/CursesDialog/cmCursesStandardIncludes.h ++++ b/Source/CursesDialog/cmCursesStandardIncludes.h +@@ -15,8 +15,6 @@ + #define _MSE_INT_H + #endif + +-#include <cmFormConfigure.h> +- + #if defined(__hpux) + # define _BOOL_DEFINED + # include <sys/time.h> diff --git a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch new file mode 100644 index 0000000..88927a3 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch @@ -0,0 +1,134 @@ +From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 +From: Michael Palimaka <kensington@gentoo.org> +Date: Tue, 6 Nov 2012 23:35:34 +1100 +Subject: [PATCH] Set some proper paths to make cmake find our tools. + +The ebuild now adds an extra / at the end of $EPREFIX so that it is +never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains +correct) + +Original patch by Heiko Przybyl. +Updated by Chris Reffett (cmake-2.8.8) +Updated by Johannes Huber (cmake-2.8.9) +Updated by Michael Palimaka (cmake-2.8.10) +--- + Modules/Platform/Darwin.cmake | 12 +++++++---- + Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++-------------------- + 2 files changed, 29 insertions(+), 26 deletions(-) + +diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake +index a401762..775e547 100644 +--- a/Modules/Platform/Darwin.cmake ++++ b/Modules/Platform/Darwin.cmake +@@ -251,24 +251,28 @@ set(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK + "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>") + + +-# default to searching for frameworks first ++# default to searching for frameworks last + if(NOT DEFINED CMAKE_FIND_FRAMEWORK) +- set(CMAKE_FIND_FRAMEWORK FIRST) ++ set(CMAKE_FIND_FRAMEWORK LAST) + endif() + # 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 ++# default to searching for application bundles last + if(NOT DEFINED CMAKE_FIND_APPBUNDLE) +- set(CMAKE_FIND_APPBUNDLE FIRST) ++ set(CMAKE_FIND_APPBUNDLE LAST) + endif() + # set up the default search directories for application bundles + set(_apps_paths) + foreach(_path ++ @GENTOO_PORTAGE_EPREFIX@Applications ++ @GENTOO_PORTAGE_EPREFIX@usr/bin + "~/Applications" + "/Applications" + "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index ccb2663..0501d53 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) + # search types. + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard ++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ + /usr/local /usr / + + # CMake install location +@@ -44,43 +45,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH + + # List common include file locations not under the common prefixes. + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include ++ @GENTOO_PORTAGE_EPREFIX@usr/include + ) + + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib ++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc ++ @GENTOO_PORTAGE_GCCLIBDIR@ ++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 ++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib ++ @GENTOO_PORTAGE_EPREFIX@lib + ) + + list(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ @GENTOO_PORTAGE_EPREFIX@usr/bin ++ @GENTOO_PORTAGE_EPREFIX@bin + ) + + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /usr/lib /usr/lib32 /usr/lib64 ++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc ++ @GENTOO_PORTAGE_GCCLIBDIR@ ++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 ++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib ++ @GENTOO_PORTAGE_EPREFIX@lib ++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 + ) + + list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ++ @GENTOO_PORTAGE_EPREFIX@usr/include + /usr/include + ) + list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ++ @GENTOO_PORTAGE_EPREFIX@usr/include + /usr/include + ) + +-- +1.8.0 + diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch new file mode 100644 index 0000000..6a79a58 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch @@ -0,0 +1,34 @@ +http://bugs.gentoo.org/465898 + +--- Modules/FindImageMagick.cmake ++++ Modules/FindImageMagick.cmake +@@ -81,7 +81,7 @@ + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES +- ImageMagick ++ ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." + ) + find_library(ImageMagick_${component}_LIBRARY +@@ -147,17 +147,17 @@ + ) + if(component STREQUAL "Magick++") + FIND_IMAGEMAGICK_API(Magick++ Magick++.h +- Magick++ CORE_RL_Magick++_ ++ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) + elseif(component STREQUAL "MagickWand") + FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h +- Wand MagickWand CORE_RL_wand_ ++ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) + elseif(component STREQUAL "MagickCore") + FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h +- Magick MagickCore CORE_RL_magick_ ++ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) + else() diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch new file mode 100644 index 0000000..a7e8688 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch @@ -0,0 +1,22 @@ +--- Modules/FindPythonInterp.cmake ++++ Modules/FindPythonInterp.cmake +@@ -60,6 +60,10 @@ + + list(APPEND _Python_NAMES python) + ++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ set(_Python_NAMES python) ++endif() ++ + # Search for the current active python version first + find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) + +@@ -76,7 +80,7 @@ + unset(_PYTHON3_VERSIONS) + + # Search for newest python version if python executable isn't found +-if(NOT PYTHON_EXECUTABLE) ++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) + foreach(_CURRENT_VERSION ${_Python_VERSIONS}) + set(_Python_NAMES python${_CURRENT_VERSION}) + if(WIN32) diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch new file mode 100644 index 0000000..2a83ff7 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch @@ -0,0 +1,24 @@ +diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +index bffa9fb..8fc90ee 100644 +--- a/Modules/FindPythonLibs.cmake ++++ b/Modules/FindPythonLibs.cmake +@@ -74,6 +74,19 @@ set(_Python_VERSIONS + ${_PYTHON_FIND_OTHER_VERSIONS} + ) + ++# Gentoo portage requires that you use exactly the given python version ++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" ++ OUTPUT_VARIABLE _Gentoo_Python_VERSION) ++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) ++ if (_Gentoo_Python_INDEX EQUAL -1) ++ # the current Gentoo python version is not compatible with what is requested ++ set(_Python_VERSIONS) ++ else () ++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}") ++ endif () ++endif() ++ + unset(_PYTHON_FIND_OTHER_VERSIONS) + unset(_PYTHON1_VERSIONS) + unset(_PYTHON2_VERSIONS) diff --git a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch b/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch new file mode 100644 index 0000000..f0ea5e8 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch @@ -0,0 +1,139 @@ +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx +@@ -1329,7 +1329,9 @@ std::string cmLocalGenerator::GetIncludeFlags( + void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, + cmGeneratorTarget* target, + const char* lang, +- const char *config) ++ const char *config, ++ bool stripImplicitInclDirs ++ ) + { + // Need to decide whether to automatically include the source and + // binary directories at the beginning of the include path. +@@ -1404,18 +1406,21 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, + return; + } + +- // Load implicit include directories for this language. +- std::string impDirVar = "CMAKE_"; +- impDirVar += lang; +- impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES"; +- if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str())) ++ if (stripImplicitInclDirs) + { +- std::vector<std::string> impDirVec; +- cmSystemTools::ExpandListArgument(value, impDirVec); +- for(std::vector<std::string>::const_iterator i = impDirVec.begin(); +- i != impDirVec.end(); ++i) ++ // Load implicit include directories for this language. ++ std::string impDirVar = "CMAKE_"; ++ impDirVar += lang; ++ impDirVar += "_IMPLICIT_INCLUDE_DIRECTORIES"; ++ if(const char* value = this->Makefile->GetDefinition(impDirVar.c_str())) + { +- emitted.insert(*i); ++ std::vector<std::string> impDirVec; ++ cmSystemTools::ExpandListArgument(value, impDirVec); ++ for(std::vector<std::string>::const_iterator i = impDirVec.begin(); ++ i != impDirVec.end(); ++i) ++ { ++ emitted.insert(*i); ++ } + } + } + +--- a/Source/cmLocalGenerator.h ++++ b/Source/cmLocalGenerator.h +@@ -212,7 +212,8 @@ public: + /** Get the include flags for the current makefile and language. */ + void GetIncludeDirectories(std::vector<std::string>& dirs, + cmGeneratorTarget* target, +- const char* lang = "C", const char *config = 0); ++ const char* lang = "C", const char *config = 0, ++ bool stripImplicitInclDirs = true); + + /** Compute the language used to compile the given source file. */ + const char* GetSourceFileLanguage(const cmSourceFile& source); +--- a/Source/cmQtAutomoc.cxx ++++ b/Source/cmQtAutomoc.cxx +@@ -212,36 +212,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) + } + + +- const char* qtIncDir = 0; +- const char* qtCoreIncDir = 0; +- +- // check whether ${QT_INCLUDE_DIR} is part of the implicit include dirs, +- // see http://public.kitware.com/Bug/view.php?id=13667 +- bool qtIncludeDirMayHaveBeenRemoved = false; +- if (makefile->IsSet("QT_INCLUDE_DIR")) +- { +- qtIncDir = makefile->GetDefinition("QT_INCLUDE_DIR"); +- std::string s = +- makefile->GetSafeDefinition("CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES"); +- std::vector<std::string> implIncDirs; +- cmSystemTools::ExpandListArgument(s, implIncDirs); +- if (std::find(implIncDirs.begin(), implIncDirs.end(),std::string(qtIncDir)) +- != implIncDirs.end()) +- { +- qtIncludeDirMayHaveBeenRemoved = true; +- if (makefile->IsSet("QT_QTCORE_INCLUDE_DIR")) +- { +- qtCoreIncDir = makefile->GetDefinition("QT_QTCORE_INCLUDE_DIR"); +- } +- } +- } +- +- bool haveQtCoreIncDir = false; +- bool haveQtIncDir = false; +- + std::vector<std::string> includeDirs; + cmGeneratorTarget gtgt(target); +- localGen->GetIncludeDirectories(includeDirs, >gt, "CXX"); ++ // Get the include dirs for this target, without stripping the implicit ++ // include dirs off, see http://public.kitware.com/Bug/view.php?id=13667 ++ localGen->GetIncludeDirectories(includeDirs, >gt, "CXX", 0, false); + std::string _moc_incs = ""; + const char* sep = ""; + for(std::vector<std::string>::const_iterator incDirIt = includeDirs.begin(); +@@ -251,37 +226,6 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) + _moc_incs += sep; + sep = ";"; + _moc_incs += *incDirIt; +- +- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir) // #13667 +- { +- if (*incDirIt == qtIncDir) +- { +- haveQtIncDir = true; +- qtIncludeDirMayHaveBeenRemoved = false; // it's here, i.e. not removed +- } +- if (*incDirIt == qtCoreIncDir) +- { +- haveQtCoreIncDir = true; +- } +- } +- } +- +- // Some projects (kdelibs, phonon) query the compiler for its default +- // include search dirs, and add those to +- // CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES. +- // These may include e.g./usr/lib/qt/include . This is typically also part +- // of ${QT_INCLUDES}. If this directory is then contained in the implicit +- // include dirs, it is removed from the include dirs returned from the +- // target above. So we add ${QT_INCLUDE_DIR} manually for moc if we detected +- // that ${QT_QTCORE_INCLUDE_DIR} is among the include dirs (there shouldn't +- // be a way to use Qt4 without using ${QT_QTCORE_INCLUDE_DIR} I think. +- // See #13646 and #13667. +- if (qtIncludeDirMayHaveBeenRemoved && qtCoreIncDir && qtIncDir +- && (haveQtCoreIncDir == true) && (haveQtIncDir == false)) +- { +- _moc_incs += sep; +- sep = ";"; +- _moc_incs += qtIncDir; + } + + const char* tmp = target->GetProperty("COMPILE_DEFINITIONS"); +-- +1.7.0 diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch new file mode 100644 index 0000000..02e44fb --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch @@ -0,0 +1,48 @@ +--- b/Modules/FindBLAS.cmake ++++ a/Modules/FindBLAS.cmake +@@ -1,3 +1,9 @@ ++# ++# Version modified for Gentoo Linux ++# If a valid PkgConfig configuration for blas is found, this overrides and cancels ++# all further checks. ++# ++ + # - Find BLAS library + # This module finds an installed fortran library that implements the BLAS + # linear-algebra interface (see http://www.netlib.org/blas/). +@@ -40,6 +46,26 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++# ++# first, try PkgConfig ++# ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(PC_BLAS blas) ++if(PC_BLAS_FOUND) ++ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) ++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) ++ if (NOT ${PC_LIB}_LIBRARY) ++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") ++ endif (NOT ${PC_LIB}_LIBRARY) ++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) ++ endforeach(PC_LIB) ++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) ++ mark_as_advanced(BLAS_LIBRARIES) ++else(PC_BLAS_FOUND) ++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") ++ ++ ++ + include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) + +@@ -604,3 +630,8 @@ + endif() + + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) ++ ++ ++endif(PC_BLAS_FOUND) ++ ++ diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch new file mode 100644 index 0000000..b00b4f7 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch @@ -0,0 +1,73 @@ +--- Modules/FindBoost.cmake ++++ Modules/FindBoost.cmake +@@ -903,6 +903,11 @@ + + set( _boost_docstring_release "Boost ${COMPONENT} library (release)") + set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ # Get version of Python. ++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) ++ endif() ++ + + # + # Find RELEASE libraries +@@ -913,6 +918,14 @@ + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} + ${Boost_LIB_PREFIX}boost_${COMPONENT} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_RELEASE_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) ++ endif() + if(_boost_STATIC_RUNTIME_WORKAROUND) + set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") + list(APPEND _boost_RELEASE_NAMES +@@ -920,6 +933,13 @@ + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_RELEASE_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) ++ endif() + endif() + if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") + _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) +@@ -945,6 +965,15 @@ + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} + ${Boost_LIB_PREFIX}boost_${COMPONENT} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_DEBUG_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) ++ endif() + if(_boost_STATIC_RUNTIME_WORKAROUND) + set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") + list(APPEND _boost_DEBUG_NAMES +@@ -952,6 +981,13 @@ + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_DEBUG_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) ++ endif() + endif() + if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") + _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) diff --git a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch new file mode 100644 index 0000000..f5b70c1 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch @@ -0,0 +1,34 @@ +http://bugs.gentoo.org/show_bug.cgi?id=465898 + +--- Modules/FindImageMagick.cmake ++++ Modules/FindImageMagick.cmake +@@ -81,7 +81,7 @@ + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES +- ImageMagick ++ ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." + ) + find_library(ImageMagick_${component}_LIBRARY +@@ -147,17 +147,17 @@ + ) + if(component STREQUAL "Magick++") + FIND_IMAGEMAGICK_API(Magick++ Magick++.h +- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 ++ Magick++ CORE_RL_Magick++_ Magick++.Q8 Magick++-Q8 Magick++.Q8HDRI Magick++-Q8HDRI Magick++.Q16 Magick++-Q16 Magick++.Q16HDRI Magick++-Q16HDRI Magick++.Q32 Magick++-Q32 Magick++.Q32HDRI Magick++-Q32HDRI Magick++.Q64 Magick++-Q64 Magick++.Q64HDRI Magick++-Q64HDRI Magick++-6.Q8 Magick++-6-Q8 Magick++-6.Q8HDRI Magick++-6-Q8HDRI Magick++-6.Q16 Magick++-6-Q16 Magick++-6.Q16HDRI Magick++-6-Q16HDRI Magick++-6.Q32 Magick++-6-Q32 Magick++-6.Q32HDRI Magick++-6-Q32HDRI Magick++-6.Q64 Magick++-6-Q64 Magick++-6.Q64HDRI Magick++-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) + elseif(component STREQUAL "MagickWand") + FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h +- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 ++ Wand MagickWand CORE_RL_wand_ MagickWand.Q8 MagickWand-Q8 MagickWand.Q8HDRI MagickWand-Q8HDRI MagickWand.Q16 MagickWand-Q16 MagickWand.Q16HDRI MagickWand-Q16HDRI MagickWand.Q32 MagickWand-Q32 MagickWand.Q32HDRI MagickWand-Q32HDRI MagickWand.Q64 MagickWand-Q64 MagickWand.Q64HDRI MagickWand-Q64HDRI MagickWand-6.Q8 MagickWand-6-Q8 MagickWand-6.Q8HDRI MagickWand-6-Q8HDRI MagickWand-6.Q16 MagickWand-6-Q16 MagickWand-6.Q16HDRI MagickWand-6-Q16HDRI MagickWand-6.Q32 MagickWand-6-Q32 MagickWand-6.Q32HDRI MagickWand-6-Q32HDRI MagickWand-6.Q64 MagickWand-6-Q64 MagickWand-6.Q64HDRI MagickWand-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) + elseif(component STREQUAL "MagickCore") + FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h +- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 ++ Magick MagickCore CORE_RL_magick_ MagickCore.Q8 MagickCore-Q8 MagickCore.Q8HDRI MagickCore-Q8HDRI MagickCore.Q16 MagickCore-Q16 MagickCore.Q16HDRI MagickCore-Q16HDRI MagickCore.Q32 MagickCore-Q32 MagickCore.Q32HDRI MagickCore-Q32HDRI MagickCore.Q64 MagickCore-Q64 MagickCore.Q64HDRI MagickCore-Q64HDRI MagickCore-6.Q8 MagickCore-6-Q8 MagickCore-6.Q8HDRI MagickCore-6-Q8HDRI MagickCore-6.Q16 MagickCore-6-Q16 MagickCore-6.Q16HDRI MagickCore-6-Q16HDRI MagickCore-6.Q32 MagickCore-6-Q32 MagickCore-6.Q32HDRI MagickCore-6-Q32HDRI MagickCore-6.Q64 MagickCore-6-Q64 MagickCore-6.Q64HDRI MagickCore-6-Q64HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) + else() diff --git a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch new file mode 100644 index 0000000..36f4ded --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch @@ -0,0 +1,130 @@ +From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 +From: Michael Palimaka <kensington@gentoo.org> +Date: Tue, 6 Nov 2012 23:35:34 +1100 +Subject: [PATCH] Set some proper paths to make cmake find our tools. + +The ebuild now adds an extra / at the end of $EPREFIX so that it is +never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains +correct) + +Original patch by Heiko Przybyl. +Updated by Chris Reffett (cmake-2.8.8) +Updated by Johannes Huber (cmake-2.8.9) +Updated by Michael Palimaka (cmake-2.8.10) +Updated by Chris Reffett (cmake-2.8.11) + +--- a/Modules/Platform/Darwin.cmake ++++ b/Modules/Platform/Darwin.cmake +@@ -252,9 +252,9 @@ + "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>") + + +-# default to searching for frameworks first ++# default to searching for frameworks last + if(NOT DEFINED CMAKE_FIND_FRAMEWORK) +- set(CMAKE_FIND_FRAMEWORK FIRST) ++ set(CMAKE_FIND_FRAMEWORK LAST) + endif() + + # Older OS X linkers do not report their framework search path +@@ -276,6 +276,8 @@ + + # set up the default search directories for frameworks + set(CMAKE_SYSTEM_FRAMEWORK_PATH ++ @GENTOO_PORTAGE_EPREFIX@Frameworks ++ @GENTOO_PORTAGE_EPREFIX@usr/lib + ~/Library/Frameworks + /Library/Frameworks + /Network/Library/Frameworks +@@ -298,13 +300,15 @@ + endif() + endif() + +-# default to searching for application bundles first ++# default to searching for application bundles last + if(NOT DEFINED CMAKE_FIND_APPBUNDLE) +- set(CMAKE_FIND_APPBUNDLE FIRST) ++ set(CMAKE_FIND_APPBUNDLE LAST) + endif() + # set up the default search directories for application bundles + set(_apps_paths) + foreach(_path ++ @GENTOO_PORTAGE_EPREFIX@Applications ++ @GENTOO_PORTAGE_EPREFIX@usr/bin + "~/Applications" + "/Applications" + "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -33,6 +33,7 @@ + # search types. + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard ++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ + /usr/local /usr / + + # CMake install location +@@ -44,43 +45,41 @@ + + # List common include file locations not under the common prefixes. + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include ++ @GENTOO_PORTAGE_EPREFIX@usr/include + ) + + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib ++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc ++ @GENTOO_PORTAGE_GCCLIBDIR@ ++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 ++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib ++ @GENTOO_PORTAGE_EPREFIX@lib + ) + + list(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ @GENTOO_PORTAGE_EPREFIX@usr/bin ++ @GENTOO_PORTAGE_EPREFIX@bin + ) + + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /usr/lib /usr/lib32 /usr/lib64 ++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc ++ @GENTOO_PORTAGE_GCCLIBDIR@ ++ @GENTOO_PORTAGE_EPREFIX@usr/lib64 ++ @GENTOO_PORTAGE_EPREFIX@usr/libx32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib32 ++ @GENTOO_PORTAGE_EPREFIX@usr/lib ++ @GENTOO_PORTAGE_EPREFIX@lib ++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 + ) + + list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ++ @GENTOO_PORTAGE_EPREFIX@usr/include + /usr/include + ) + list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ++ @GENTOO_PORTAGE_EPREFIX@usr/include + /usr/include + ) + diff --git a/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch new file mode 100644 index 0000000..9928e14 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch @@ -0,0 +1,20 @@ +--- a/CompileFlags.cmake ++++ b/CompileFlags.cmake +@@ -66,5 +66,5 @@ + # avoid binutils problem with large binaries, e.g. when building CMake in debug mode + # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 + if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") + endif () +--- a/bootstrap ++++ b/bootstrap +@@ -691,7 +691,7 @@ + # avoid binutils problem with large binaries, e.g. when building CMake in debug mode + # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 + if ${cmake_machine_parisc}; then +- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" ++ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" + fi + fi + diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch new file mode 100644 index 0000000..6dc244c --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch @@ -0,0 +1,43 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sun Dec 8 13:38:06 UTC 2013 +Subject: fix check for freetype-2.5.1 + +--- Modules/FindFreetype.cmake ++++ Modules/FindFreetype.cmake +@@ -64,6 +64,19 @@ + PATH_SUFFIXES include/freetype2 include + ) + ++if(NOT FREETYPE_INCLUDE_DIR_freetype2) ++ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h ++ HINTS ++ ENV FREETYPE_DIR ++ PATHS ++ /usr/X11R6 ++ /usr/local/X11R6 ++ /usr/local/X11 ++ /usr/freeware ++ PATH_SUFFIXES include/freetype2 include ++ ) ++endif() ++ + find_library(FREETYPE_LIBRARY + NAMES freetype libfreetype freetype219 + HINTS +@@ -82,8 +95,14 @@ + endif() + set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") + +-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") +- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str ++if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") ++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") ++elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") ++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") ++endif() ++ ++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) ++ file(STRINGS "${FREETYPE_H}" freetype_version_str + REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") + + unset(FREETYPE_VERSION_STRING) diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch new file mode 100644 index 0000000..b094f17 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch @@ -0,0 +1,23 @@ +--- Modules/FindImageMagick.cmake ++++ Modules/FindImageMagick.cmake +@@ -147,17 +147,17 @@ + ) + if(component STREQUAL "Magick++") + FIND_IMAGEMAGICK_API(Magick++ Magick++.h +- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI ++ Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) + elseif(component STREQUAL "MagickWand") + FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h +- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI ++ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) + elseif(component STREQUAL "MagickCore") + FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h +- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI ++ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI + ) + list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) + else() diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch new file mode 100644 index 0000000..17d4f94 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch @@ -0,0 +1,42 @@ +--- Modules/FindCurses.cmake 2013-11-06 06:07:22.000000000 +1100 ++++ Modules/FindCurses.cmake 2014-01-17 21:55:40.630142386 +1100 +@@ -30,7 +30,7 @@ + find_library(CURSES_NCURSES_LIBRARY NAMES ncurses ) + set(CURSES_USE_NCURSES FALSE) + +-if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY) ++if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) + set(CURSES_USE_NCURSES TRUE) + endif() + # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html +@@ -125,10 +125,20 @@ + CACHE FILEPATH "The curses library" ${FORCE_IT}) + endif() + ++ CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" ++ cbreak "" CURSES_NCURSES_HAS_CBREAK) ++ if(NOT CURSES_NCURSES_HAS_CBREAK) ++ find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}") ++ find_library(CURSES_EXTRA_LIBRARY tinfo ) ++ CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}" ++ cbreak "" CURSES_TINFO_HAS_CBREAK) ++ endif() + endif() + +-find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") +-find_library(CURSES_EXTRA_LIBRARY cur_colr ) ++if (NOT CURSES_TINFO_HAS_CBREAK) ++ find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") ++ find_library(CURSES_EXTRA_LIBRARY cur_colr ) ++endif() + + find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}") + find_library(CURSES_FORM_LIBRARY form ) +@@ -172,5 +182,7 @@ + CURSES_INCLUDE_DIR + CURSES_CURSES_HAS_WSYNCUP + CURSES_NCURSES_HAS_WSYNCUP ++ CURSES_NCURSES_HAS_CBREAK ++ CURSES_TINFO_HAS_CBREAK + ) + diff --git a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch new file mode 100644 index 0000000..99e39a2 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch @@ -0,0 +1,27 @@ +diff --git a/CompileFlags.cmake b/CompileFlags.cmake +index 20f5dec..24ac58d 100644 +--- a/CompileFlags.cmake ++++ b/CompileFlags.cmake +@@ -66,5 +66,5 @@ endif () + # avoid binutils problem with large binaries, e.g. when building CMake in debug mode + # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 + if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") + endif () +diff --git a/bootstrap b/bootstrap +index 9784d5d..51d067e 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then + # avoid binutils problem with large binaries, e.g. when building CMake in debug mode + # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 + if ${cmake_machine_parisc}; then +- # if -O[s23] is given the effect is inverted, so do not use the flag then +- if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then +- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" +- fi ++ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" + fi + fi + diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch new file mode 100644 index 0000000..a91214c --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch @@ -0,0 +1,45 @@ +diff -ruN cmake-2.8.7.orig/Modules/FindBLAS.cmake cmake-2.8.7/Modules/FindBLAS.cmake +--- cmake-2.8.7.orig/Modules/FindBLAS.cmake 2011-12-30 17:49:56.000000000 +0100 ++++ cmake-2.8.7/Modules/FindBLAS.cmake 2012-03-08 05:38:47.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,24 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++# ++# first, try PkgConfig ++# ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(PC_BLAS blas) ++if(PC_BLAS_FOUND) ++ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) ++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) ++ if (NOT ${PC_LIB}_LIBRARY) ++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") ++ endif (NOT ${PC_LIB}_LIBRARY) ++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) ++ endforeach(PC_LIB) ++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) ++ mark_as_advanced(BLAS_LIBRARIES) ++else(PC_BLAS_FOUND) ++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") ++ + include(CheckFunctionExists) + include(CheckFortranFunctionExists) + +@@ -622,3 +646,6 @@ + endif(BLA_F95) + + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) ++ ++endif(PC_BLAS_FOUND) ++ diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch new file mode 100644 index 0000000..edaa91f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch @@ -0,0 +1,73 @@ +--- Modules/FindBoost.cmake ++++ Modules/FindBoost.cmake +@@ -953,6 +953,11 @@ + set( _boost_docstring_release "Boost ${COMPONENT} library (release)") + set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") + ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass. ++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi) ++ endif() ++ + # + # Find RELEASE libraries + # +@@ -962,6 +967,14 @@ + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} + ${Boost_LIB_PREFIX}boost_${COMPONENT} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_RELEASE_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) ++ endif() + if(_boost_STATIC_RUNTIME_WORKAROUND) + set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") + list(APPEND _boost_RELEASE_NAMES +@@ -969,6 +982,13 @@ + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_RELEASE_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) ++ endif() + endif() + if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") + _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) +@@ -994,6 +1014,15 @@ + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} + ${Boost_LIB_PREFIX}boost_${COMPONENT} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_DEBUG_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) ++ endif() + if(_boost_STATIC_RUNTIME_WORKAROUND) + set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") + list(APPEND _boost_DEBUG_NAMES +@@ -1001,6 +1030,13 @@ + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} + ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) ++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") ++ list(APPEND _boost_DEBUG_NAMES ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} ++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) ++ endif() + endif() + if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") + _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch new file mode 100644 index 0000000..6808b80 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch @@ -0,0 +1,44 @@ +diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake +--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100 ++++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100 +@@ -1,3 +1,9 @@ ++# ++# Version modified for Gentoo Linux ++# If a valid PkgConfig configuration is found, this overrides and cancels ++# all further checks. ++# ++ + # - Find LAPACK library + # This module finds an installed fortran library that implements the LAPACK + # linear-algebra interface (see http://www.netlib.org/lapack/). +@@ -36,6 +42,24 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++# ++# first, try PkgConfig ++# ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(PC_LAPACK lapack) ++if(PC_LAPACK_FOUND) ++ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) ++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) ++ if (NOT ${PC_LIB}_LIBRARY) ++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") ++ endif (NOT ${PC_LIB}_LIBRARY) ++ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) ++ endforeach(PC_LIB) ++ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) ++ mark_as_advanced(LAPACK_LIBRARIES) ++else(PC_LAPACK_FOUND) ++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") ++ + set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + + get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) +@@ -305,3 +329,5 @@ + endif(BLA_F95) + + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) ++ ++endif(PC_LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch new file mode 100644 index 0000000..c5e17c5 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch @@ -0,0 +1,18 @@ +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index c47f583..5783d37 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -87,7 +87,12 @@ + set(PKG_CONFIG_VERSION 1) + set(PKG_CONFIG_FOUND 0) + +-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") ++if(NOT PKG_CONFIG_EXECUTABLE) ++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) ++ if(NOT PKG_CONFIG_EXECUTABLE) ++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") ++ endif(NOT PKG_CONFIG_EXECUTABLE) ++endif(NOT PKG_CONFIG_EXECUTABLE) + mark_as_advanced(PKG_CONFIG_EXECUTABLE) + + if(PKG_CONFIG_EXECUTABLE) diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim new file mode 100644 index 0000000..5cecd7d --- /dev/null +++ b/dev-util/cmake/files/cmake.vim @@ -0,0 +1,3 @@ +autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim +autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake +autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml new file mode 100644 index 0000000..a23f444 --- /dev/null +++ b/dev-util/cmake/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>kde</herd> +</pkgmetadata> |