* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2011-10-13 12:01 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2011-10-13 12:01 UTC (permalink / raw
To: gentoo-commits
commit: c6c6a59796a1f07f00a86c8f25a1e399377f5f53
Author: Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Thu Oct 13 11:47:50 2011 +0000
Commit: Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Thu Oct 13 11:47:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c6c6a597
[dev-util/cmake] Added patches thx Arseny Solokha, bug 386919
---
.../{cmake-2.8.6.ebuild => cmake-2.8.6-r1.ebuild} | 2 +
dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch | 34 ++++++++++++++++++++
dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch | 34 ++++++++++++++++++++
3 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.6.ebuild b/dev-util/cmake/cmake-2.8.6-r1.ebuild
similarity index 98%
rename from dev-util/cmake/cmake-2.8.6.ebuild
rename to dev-util/cmake/cmake-2.8.6-r1.ebuild
index b5f6966..9431cba 100644
--- a/dev-util/cmake/cmake-2.8.6.ebuild
+++ b/dev-util/cmake/cmake-2.8.6-r1.ebuild
@@ -56,6 +56,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
+ "${FILESDIR}"/${PN}-2.8.6-FindBLAS.patch
+ "${FILESDIR}"/${PN}-2.8.6-FindLAPACK.patch
)
cmake_src_bootstrap() {
# Cleanup args to extract only JOBS.
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch
new file mode 100644
index 0000000..75b2814
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch
@@ -0,0 +1,34 @@
+--- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-09 23:32:55.096356973 +0800
++++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-10-09 23:35:10.235667390 +0800
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find BLAS library
+ # This module finds an installed fortran library that implements the BLAS
+ # linear-algebra interface (see http://www.netlib.org/blas/).
+@@ -39,6 +45,14 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(BLAS blas)
++if(NOT BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
+ include(CheckFunctionExists)
+ include(CheckFortranFunctionExists)
+
+@@ -621,4 +635,6 @@
+ endif(NOT BLAS_FIND_QUIETLY)
+ endif(BLA_F95)
+
++endif(NOT BLAS_FOUND)
++
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch
new file mode 100644
index 0000000..d1f3a96
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch
@@ -0,0 +1,34 @@
+--- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800
++++ cmake-2.8.6/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find LAPACK library
+ # This module finds an installed fortran library that implements the LAPACK
+ # linear-algebra interface (see http://www.netlib.org/lapack/).
+@@ -36,6 +42,14 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(LAPACK lapack)
++if(NOT LAPACK_FOUND)
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
++
+ set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+@@ -304,4 +318,6 @@
+ endif(NOT LAPACK_FIND_QUIETLY)
+ endif(BLA_F95)
+
++endif(NOT LAPACK_FOUND)
++
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2011-10-15 15:07 Andreas Hüttel
0 siblings, 0 replies; 30+ messages in thread
From: Andreas Hüttel @ 2011-10-15 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 4715493692adff4c453aad356cb8cd31a1d7e57f
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 15:07:47 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 15:07:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=47154936
[dev-util/cmake] Moved to main tree
---
dev-util/cmake/cmake-2.8.6-r1.ebuild | 164 --------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 ---
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 -----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ---
.../cmake-2.8.0-darwin-default-install_name.patch | 20 ---
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ------
.../files/cmake-2.8.3-more-no_host_paths.patch | 109 -------------
.../cmake/files/cmake-2.8.3-ruby_libname.patch | 12 --
dev-util/cmake/files/cmake-2.8.4-FindBoost.patch | 13 --
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 --
dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch | 34 ----
dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch | 34 ----
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
15 files changed, 0 insertions(+), 541 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.6-r1.ebuild b/dev-util/cmake/cmake-2.8.6-r1.ebuild
deleted file mode 100644
index 9431cba..0000000
--- a/dev-util/cmake/cmake-2.8.6-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.5-r2.ebuild,v 1.1 2011/07/18 09:03:45 dilfridge Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0
- >=net-misc/curl-7.20.0-r1[ssl]
- >=dev-libs/expat-2.0.1
- dev-util/pkgconfig
- sys-libs/zlib
- ncurses? ( sys-libs/ncurses )
- qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.1-libform.patch
- "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
- "${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
- "${FILESDIR}"/${PN}-2.8.6-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.6-FindLAPACK.patch
-)
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
- # as it was never intended to be used this way.
- "${CMAKE_BUILD_DIR}"/bin/ctest \
- -E BootstrapTest SimpleCOnly_sdcc \
- || die "Tests failed"
- popd > /dev/null
-}
-
-src_prepare() {
- base_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
deleted file mode 100644
index 6ee9b70..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
---- Modules/Platform/Darwin.cmake
-+++ Modules/Platform/Darwin.cmake
-@@ -23,7 +23,7 @@
- SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- SET(CMAKE_SHARED_MODULE_PREFIX "lib")
--SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- SET(CMAKE_MODULE_EXISTS 1)
- SET(CMAKE_DL_LIBS "")
-
-@@ -45,7 +45,7 @@
- SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
- SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
-+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
-
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4ef0c7b..0000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
deleted file mode 100644
index 87c7247..0000000
--- a/dev-util/cmake/files/cmake-2.8.1-libform.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
-+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
-@@ -314,9 +314,6 @@
- ELSE (UNIX)
- SET(BUILD_CursesDialog 0)
- ENDIF (UNIX)
-- IF(BUILD_CursesDialog)
-- ADD_SUBDIRECTORY(Source/CursesDialog/form)
-- ENDIF(BUILD_CursesDialog)
- ENDMACRO (CMAKE_BUILD_UTILITIES)
-
-
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
-@@ -25,13 +25,18 @@
- CursesDialog/ccmake
- )
-
--INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
-
-
- ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
- TARGET_LINK_LIBRARIES(ccmake CMakeLib)
--TARGET_LINK_LIBRARIES(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- INSTALL_TARGETS(/bin ccmake)
-+
-+
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
deleted file mode 100644
index 38bad92..0000000
--- a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Set some proper paths to make cmake find our tools.
-Original patch by Heiko Przybyl
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
---- cmake-2.8.3/Modules/Platform/Darwin.cmake
-+++ cmake-2.8.3/Modules/Platform/Darwin.cmake
-@@ -217,19 +217,23 @@
-
-
-
--# default to searching for frameworks first
--SET(CMAKE_FIND_FRAMEWORK FIRST)
-+# default to searching for frameworks last
-+SET(CMAKE_FIND_FRAMEWORK LAST)
- # set up the default search directories for frameworks
- SET(CMAKE_SYSTEM_FRAMEWORK_PATH
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /Network/Library/Frameworks
- /System/Library/Frameworks)
-
--# default to searching for application bundles first
--SET(CMAKE_FIND_APPBUNDLE FIRST)
-+# default to searching for application bundles last
-+SET(CMAKE_FIND_APPBUNDLE LAST)
- # set up the default search directories for application bundles
- SET(CMAKE_SYSTEM_APPBUNDLE_PATH
-+ @GENTOO_PORTAGE_EPREFIX@Applications
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
- ~/Applications
- /Applications
- /Developer/Applications)
-diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
-+++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@
- # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # Standard
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
- /usr/local /usr /
-
- # CMake install location
-@@ -44,43 +45,39 @@
-
- # List common include file locations not under the common prefixes.
- LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-- # Windows API on Cygwin
-- /usr/include/w32api
--
-- # X11
-- /usr/X11R6/include /usr/include/X11
--
-- # Other
-- /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/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
- )
-
- LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-- /usr/pkg/bin
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
-+ @GENTOO_PORTAGE_EPREFIX@bin
- )
-
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
- /lib /usr/lib /usr/lib32 /usr/lib64
- )
-
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
-
diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
deleted file mode 100644
index 45d2b16..0000000
--- a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake
---- cmake-2.8.3.orig//Modules/FindRuby.cmake 2010-12-25 16:56:42.597163498 +0100
-+++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0100
-@@ -180,7 +180,7 @@
-
-
- # Determine the list of possible names for the ruby library
--SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
-+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
-
- IF(WIN32)
- SET( _RUBY_MSVC_RUNTIME "" )
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch
deleted file mode 100644
index 4a56d43..0000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN cmake-2.8.4.old//Modules/FindBoost.cmake cmake-2.8.4/Modules/FindBoost.cmake
---- cmake-2.8.4.old//Modules/FindBoost.cmake 2011-02-20 19:32:16.528655001 +0100
-+++ cmake-2.8.4/Modules/FindBoost.cmake 2011-02-20 20:28:41.572936744 +0100
-@@ -73,6 +73,9 @@
- # binary Boost releases do so.
- #
- # set(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
-+set(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48"
-+ "1.47.0" "1.47" "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0"
-+ "1.43" "1.42.0" "1.42")
- #
- # ===================================== ============= ========================
- #
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
deleted file mode 100644
index 28d2e4f..0000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
-+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
-@@ -33,6 +33,8 @@
- ${Python_ADDITIONAL_VERSIONS}
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Python_VERSIONS)
- FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
- STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- IF(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch
deleted file mode 100644
index 75b2814..0000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindBLAS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-09 23:32:55.096356973 +0800
-+++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-10-09 23:35:10.235667390 +0800
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration for blas is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find BLAS library
- # This module finds an installed fortran library that implements the BLAS
- # linear-algebra interface (see http://www.netlib.org/blas/).
-@@ -39,6 +45,14 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(BLAS blas)
-+if(NOT BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(CheckFunctionExists)
- include(CheckFortranFunctionExists)
-
-@@ -621,4 +635,6 @@
- endif(NOT BLAS_FIND_QUIETLY)
- endif(BLA_F95)
-
-+endif(NOT BLAS_FOUND)
-+
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch
deleted file mode 100644
index d1f3a96..0000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800
-+++ cmake-2.8.6/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find LAPACK library
- # This module finds an installed fortran library that implements the LAPACK
- # linear-algebra interface (see http://www.netlib.org/lapack/).
-@@ -36,6 +42,14 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(LAPACK lapack)
-+if(NOT LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-+
- set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
- get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
-@@ -304,4 +318,6 @@
- endif(NOT LAPACK_FIND_QUIETLY)
- endif(BLA_F95)
-
-+endif(NOT LAPACK_FOUND)
-+
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-01-13 9:00 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2012-01-13 9:00 UTC (permalink / raw
To: gentoo-commits
commit: d1742db94e44817130ab96eed8343e96068e937d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 09:02:13 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 09:02:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d1742db9
[dev-util/cmake] Revision bump. Adds new FindBoost.cmake patch which fixes bug 335108.
(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)
---
dev-util/cmake/cmake-2.8.6-r5.ebuild | 178 ++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 +++
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 +++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake-2.8.0-darwin-default-install_name.patch | 20 +++
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ++++++
.../files/cmake-2.8.3-more-no_host_paths.patch | 109 ++++++++++++
.../cmake/files/cmake-2.8.3-ruby_libname.patch | 12 ++
dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch | 34 ++++
dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch | 35 ++++
dev-util/cmake/files/cmake-2.8.6-FindBoost.patch | 46 +++++
.../cmake/files/cmake-2.8.6-FindLAPACK-2.patch | 34 ++++
dev-util/cmake/files/cmake-2.8.6-testsvn17.patch | 30 ++++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
16 files changed, 641 insertions(+), 0 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.6-r5.ebuild b/dev-util/cmake/cmake-2.8.6-r5.ebuild
new file mode 100644
index 0000000..b704c83
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.6-r5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.6 2012/01/04 16:36:22 ranger Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+
+MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+DEPEND="
+ >=app-arch/libarchive-2.8.0
+ >=net-misc/curl-7.20.0-r1[ssl]
+ >=dev-libs/expat-2.0.1
+ dev-util/pkgconfig
+ sys-libs/zlib
+ ncurses? ( sys-libs/ncurses )
+ qt4? ( x11-libs/qt-gui:4 )
+"
+RDEPEND="${DEPEND}
+ emacs? ( virtual/emacs )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+# Fixme:
+# Boost patchset is foobared and should respect eselect / slotting
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+ "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+ "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
+ "${FILESDIR}"/${PN}-2.8.1-libform.patch
+ "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
+ "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
+ "${FILESDIR}"/${PN}-2.8.6-FindBoost.patch
+ "${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
+ "${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
+ "${FILESDIR}"/${PN}-2.8.6-CodeBlocks.patch
+ "${FILESDIR}"/${PN}-2.8.6-testsvn17.patch
+)
+cmake_src_bootstrap() {
+ # Cleanup args to extract only JOBS.
+ # Because bootstrap does not know anything else.
+ echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+ if [ $? -eq 0 ]; then
+ par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
+ par_arg="--parallel=${par_arg}"
+ else
+ par_arg="--parallel=1"
+ fi
+
+ tc-export CC CXX LD
+
+ ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ ${par_arg} \
+ || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+ # fix OutDir test
+ # this is altered thanks to our eclass
+ sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+ # as it was never intended to be used this way.
+ "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+ -E BootstrapTest SimpleCOnly_sdcc \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+pkg_setup() {
+ einfo "Fixing java access violations ..."
+ # bug 387227
+ addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # disable running of cmake in boostrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+ cmake_src_bootstrap
+}
+
+src_configure() {
+ # make things work with gentoo java setup
+ # in case java-config cannot be run, the variable just becomes unset
+ # per bug #315229
+ export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ $(cmake-utils_use_build ncurses CursesDialog)
+ $(cmake-utils_use_build qt4 QtDialog)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use emacs; then
+ elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/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-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
new file mode 100644
index 0000000..6ee9b70
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
@@ -0,0 +1,23 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -23,7 +23,7 @@
+ SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ SET(CMAKE_SHARED_MODULE_PREFIX "lib")
+-SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
++SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ SET(CMAKE_MODULE_EXISTS 1)
+ SET(CMAKE_DL_LIBS "")
+
+@@ -45,7 +45,7 @@
+ SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+ SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+ SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+-SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
++SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
+
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
new file mode 100644
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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
new file mode 100644
index 0000000..87c7247
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.1-libform.patch
@@ -0,0 +1,50 @@
+diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
+--- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
++++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
+@@ -314,9 +314,6 @@
+ ELSE (UNIX)
+ SET(BUILD_CursesDialog 0)
+ ENDIF (UNIX)
+- IF(BUILD_CursesDialog)
+- ADD_SUBDIRECTORY(Source/CursesDialog/form)
+- ENDIF(BUILD_CursesDialog)
+ ENDMACRO (CMAKE_BUILD_UTILITIES)
+
+
+diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
+--- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
++++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
+@@ -25,13 +25,18 @@
+ CursesDialog/ccmake
+ )
+
+-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
+- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
+ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
+
+
+ ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
+ TARGET_LINK_LIBRARIES(ccmake CMakeLib)
+-TARGET_LINK_LIBRARIES(ccmake cmForm)
++TARGET_LINK_LIBRARIES(ccmake form)
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
++IF(CURSES_EXTRA_LIBRARY)
++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
++ENDIF(CURSES_EXTRA_LIBRARY)
++
+
+ INSTALL_TARGETS(/bin ccmake)
++
++
+diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
+--- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
++++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
+@@ -15,8 +15,6 @@
+ #define _MSE_INT_H
+ #endif
+
+-#include <cmFormConfigure.h>
+-
+ #if defined(__hpux)
+ # define _BOOL_DEFINED
+ # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
new file mode 100644
index 0000000..38bad92
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
@@ -0,0 +1,109 @@
+Set some proper paths to make cmake find our tools.
+Original patch by Heiko Przybyl
+
+The ebuild now adds an extra / at the end of $EPREFIX so that it is
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
+correct)
+
+--- cmake-2.8.3/Modules/Platform/Darwin.cmake
++++ cmake-2.8.3/Modules/Platform/Darwin.cmake
+@@ -217,19 +217,23 @@
+
+
+
+-# default to searching for frameworks first
+-SET(CMAKE_FIND_FRAMEWORK FIRST)
++# default to searching for frameworks last
++SET(CMAKE_FIND_FRAMEWORK LAST)
+ # set up the default search directories for frameworks
+ SET(CMAKE_SYSTEM_FRAMEWORK_PATH
++ @GENTOO_PORTAGE_EPREFIX@Frameworks
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /Network/Library/Frameworks
+ /System/Library/Frameworks)
+
+-# default to searching for application bundles first
+-SET(CMAKE_FIND_APPBUNDLE FIRST)
++# default to searching for application bundles last
++SET(CMAKE_FIND_APPBUNDLE LAST)
+ # set up the default search directories for application bundles
+ SET(CMAKE_SYSTEM_APPBUNDLE_PATH
++ @GENTOO_PORTAGE_EPREFIX@Applications
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
+ ~/Applications
+ /Applications
+ /Developer/Applications)
+diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
++++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
+@@ -33,6 +33,7 @@
+ # search types.
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ # Standard
++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
+ /usr/local /usr /
+
+ # CMake install location
+@@ -44,43 +45,39 @@
+
+ # List common include file locations not under the common prefixes.
+ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+- # Windows API on Cygwin
+- /usr/include/w32api
+-
+- # X11
+- /usr/X11R6/include /usr/include/X11
+-
+- # Other
+- /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/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
+ )
+
+ LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+- /usr/pkg/bin
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
++ @GENTOO_PORTAGE_EPREFIX@bin
+ )
+
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++ @GENTOO_PORTAGE_GCCLIBDIR@
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
+ /lib /usr/lib /usr/lib32 /usr/lib64
+ )
+
+ LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
++ @GENTOO_PORTAGE_EPREFIX@usr/include
+ /usr/include
+ )
+ LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
++ @GENTOO_PORTAGE_EPREFIX@usr/include
+ /usr/include
+ )
+
diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
new file mode 100644
index 0000000..45d2b16
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
@@ -0,0 +1,12 @@
+diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake
+--- cmake-2.8.3.orig//Modules/FindRuby.cmake 2010-12-25 16:56:42.597163498 +0100
++++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0100
+@@ -180,7 +180,7 @@
+
+
+ # Determine the list of possible names for the ruby library
+-SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
++SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
+
+ IF(WIN32)
+ SET( _RUBY_MSVC_RUNTIME "" )
diff --git a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch
new file mode 100644
index 0000000..8a8fe6f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch
@@ -0,0 +1,34 @@
+From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001
+From: Clinton Stimpson <clinton@elemtech.com>
+Date: Wed, 5 Oct 2011 10:02:32 -0600
+Subject: [PATCH] Fix XML safety issue with adding preprocessor defines in CodeBlocks project.
+
+---
+ Source/cmExtraCodeBlocksGenerator.cxx | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
+index 7db91c7..9a0b1ea 100644
+--- a/Source/cmExtraCodeBlocksGenerator.cxx
++++ b/Source/cmExtraCodeBlocksGenerator.cxx
+@@ -19,6 +19,7 @@
+ #include "cmGeneratedFileStream.h"
+ #include "cmTarget.h"
+ #include "cmSystemTools.h"
++#include "cmXMLSafe.h"
+
+ #include <cmsys/SystemTools.hxx>
+
+@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
+ for(std::vector<std::string>::const_iterator di = defs.begin();
+ di != defs.end(); ++di)
+ {
+- fout <<" <Add option=\"-D" << di->c_str() << "\" />\n";
++ cmXMLSafe safedef(di->c_str());
++ fout <<" <Add option=\"-D" << safedef.str() << "\" />\n";
+ }
+ }
+
+--
+1.7.0
+
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch
new file mode 100644
index 0000000..16b6480
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch
@@ -0,0 +1,35 @@
+diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake
+--- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-04 18:09:24.000000000 +0200
++++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-11-22 23:04:17.000000000 +0100
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find BLAS library
+ # This module finds an installed fortran library that implements the BLAS
+ # linear-algebra interface (see http://www.netlib.org/blas/).
+@@ -39,6 +45,14 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(BLAS blas)
++if(NOT BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
+ include(CheckFunctionExists)
+ include(CheckFortranFunctionExists)
+
+@@ -622,3 +636,6 @@
+ endif(BLA_F95)
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(NOT BLAS_FOUND)
++
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch
new file mode 100644
index 0000000..d4d4e94
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch
@@ -0,0 +1,46 @@
+From c7a600899bc3ca186ea1049af80bdc50b0d9ac49 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Fri, 13 Jan 2012 09:29:35 +0100
+Subject: [PATCH] Use eselected version in non exact version find operation.
+ Fixes gentoo bug
+ https://bugs.gentoo.org/show_bug.cgi?id=335108.
+
+---
+ Modules/FindBoost.cmake | 14 +++++++++++---
+ 1 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index 9c03b3d..9ccda31 100644
+--- a/Modules/FindBoost.cmake
++++ b/Modules/FindBoost.cmake
+@@ -73,6 +73,9 @@
+ # binary Boost releases do so.
+ #
+ # set(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
++
++# Some future versions to be safe
++set(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48")
+ #
+ # ===================================== ============= ========================
+ #
+@@ -658,9 +661,14 @@ else(_boost_IN_CACHE)
+ _boost_BOOSTIFIED_VERSION ${_boost_VER})
+ endif()
+
+- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
+- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
+-
++ # Rely only on eselected sym link version in gentoo
++ # in case of no exact version version search.
++ # See https://bugs.gentoo.org/show_bug.cgi?id=335108
++ if( Boost_FIND_VERSION_EXACT )
++ list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
++ list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
++ endif( Boost_FIND_VERSION_EXACT )
++
+ endforeach(_boost_VER)
+
+ if(Boost_DEBUG)
+--
+1.7.8.3
+
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
new file mode 100644
index 0000000..579a07d
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
@@ -0,0 +1,34 @@
+--- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800
++++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find LAPACK library
+ # This module finds an installed fortran library that implements the LAPACK
+ # linear-algebra interface (see http://www.netlib.org/lapack/).
+@@ -36,6 +42,14 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(LAPACK lapack)
++if(NOT LAPACK_FOUND)
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
++
+ set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+@@ -304,4 +318,6 @@
+ endif(NOT LAPACK_FIND_QUIETLY)
+ endif(BLA_F95)
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(NOT LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
new file mode 100644
index 0000000..7746767
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
@@ -0,0 +1,30 @@
+diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in
+index 97b2a07..edafb4ef 100644
+--- a/Tests/CTestUpdateSVN.cmake.in
++++ b/Tests/CTestUpdateSVN.cmake.in
+@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config)
+ set(SVNCMD ${SVN} --config-dir ${TOP}/config)
+ set(SVNUSER --username "test author" --non-interactive)
+
++# Configure for this svn version.
++execute_process(
++ COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add
++ )
++if("${help_add}" MATCHES "--depth")
++ set(depth_empty "--depth=empty")
++else()
++ set(depth_empty "")
++endif()
++
+ #-----------------------------------------------------------------------------
+ # Initialize the testing directory.
+ message("Creating test directory...")
+@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added)
+ if(dirs_added)
+ run_child(
+ WORKING_DIRECTORY ${TOP}/user-source
+- COMMAND ${SVNCMD} add ${dirs_added}
++ COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added}
+ )
+ endif(dirs_added)
+ run_child(
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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-01-22 16:35 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2012-01-22 16:35 UTC (permalink / raw
To: gentoo-commits
commit: d0990baadb44665630f0447c8f7beaeb5ee6a77a
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 16:33:39 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 16:33:39 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d0990baa
[dev-util/cmake] Remove patched version to use eselected boost. Latest boost is wanted see bug 335108 resolution.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
---
dev-util/cmake/cmake-2.8.6-r5.ebuild | 178 --------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 ---
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 -----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
.../cmake-2.8.0-darwin-default-install_name.patch | 20 ---
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ------
.../files/cmake-2.8.3-more-no_host_paths.patch | 109 ------------
.../cmake/files/cmake-2.8.3-ruby_libname.patch | 12 --
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 --
dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch | 34 ----
dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch | 35 ----
dev-util/cmake/files/cmake-2.8.6-FindBoost.patch | 46 -----
.../cmake/files/cmake-2.8.6-FindLAPACK-2.patch | 34 ----
dev-util/cmake/files/cmake-2.8.6-testsvn17.patch | 30 ----
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
17 files changed, 0 insertions(+), 653 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.6-r5.ebuild b/dev-util/cmake/cmake-2.8.6-r5.ebuild
deleted file mode 100644
index b704c83..0000000
--- a/dev-util/cmake/cmake-2.8.6-r5.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.6 2012/01/04 16:36:22 ranger Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0
- >=net-misc/curl-7.20.0-r1[ssl]
- >=dev-libs/expat-2.0.1
- dev-util/pkgconfig
- sys-libs/zlib
- ncurses? ( sys-libs/ncurses )
- qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.1-libform.patch
- "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
- "${FILESDIR}"/${PN}-2.8.6-FindBoost.patch
- "${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
- "${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
- "${FILESDIR}"/${PN}-2.8.6-CodeBlocks.patch
- "${FILESDIR}"/${PN}-2.8.6-testsvn17.patch
-)
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
- # as it was never intended to be used this way.
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E BootstrapTest SimpleCOnly_sdcc \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- einfo "Fixing java access violations ..."
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- base_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
deleted file mode 100644
index 6ee9b70..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
---- Modules/Platform/Darwin.cmake
-+++ Modules/Platform/Darwin.cmake
-@@ -23,7 +23,7 @@
- SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- SET(CMAKE_SHARED_MODULE_PREFIX "lib")
--SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- SET(CMAKE_MODULE_EXISTS 1)
- SET(CMAKE_DL_LIBS "")
-
-@@ -45,7 +45,7 @@
- SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
- SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
-+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
-
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4ef0c7b..0000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
deleted file mode 100644
index 87c7247..0000000
--- a/dev-util/cmake/files/cmake-2.8.1-libform.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
-+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
-@@ -314,9 +314,6 @@
- ELSE (UNIX)
- SET(BUILD_CursesDialog 0)
- ENDIF (UNIX)
-- IF(BUILD_CursesDialog)
-- ADD_SUBDIRECTORY(Source/CursesDialog/form)
-- ENDIF(BUILD_CursesDialog)
- ENDMACRO (CMAKE_BUILD_UTILITIES)
-
-
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
-@@ -25,13 +25,18 @@
- CursesDialog/ccmake
- )
-
--INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
-
-
- ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
- TARGET_LINK_LIBRARIES(ccmake CMakeLib)
--TARGET_LINK_LIBRARIES(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- INSTALL_TARGETS(/bin ccmake)
-+
-+
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
deleted file mode 100644
index 38bad92..0000000
--- a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Set some proper paths to make cmake find our tools.
-Original patch by Heiko Przybyl
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
---- cmake-2.8.3/Modules/Platform/Darwin.cmake
-+++ cmake-2.8.3/Modules/Platform/Darwin.cmake
-@@ -217,19 +217,23 @@
-
-
-
--# default to searching for frameworks first
--SET(CMAKE_FIND_FRAMEWORK FIRST)
-+# default to searching for frameworks last
-+SET(CMAKE_FIND_FRAMEWORK LAST)
- # set up the default search directories for frameworks
- SET(CMAKE_SYSTEM_FRAMEWORK_PATH
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /Network/Library/Frameworks
- /System/Library/Frameworks)
-
--# default to searching for application bundles first
--SET(CMAKE_FIND_APPBUNDLE FIRST)
-+# default to searching for application bundles last
-+SET(CMAKE_FIND_APPBUNDLE LAST)
- # set up the default search directories for application bundles
- SET(CMAKE_SYSTEM_APPBUNDLE_PATH
-+ @GENTOO_PORTAGE_EPREFIX@Applications
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
- ~/Applications
- /Applications
- /Developer/Applications)
-diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
-+++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@
- # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # Standard
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
- /usr/local /usr /
-
- # CMake install location
-@@ -44,43 +45,39 @@
-
- # List common include file locations not under the common prefixes.
- LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-- # Windows API on Cygwin
-- /usr/include/w32api
--
-- # X11
-- /usr/X11R6/include /usr/include/X11
--
-- # Other
-- /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/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
- )
-
- LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-- /usr/pkg/bin
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
-+ @GENTOO_PORTAGE_EPREFIX@bin
- )
-
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
- /lib /usr/lib /usr/lib32 /usr/lib64
- )
-
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
-
diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
deleted file mode 100644
index 45d2b16..0000000
--- a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake
---- cmake-2.8.3.orig//Modules/FindRuby.cmake 2010-12-25 16:56:42.597163498 +0100
-+++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0100
-@@ -180,7 +180,7 @@
-
-
- # Determine the list of possible names for the ruby library
--SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
-+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
-
- IF(WIN32)
- SET( _RUBY_MSVC_RUNTIME "" )
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
deleted file mode 100644
index 28d2e4f..0000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
-+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
-@@ -33,6 +33,8 @@
- ${Python_ADDITIONAL_VERSIONS}
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Python_VERSIONS)
- FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
- STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- IF(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch
deleted file mode 100644
index 8a8fe6f..0000000
--- a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001
-From: Clinton Stimpson <clinton@elemtech.com>
-Date: Wed, 5 Oct 2011 10:02:32 -0600
-Subject: [PATCH] Fix XML safety issue with adding preprocessor defines in CodeBlocks project.
-
----
- Source/cmExtraCodeBlocksGenerator.cxx | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
-index 7db91c7..9a0b1ea 100644
---- a/Source/cmExtraCodeBlocksGenerator.cxx
-+++ b/Source/cmExtraCodeBlocksGenerator.cxx
-@@ -19,6 +19,7 @@
- #include "cmGeneratedFileStream.h"
- #include "cmTarget.h"
- #include "cmSystemTools.h"
-+#include "cmXMLSafe.h"
-
- #include <cmsys/SystemTools.hxx>
-
-@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
- for(std::vector<std::string>::const_iterator di = defs.begin();
- di != defs.end(); ++di)
- {
-- fout <<" <Add option=\"-D" << di->c_str() << "\" />\n";
-+ cmXMLSafe safedef(di->c_str());
-+ fout <<" <Add option=\"-D" << safedef.str() << "\" />\n";
- }
- }
-
---
-1.7.0
-
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch
deleted file mode 100644
index 16b6480..0000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake
---- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-04 18:09:24.000000000 +0200
-+++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-11-22 23:04:17.000000000 +0100
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration for blas is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find BLAS library
- # This module finds an installed fortran library that implements the BLAS
- # linear-algebra interface (see http://www.netlib.org/blas/).
-@@ -39,6 +45,14 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(BLAS blas)
-+if(NOT BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(CheckFunctionExists)
- include(CheckFortranFunctionExists)
-
-@@ -622,3 +636,6 @@
- endif(BLA_F95)
-
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(NOT BLAS_FOUND)
-+
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch
deleted file mode 100644
index d4d4e94..0000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c7a600899bc3ca186ea1049af80bdc50b0d9ac49 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Fri, 13 Jan 2012 09:29:35 +0100
-Subject: [PATCH] Use eselected version in non exact version find operation.
- Fixes gentoo bug
- https://bugs.gentoo.org/show_bug.cgi?id=335108.
-
----
- Modules/FindBoost.cmake | 14 +++++++++++---
- 1 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index 9c03b3d..9ccda31 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -73,6 +73,9 @@
- # binary Boost releases do so.
- #
- # set(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
-+
-+# Some future versions to be safe
-+set(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48")
- #
- # ===================================== ============= ========================
- #
-@@ -658,9 +661,14 @@ else(_boost_IN_CACHE)
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- endif()
-
-- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
-- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
--
-+ # Rely only on eselected sym link version in gentoo
-+ # in case of no exact version version search.
-+ # See https://bugs.gentoo.org/show_bug.cgi?id=335108
-+ if( Boost_FIND_VERSION_EXACT )
-+ list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
-+ list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
-+ endif( Boost_FIND_VERSION_EXACT )
-+
- endforeach(_boost_VER)
-
- if(Boost_DEBUG)
---
-1.7.8.3
-
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
deleted file mode 100644
index 579a07d..0000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800
-+++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find LAPACK library
- # This module finds an installed fortran library that implements the LAPACK
- # linear-algebra interface (see http://www.netlib.org/lapack/).
-@@ -36,6 +42,14 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(LAPACK lapack)
-+if(NOT LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-+
- set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
- get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
-@@ -304,4 +318,6 @@
- endif(NOT LAPACK_FIND_QUIETLY)
- endif(BLA_F95)
-
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(NOT LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
deleted file mode 100644
index 7746767..0000000
--- a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in
-index 97b2a07..edafb4ef 100644
---- a/Tests/CTestUpdateSVN.cmake.in
-+++ b/Tests/CTestUpdateSVN.cmake.in
-@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config)
- set(SVNCMD ${SVN} --config-dir ${TOP}/config)
- set(SVNUSER --username "test author" --non-interactive)
-
-+# Configure for this svn version.
-+execute_process(
-+ COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add
-+ )
-+if("${help_add}" MATCHES "--depth")
-+ set(depth_empty "--depth=empty")
-+else()
-+ set(depth_empty "")
-+endif()
-+
- #-----------------------------------------------------------------------------
- # Initialize the testing directory.
- message("Creating test directory...")
-@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added)
- if(dirs_added)
- run_child(
- WORKING_DIRECTORY ${TOP}/user-source
-- COMMAND ${SVNCMD} add ${dirs_added}
-+ COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added}
- )
- endif(dirs_added)
- run_child(
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-04-22 14:47 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2012-04-22 14:47 UTC (permalink / raw
To: gentoo-commits
commit: e12461b061fbfa6e480ae3fa9a19fb0745190f38
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 14:47:30 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 14:47:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e12461b0
[dev-util/cmake] Version bump.
(Portage version: 2.2.0_alpha100/git/Linux i686, unsigned Manifest commit)
---
dev-util/cmake/cmake-2.8.8.ebuild | 175 ++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 +++
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 +++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake-2.8.0-darwin-default-install_name.patch | 20 +++
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ++++++
.../files/cmake-2.8.3-more-no_host_paths.patch | 109 ++++++++++++
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 ++
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 +++++
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 ++++++++
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
14 files changed, 621 insertions(+), 0 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
new file mode 100644
index 0000000..169a9bc
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r5.ebuild,v 1.1 2012/03/09 01:22:06 dilfridge Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+
+MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+DEPEND="
+ >=app-arch/libarchive-2.8.0
+ >=net-misc/curl-7.20.0-r1[ssl]
+ >=dev-libs/expat-2.0.1
+ dev-util/pkgconfig
+ sys-libs/zlib
+ ncurses? ( sys-libs/ncurses )
+ qt4? ( x11-libs/qt-gui:4 )
+"
+RDEPEND="${DEPEND}
+ emacs? ( virtual/emacs )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+# TODO "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
+# needs replacement in 2.8.8.
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+ "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+ "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
+ "${FILESDIR}"/${PN}-2.8.1-libform.patch
+ "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+)
+cmake_src_bootstrap() {
+ # Cleanup args to extract only JOBS.
+ # Because bootstrap does not know anything else.
+ echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+ if [ $? -eq 0 ]; then
+ par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
+ par_arg="--parallel=${par_arg}"
+ else
+ par_arg="--parallel=1"
+ fi
+
+ tc-export CC CXX LD
+
+ ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ ${par_arg} \
+ || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+ # fix OutDir test
+ # this is altered thanks to our eclass
+ sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+ # as it was never intended to be used this way.
+ "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+ -E BootstrapTest SimpleCOnly_sdcc \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+pkg_setup() {
+ einfo "Fixing java access violations ..."
+ # bug 387227
+ addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # disable running of cmake in boostrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+ cmake_src_bootstrap
+}
+
+src_configure() {
+ # make things work with gentoo java setup
+ # in case java-config cannot be run, the variable just becomes unset
+ # per bug #315229
+ export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ $(cmake-utils_use_build ncurses CursesDialog)
+ $(cmake-utils_use_build qt4 QtDialog)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use emacs; then
+ elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/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-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
new file mode 100644
index 0000000..6ee9b70
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
@@ -0,0 +1,23 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -23,7 +23,7 @@
+ SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ SET(CMAKE_SHARED_MODULE_PREFIX "lib")
+-SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
++SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ SET(CMAKE_MODULE_EXISTS 1)
+ SET(CMAKE_DL_LIBS "")
+
+@@ -45,7 +45,7 @@
+ SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+ SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+ SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+-SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
++SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
+
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
new file mode 100644
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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
new file mode 100644
index 0000000..87c7247
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.1-libform.patch
@@ -0,0 +1,50 @@
+diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
+--- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
++++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
+@@ -314,9 +314,6 @@
+ ELSE (UNIX)
+ SET(BUILD_CursesDialog 0)
+ ENDIF (UNIX)
+- IF(BUILD_CursesDialog)
+- ADD_SUBDIRECTORY(Source/CursesDialog/form)
+- ENDIF(BUILD_CursesDialog)
+ ENDMACRO (CMAKE_BUILD_UTILITIES)
+
+
+diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
+--- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
++++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
+@@ -25,13 +25,18 @@
+ CursesDialog/ccmake
+ )
+
+-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
+- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
+ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
+
+
+ ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
+ TARGET_LINK_LIBRARIES(ccmake CMakeLib)
+-TARGET_LINK_LIBRARIES(ccmake cmForm)
++TARGET_LINK_LIBRARIES(ccmake form)
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
++IF(CURSES_EXTRA_LIBRARY)
++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
++ENDIF(CURSES_EXTRA_LIBRARY)
++
+
+ INSTALL_TARGETS(/bin ccmake)
++
++
+diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
+--- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
++++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
+@@ -15,8 +15,6 @@
+ #define _MSE_INT_H
+ #endif
+
+-#include <cmFormConfigure.h>
+-
+ #if defined(__hpux)
+ # define _BOOL_DEFINED
+ # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
new file mode 100644
index 0000000..38bad92
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
@@ -0,0 +1,109 @@
+Set some proper paths to make cmake find our tools.
+Original patch by Heiko Przybyl
+
+The ebuild now adds an extra / at the end of $EPREFIX so that it is
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
+correct)
+
+--- cmake-2.8.3/Modules/Platform/Darwin.cmake
++++ cmake-2.8.3/Modules/Platform/Darwin.cmake
+@@ -217,19 +217,23 @@
+
+
+
+-# default to searching for frameworks first
+-SET(CMAKE_FIND_FRAMEWORK FIRST)
++# default to searching for frameworks last
++SET(CMAKE_FIND_FRAMEWORK LAST)
+ # set up the default search directories for frameworks
+ SET(CMAKE_SYSTEM_FRAMEWORK_PATH
++ @GENTOO_PORTAGE_EPREFIX@Frameworks
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /Network/Library/Frameworks
+ /System/Library/Frameworks)
+
+-# default to searching for application bundles first
+-SET(CMAKE_FIND_APPBUNDLE FIRST)
++# default to searching for application bundles last
++SET(CMAKE_FIND_APPBUNDLE LAST)
+ # set up the default search directories for application bundles
+ SET(CMAKE_SYSTEM_APPBUNDLE_PATH
++ @GENTOO_PORTAGE_EPREFIX@Applications
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
+ ~/Applications
+ /Applications
+ /Developer/Applications)
+diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
++++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
+@@ -33,6 +33,7 @@
+ # search types.
+ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ # Standard
++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
+ /usr/local /usr /
+
+ # CMake install location
+@@ -44,43 +45,39 @@
+
+ # List common include file locations not under the common prefixes.
+ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+- # Windows API on Cygwin
+- /usr/include/w32api
+-
+- # X11
+- /usr/X11R6/include /usr/include/X11
+-
+- # Other
+- /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/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
+ )
+
+ LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+- /usr/pkg/bin
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
++ @GENTOO_PORTAGE_EPREFIX@bin
+ )
+
+ LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++ @GENTOO_PORTAGE_GCCLIBDIR@
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
+ /lib /usr/lib /usr/lib32 /usr/lib64
+ )
+
+ LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
++ @GENTOO_PORTAGE_EPREFIX@usr/include
+ /usr/include
+ )
+ LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
++ @GENTOO_PORTAGE_EPREFIX@usr/include
+ /usr/include
+ )
+
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
new file mode 100644
index 0000000..28d2e4f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
@@ -0,0 +1,12 @@
+diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
+--- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
++++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
+@@ -33,6 +33,8 @@
+ ${Python_ADDITIONAL_VERSIONS}
+ 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Python_VERSIONS)
+ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
+ STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ IF(WIN32)
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.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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-04-22 15:04 Chris Reffett
0 siblings, 0 replies; 30+ messages in thread
From: Chris Reffett @ 2012-04-22 15:04 UTC (permalink / raw
To: gentoo-commits
commit: 59cfdb5e8acff3f4d0e45a3db9736c7751358159
Author: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
AuthorDate: Sun Apr 22 15:02:04 2012 +0000
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Sun Apr 22 15:02:04 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=59cfdb5e
[dev-util/cmake] Update more-no_host_paths.patch to be compatible with cmake 2.8.8, add patch line to ebuild
(Portage version: 2.2.0_alpha100/git/Linux x86_64, unsigned Manifest commit)
---
dev-util/cmake/cmake-2.8.8.ebuild | 1 +
....patch => cmake-2.8.8-more-no_host_paths.patch} | 23 ++++++++++---------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
index 169a9bc..f3f6ff7 100644
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch
)
cmake_src_bootstrap() {
# Cleanup args to extract only JOBS.
diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
similarity index 83%
rename from dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
rename to dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
index 38bad92..ca76835 100644
--- a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
+++ b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
@@ -1,13 +1,13 @@
Set some proper paths to make cmake find our tools.
-Original patch by Heiko Przybyl
+Original patch by Heiko Przybyl, updated for cmake-2.8.8 by Chris Reffett
The ebuild now adds an extra / at the end of $EPREFIX so that it is
never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
correct)
---- cmake-2.8.3/Modules/Platform/Darwin.cmake
-+++ cmake-2.8.3/Modules/Platform/Darwin.cmake
-@@ -217,19 +217,23 @@
+--- cmake-2.8.8/Modules/Platform/Darwin.cmake
++++ cmake-2.8.8/Modules/Platform/Darwin.cmake
+@@ -229,20 +229,24 @@
@@ -29,15 +29,16 @@ correct)
+# default to searching for application bundles last
+SET(CMAKE_FIND_APPBUNDLE LAST)
# set up the default search directories for application bundles
- SET(CMAKE_SYSTEM_APPBUNDLE_PATH
+ SET(_apps_paths)
+ FOREACH(_path
+ @GENTOO_PORTAGE_EPREFIX@Applications
+ @GENTOO_PORTAGE_EPREFIX@usr/bin
- ~/Applications
- /Applications
- /Developer/Applications)
-diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
-+++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
+ "~/Applications"
+ "/Applications"
+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+diff -ruN cmake-2.8.8.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.8/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.8/Modules/Platform/UnixPaths.cmake
++++ cmake-2.8.8/Modules/Platform/UnixPaths.cmake
@@ -33,6 +33,7 @@
# search types.
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-04-30 9:04 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2012-04-30 9:04 UTC (permalink / raw
To: gentoo-commits
commit: 5ba010a35ad373030c8dfaffab1e8969660e3cf4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 09:04:35 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 09:04:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5ba010a3
[dev-util/cmake] Add patch for FindPkgConfig to respect PKG_CONFIG environment variable by DaboD <daiderek <AT> gmail.com> bug 414037.
(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)
---
dev-util/cmake/cmake-2.8.8.ebuild | 1 +
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
index 7f49779..c203b12 100644
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
"${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch
)
cmake_src_bootstrap() {
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)
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-05-01 22:18 Chris Reffett
0 siblings, 0 replies; 30+ messages in thread
From: Chris Reffett @ 2012-05-01 22:18 UTC (permalink / raw
To: gentoo-commits
commit: a9d026ede38de3254565a5fa62c09b14746571e3
Author: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
AuthorDate: Tue May 1 22:16:25 2012 +0000
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Tue May 1 22:16:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a9d026ed
[dev-util/cmake] Added patch to remove failing tests, removed RESTRICT
---
dev-util/cmake/cmake-2.8.8.ebuild | 4 +-
dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 ++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
index 11db0c4..1386340 100644
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -18,9 +18,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
SLOT="0"
IUSE="emacs ncurses qt4 vim-syntax"
-#Test 62 wiped out /usr/local/, restricting until that's fixed
-RESTRICT="test"
-
DEPEND="
>=app-arch/libarchive-2.8.0
>=net-misc/curl-7.20.0-r1[ssl]
@@ -62,6 +59,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
"${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch
+ "${FILESDIR}"/${PN}-2.8.8-tests.patch
)
cmake_src_bootstrap() {
# Cleanup args to extract only JOBS.
diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch
new file mode 100644
index 0000000..64af9d3
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-tests.patch
@@ -0,0 +1,58 @@
+Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root
+--- cmake-2.8.8/Tests/CMakeLists.txt
++++ cmake-2.8.8/Tests/CMakeLists.txt
+@@ -273,23 +273,6 @@
+ )
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+- # this test also depends on the existence of the standard qtiff plugin
+- if(QT4_WORKS AND QT_QTSQL_FOUND)
+- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+- --build-and-test
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+- --build-generator ${CMAKE_TEST_GENERATOR}
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+- --build-project Qt4Deploy
+- --build-options
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+- )
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+- endif()
+-
+ endif()
+ endif()
+
+@@ -1548,30 +1531,6 @@
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+ ENDIF(Subversion_FOUND)
+
+- # Test CTest Update with CVS
+- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- FIND_PACKAGE(CVS QUIET)
+- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
+- SET(CVS_FOUND ${CVS_EXECUTABLE})
+- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+- SET(CTEST_TEST_UPDATE_CVS 0)
+- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- IF(CTEST_TEST_UPDATE_CVS)
+- SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
+- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+- )
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+- ENDIF(CTEST_TEST_UPDATE_CVS)
+-
+ # Test CTest Update with BZR
+ FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
+ MARK_AS_ADVANCED(BZR_EXECUTABLE)
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-05-02 21:13 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2012-05-02 21:13 UTC (permalink / raw
To: gentoo-commits
commit: e011152254bc7c27f6d5ebcede5dae420644c5fe
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 2 21:12:29 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 2 21:12:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e0111522
[dev-util/cmake] Moved to tree.
(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)
---
dev-util/cmake/cmake-2.8.8.ebuild | 176 --------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 ---
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 -----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
.../cmake-2.8.0-darwin-default-install_name.patch | 20 ---
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ------
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 --
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 -----
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 --------
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 -----
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
.../files/cmake-2.8.8-more-no_host_paths.patch | 110 ------------
dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 -------
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
16 files changed, 0 insertions(+), 699 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
deleted file mode 100644
index cab3e53..0000000
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0
- >=net-misc/curl-7.20.0-r1[ssl]
- >=dev-libs/expat-2.0.1
- dev-util/pkgconfig
- sys-libs/zlib
- ncurses? ( sys-libs/ncurses )
- qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.1-libform.patch
- "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.8-tests.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
- # as it was never intended to be used this way.
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E BootstrapTest SimpleCOnly_sdcc \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- einfo "Fixing java access violations ..."
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- base_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
deleted file mode 100644
index 6ee9b70..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
---- Modules/Platform/Darwin.cmake
-+++ Modules/Platform/Darwin.cmake
-@@ -23,7 +23,7 @@
- SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- SET(CMAKE_SHARED_MODULE_PREFIX "lib")
--SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- SET(CMAKE_MODULE_EXISTS 1)
- SET(CMAKE_DL_LIBS "")
-
-@@ -45,7 +45,7 @@
- SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
- SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
-+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
-
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4ef0c7b..0000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
deleted file mode 100644
index 87c7247..0000000
--- a/dev-util/cmake/files/cmake-2.8.1-libform.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
-+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
-@@ -314,9 +314,6 @@
- ELSE (UNIX)
- SET(BUILD_CursesDialog 0)
- ENDIF (UNIX)
-- IF(BUILD_CursesDialog)
-- ADD_SUBDIRECTORY(Source/CursesDialog/form)
-- ENDIF(BUILD_CursesDialog)
- ENDMACRO (CMAKE_BUILD_UTILITIES)
-
-
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
-@@ -25,13 +25,18 @@
- CursesDialog/ccmake
- )
-
--INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
-
-
- ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
- TARGET_LINK_LIBRARIES(ccmake CMakeLib)
--TARGET_LINK_LIBRARIES(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- INSTALL_TARGETS(/bin ccmake)
-+
-+
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
deleted file mode 100644
index 28d2e4f..0000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
-+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
-@@ -33,6 +33,8 @@
- ${Python_ADDITIONAL_VERSIONS}
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Python_VERSIONS)
- FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
- STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- IF(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
deleted file mode 100644
index a91214c..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index edaa91f..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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
deleted file mode 100644
index 6808b80..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index c5e17c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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-2.8.8-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
deleted file mode 100644
index ca76835..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Set some proper paths to make cmake find our tools.
-Original patch by Heiko Przybyl, updated for cmake-2.8.8 by Chris Reffett
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
---- cmake-2.8.8/Modules/Platform/Darwin.cmake
-+++ cmake-2.8.8/Modules/Platform/Darwin.cmake
-@@ -229,20 +229,24 @@
-
-
-
--# default to searching for frameworks first
--SET(CMAKE_FIND_FRAMEWORK FIRST)
-+# default to searching for frameworks last
-+SET(CMAKE_FIND_FRAMEWORK LAST)
- # set up the default search directories for frameworks
- SET(CMAKE_SYSTEM_FRAMEWORK_PATH
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /Network/Library/Frameworks
- /System/Library/Frameworks)
-
--# default to searching for application bundles first
--SET(CMAKE_FIND_APPBUNDLE FIRST)
-+# default to searching for application bundles last
-+SET(CMAKE_FIND_APPBUNDLE LAST)
- # set up the default search directories for application bundles
- SET(_apps_paths)
- FOREACH(_path
-+ @GENTOO_PORTAGE_EPREFIX@Applications
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
- "~/Applications"
- "/Applications"
- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-diff -ruN cmake-2.8.8.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.8/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.8/Modules/Platform/UnixPaths.cmake
-+++ cmake-2.8.8/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@
- # search types.
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # Standard
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
- /usr/local /usr /
-
- # CMake install location
-@@ -44,43 +45,39 @@
-
- # List common include file locations not under the common prefixes.
- LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-- # Windows API on Cygwin
-- /usr/include/w32api
--
-- # X11
-- /usr/X11R6/include /usr/include/X11
--
-- # Other
-- /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/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
- )
-
- LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-- /usr/pkg/bin
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
-+ @GENTOO_PORTAGE_EPREFIX@bin
- )
-
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
- /lib /usr/lib /usr/lib32 /usr/lib64
- )
-
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
-
diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch
deleted file mode 100644
index 64af9d3..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-tests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root
---- cmake-2.8.8/Tests/CMakeLists.txt
-+++ cmake-2.8.8/Tests/CMakeLists.txt
-@@ -273,23 +273,6 @@
- )
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
-
-- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
-- # this test also depends on the existence of the standard qtiff plugin
-- if(QT4_WORKS AND QT_QTSQL_FOUND)
-- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
-- --build-and-test
-- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
-- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
-- --build-generator ${CMAKE_TEST_GENERATOR}
-- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-- --build-project Qt4Deploy
-- --build-options
-- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-- )
-- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
-- endif()
--
- endif()
- endif()
-
-@@ -1548,30 +1531,6 @@
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
- ENDIF(Subversion_FOUND)
-
-- # Test CTest Update with CVS
-- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- FIND_PACKAGE(CVS QUIET)
-- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
-- SET(CVS_FOUND ${CVS_EXECUTABLE})
-- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
-- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
-- SET(CTEST_TEST_UPDATE_CVS 0)
-- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- IF(CTEST_TEST_UPDATE_CVS)
-- SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
-- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
-- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
-- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
-- )
-- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
-- ENDIF(CTEST_TEST_UPDATE_CVS)
--
- # Test CTest Update with BZR
- FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
- MARK_AS_ADVANCED(BZR_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-08-15 13:33 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2012-08-15 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 8b5bfd2430ee0ff1989668ff97db024bb5a3c390
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 13:24:44 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 13:24:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8b5bfd24
[dev-util/cmake] Version bump 2.8.9.
(Portage version: 2.2.0_alpha120/git/Linux i686, unsigned Manifest commit)
---
dev-util/cmake/cmake-2.8.9.ebuild | 177 ++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 +++
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 +++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake-2.8.0-darwin-default-install_name.patch | 20 +++
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ++++++
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 ++
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 +++++
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 ++++++++
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++
dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 +++++++
.../files/cmake-2.8.9-more-no_host_paths.patch | 133 +++++++++++++++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
16 files changed, 723 insertions(+), 0 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.9.ebuild b/dev-util/cmake/cmake-2.8.9.ebuild
new file mode 100644
index 0000000..df8689e
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.9.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r3.ebuild,v 1.2 2012/06/17 15:31:44 grobian Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+
+MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+DEPEND="
+ >=app-arch/libarchive-2.8.0
+ >=net-misc/curl-7.20.0-r1[ssl]
+ >=dev-libs/expat-2.0.1
+ virtual/pkgconfig
+ sys-libs/zlib
+ ncurses? ( sys-libs/ncurses )
+ qt4? ( x11-libs/qt-gui:4 )
+"
+RDEPEND="${DEPEND}
+ emacs? ( virtual/emacs )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
+ "${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.0-darwin-default-install_name.patch
+ "${FILESDIR}"/${PN}-2.8.1-libform.patch
+ "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+ "${FILESDIR}"/${PN}-2.8.8-tests.patch
+ "${FILESDIR}"/${PN}-2.8.9-more-no_host_paths.patch
+)
+
+cmake_src_bootstrap() {
+ # Cleanup args to extract only JOBS.
+ # Because bootstrap does not know anything else.
+ echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+ if [ $? -eq 0 ]; then
+ par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
+ par_arg="--parallel=${par_arg}"
+ else
+ par_arg="--parallel=1"
+ fi
+
+ tc-export CC CXX LD
+
+ # bootstrap script isn't exactly /bin/sh compatible
+ ${CONFIG_SHELL:-sh} ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ ${par_arg} \
+ || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+ # fix OutDir test
+ # this is altered thanks to our eclass
+ sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+ # as it was never intended to be used this way.
+ "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+ -E BootstrapTest SimpleCOnly_sdcc \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+pkg_setup() {
+ einfo "Fixing java access violations ..."
+ # bug 387227
+ addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # disable running of cmake in boostrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+ cmake_src_bootstrap
+}
+
+src_configure() {
+ # make things work with gentoo java setup
+ # in case java-config cannot be run, the variable just becomes unset
+ # per bug #315229
+ export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ $(cmake-utils_use_build ncurses CursesDialog)
+ $(cmake-utils_use_build qt4 QtDialog)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use emacs; then
+ elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/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-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
new file mode 100644
index 0000000..6ee9b70
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
@@ -0,0 +1,23 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -23,7 +23,7 @@
+ SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ SET(CMAKE_SHARED_MODULE_PREFIX "lib")
+-SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
++SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ SET(CMAKE_MODULE_EXISTS 1)
+ SET(CMAKE_DL_LIBS "")
+
+@@ -45,7 +45,7 @@
+ SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+ SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+ SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+-SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
++SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
+
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
new file mode 100644
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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
new file mode 100644
index 0000000..87c7247
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.1-libform.patch
@@ -0,0 +1,50 @@
+diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
+--- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
++++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
+@@ -314,9 +314,6 @@
+ ELSE (UNIX)
+ SET(BUILD_CursesDialog 0)
+ ENDIF (UNIX)
+- IF(BUILD_CursesDialog)
+- ADD_SUBDIRECTORY(Source/CursesDialog/form)
+- ENDIF(BUILD_CursesDialog)
+ ENDMACRO (CMAKE_BUILD_UTILITIES)
+
+
+diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
+--- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
++++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
+@@ -25,13 +25,18 @@
+ CursesDialog/ccmake
+ )
+
+-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
+- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
+ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
+
+
+ ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
+ TARGET_LINK_LIBRARIES(ccmake CMakeLib)
+-TARGET_LINK_LIBRARIES(ccmake cmForm)
++TARGET_LINK_LIBRARIES(ccmake form)
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
++IF(CURSES_EXTRA_LIBRARY)
++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
++ENDIF(CURSES_EXTRA_LIBRARY)
++
+
+ INSTALL_TARGETS(/bin ccmake)
++
++
+diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
+--- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
++++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
+@@ -15,8 +15,6 @@
+ #define _MSE_INT_H
+ #endif
+
+-#include <cmFormConfigure.h>
+-
+ #if defined(__hpux)
+ # define _BOOL_DEFINED
+ # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
new file mode 100644
index 0000000..28d2e4f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
@@ -0,0 +1,12 @@
+diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
+--- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
++++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
+@@ -33,6 +33,8 @@
+ ${Python_ADDITIONAL_VERSIONS}
+ 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Python_VERSIONS)
+ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
+ STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ IF(WIN32)
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-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch
new file mode 100644
index 0000000..64af9d3
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-tests.patch
@@ -0,0 +1,58 @@
+Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root
+--- cmake-2.8.8/Tests/CMakeLists.txt
++++ cmake-2.8.8/Tests/CMakeLists.txt
+@@ -273,23 +273,6 @@
+ )
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+- # this test also depends on the existence of the standard qtiff plugin
+- if(QT4_WORKS AND QT_QTSQL_FOUND)
+- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+- --build-and-test
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+- --build-generator ${CMAKE_TEST_GENERATOR}
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+- --build-project Qt4Deploy
+- --build-options
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+- )
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+- endif()
+-
+ endif()
+ endif()
+
+@@ -1548,30 +1531,6 @@
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+ ENDIF(Subversion_FOUND)
+
+- # Test CTest Update with CVS
+- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- FIND_PACKAGE(CVS QUIET)
+- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
+- SET(CVS_FOUND ${CVS_EXECUTABLE})
+- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+- SET(CTEST_TEST_UPDATE_CVS 0)
+- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- IF(CTEST_TEST_UPDATE_CVS)
+- SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
+- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+- )
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+- ENDIF(CTEST_TEST_UPDATE_CVS)
+-
+ # Test CTest Update with BZR
+ FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
+ MARK_AS_ADVANCED(BZR_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
new file mode 100644
index 0000000..4e833ca
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
@@ -0,0 +1,133 @@
+From 3f5fa933d17e24cafd75ae28c00f4fc0292eae92 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Wed, 15 Aug 2012 14:42:16 +0200
+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)
+Update by Johannes Huber (cmake-2.8.9)
+---
+ 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 eff07b2..cbedc47 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -228,24 +228,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 5ee7ddb..961746d 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.7.9.7
+
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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-08-19 12:59 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2012-08-19 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 8069259eddd4fb224fc7e96d61987c72d11dac2a
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 19 13:04:43 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 13:04:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8069259e
[dev-util/cmake] Moved to tree.
(Portage version: 2.2.0_alpha121/git/Linux i686, unsigned Manifest commit)
---
dev-util/cmake/cmake-2.8.9.ebuild | 177 --------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 ---
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 -----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
.../cmake-2.8.0-darwin-default-install_name.patch | 20 ---
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ------
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 --
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 -----
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 --------
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 -----
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 -------
.../files/cmake-2.8.9-more-no_host_paths.patch | 133 ---------------
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
16 files changed, 0 insertions(+), 723 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.9.ebuild b/dev-util/cmake/cmake-2.8.9.ebuild
deleted file mode 100644
index df8689e..0000000
--- a/dev-util/cmake/cmake-2.8.9.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r3.ebuild,v 1.2 2012/06/17 15:31:44 grobian Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0
- >=net-misc/curl-7.20.0-r1[ssl]
- >=dev-libs/expat-2.0.1
- virtual/pkgconfig
- sys-libs/zlib
- ncurses? ( sys-libs/ncurses )
- qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
- "${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.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.1-libform.patch
- "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.8-tests.patch
- "${FILESDIR}"/${PN}-2.8.9-more-no_host_paths.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
- # as it was never intended to be used this way.
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E BootstrapTest SimpleCOnly_sdcc \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- einfo "Fixing java access violations ..."
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- base_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
deleted file mode 100644
index 6ee9b70..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
---- Modules/Platform/Darwin.cmake
-+++ Modules/Platform/Darwin.cmake
-@@ -23,7 +23,7 @@
- SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- SET(CMAKE_SHARED_MODULE_PREFIX "lib")
--SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- SET(CMAKE_MODULE_EXISTS 1)
- SET(CMAKE_DL_LIBS "")
-
-@@ -45,7 +45,7 @@
- SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
- SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
-+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
-
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4ef0c7b..0000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
deleted file mode 100644
index 87c7247..0000000
--- a/dev-util/cmake/files/cmake-2.8.1-libform.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
-+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
-@@ -314,9 +314,6 @@
- ELSE (UNIX)
- SET(BUILD_CursesDialog 0)
- ENDIF (UNIX)
-- IF(BUILD_CursesDialog)
-- ADD_SUBDIRECTORY(Source/CursesDialog/form)
-- ENDIF(BUILD_CursesDialog)
- ENDMACRO (CMAKE_BUILD_UTILITIES)
-
-
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
-@@ -25,13 +25,18 @@
- CursesDialog/ccmake
- )
-
--INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
-
-
- ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
- TARGET_LINK_LIBRARIES(ccmake CMakeLib)
--TARGET_LINK_LIBRARIES(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- INSTALL_TARGETS(/bin ccmake)
-+
-+
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
deleted file mode 100644
index 28d2e4f..0000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
-+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
-@@ -33,6 +33,8 @@
- ${Python_ADDITIONAL_VERSIONS}
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Python_VERSIONS)
- FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
- STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- IF(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
deleted file mode 100644
index a91214c..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index edaa91f..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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
deleted file mode 100644
index 6808b80..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index c5e17c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch
deleted file mode 100644
index 64af9d3..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-tests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root
---- cmake-2.8.8/Tests/CMakeLists.txt
-+++ cmake-2.8.8/Tests/CMakeLists.txt
-@@ -273,23 +273,6 @@
- )
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
-
-- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
-- # this test also depends on the existence of the standard qtiff plugin
-- if(QT4_WORKS AND QT_QTSQL_FOUND)
-- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
-- --build-and-test
-- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
-- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
-- --build-generator ${CMAKE_TEST_GENERATOR}
-- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-- --build-project Qt4Deploy
-- --build-options
-- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-- )
-- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
-- endif()
--
- endif()
- endif()
-
-@@ -1548,30 +1531,6 @@
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
- ENDIF(Subversion_FOUND)
-
-- # Test CTest Update with CVS
-- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- FIND_PACKAGE(CVS QUIET)
-- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
-- SET(CVS_FOUND ${CVS_EXECUTABLE})
-- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
-- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
-- SET(CTEST_TEST_UPDATE_CVS 0)
-- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- IF(CTEST_TEST_UPDATE_CVS)
-- SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
-- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
-- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
-- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
-- )
-- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
-- ENDIF(CTEST_TEST_UPDATE_CVS)
--
- # Test CTest Update with BZR
- FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
- MARK_AS_ADVANCED(BZR_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
deleted file mode 100644
index 4e833ca..0000000
--- a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 3f5fa933d17e24cafd75ae28c00f4fc0292eae92 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Wed, 15 Aug 2012 14:42:16 +0200
-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)
-Update by Johannes Huber (cmake-2.8.9)
----
- 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 eff07b2..cbedc47 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
-@@ -228,24 +228,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 5ee7ddb..961746d 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.7.9.7
-
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-11-06 13:10 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2012-11-06 13:10 UTC (permalink / raw
To: gentoo-commits
commit: b97592c812f879f3bf16261487efff673c58c339
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 6 13:03:12 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Nov 6 13:07:39 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b97592c8
[dev-util/cmake] Version bump.
Package-Manager: portage-2.1.11.31
---
dev-util/cmake/cmake-2.8.10.ebuild | 181 ++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 +++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake-2.8.0-darwin-default-install_name.patch | 20 +++
.../cmake/files/cmake-2.8.10-FindPythonLibs.patch | 13 ++
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++
.../files/cmake-2.8.10-more-no_host_paths.patch | 134 +++++++++++++++
dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 +++++++++
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 +++++
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 ++++++++
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
17 files changed, 768 insertions(+), 0 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.10.ebuild b/dev-util/cmake/cmake-2.8.10.ebuild
new file mode 100644
index 0000000..90d7157
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.10.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.9-r1.ebuild,v 1.1 2012/10/02 10:23:44 kensington Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+
+MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+DEPEND="
+ >=app-arch/libarchive-2.8.0
+ >=dev-libs/expat-2.0.1
+ >=net-misc/curl-7.20.0-r1[ssl]
+ sys-libs/zlib
+ virtual/pkgconfig
+ ncurses? ( sys-libs/ncurses )
+ qt4? (
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ )
+"
+RDEPEND="${DEPEND}
+ emacs? ( virtual/emacs )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_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.0-darwin-default-install_name.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.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-desktop.patch
+ "${FILESDIR}"/${PN}-2.8.10-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-2.8.10-libform.patch
+ "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
+ "${FILESDIR}"/${PN}-2.8.10-tests.patch
+)
+
+cmake_src_bootstrap() {
+ # Cleanup args to extract only JOBS.
+ # Because bootstrap does not know anything else.
+ echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+ if [ $? -eq 0 ]; then
+ par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
+ par_arg="--parallel=${par_arg}"
+ else
+ par_arg="--parallel=1"
+ fi
+
+ tc-export CC CXX LD
+
+ # bootstrap script isn't exactly /bin/sh compatible
+ ${CONFIG_SHELL:-sh} ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ ${par_arg} \
+ || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+ # fix OutDir test
+ # this is altered thanks to our eclass
+ sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+ # as it was never intended to be used this way.
+ "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+ -E BootstrapTest SimpleCOnly_sdcc \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+pkg_setup() {
+ einfo "Fixing java access violations ..."
+ # bug 387227
+ addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # disable running of cmake in boostrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+ cmake_src_bootstrap
+}
+
+src_configure() {
+ # make things work with gentoo java setup
+ # in case java-config cannot be run, the variable just becomes unset
+ # per bug #315229
+ export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ $(cmake-utils_use_build ncurses CursesDialog)
+ $(cmake-utils_use_build qt4 QtDialog)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use emacs; then
+ elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/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-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
new file mode 100644
index 0000000..d4f18ff
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index 0a9a990..6a13d22 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)
+ unset(_PYTHON3_VERSIONS)
+
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Python_VERSIONS)
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+ string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ if(WIN32)
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-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-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch
new file mode 100644
index 0000000..944e3c5
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-tests.patch
@@ -0,0 +1,83 @@
+Removes the following tests:
+
+- DeployQt4, which tries to break sandbox and ignores prefix
+- CTest.updatecvs, which fails to commit as root
+- TestUpload, which requires network access
+
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index b404333..50f4292 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -271,23 +271,6 @@ if(BUILD_TESTING)
+ )
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+- # this test also depends on the existence of the standard qtiff plugin
+- if(QT4_WORKS AND QT_QTSQL_FOUND)
+- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+- --build-and-test
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+- --build-generator ${CMAKE_TEST_GENERATOR}
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+- --build-project Qt4Deploy
+- --build-options
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+- )
+- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+- endif()
+-
+ endif()
+ endif()
+
+@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+ endif()
+
+- # Test CTest Update with CVS
+- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- find_package(CVS QUIET)
+- else()
+- find_program(CVS_EXECUTABLE NAMES cvs)
+- set(CVS_FOUND ${CVS_EXECUTABLE})
+- endif()
+- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- if("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+- set(CTEST_TEST_UPDATE_CVS 0)
+- endif()
+- endif()
+- if(CTEST_TEST_UPDATE_CVS)
+- set(CTestUpdateCVS_DIR "CTest UpdateCVS")
+- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+- )
+- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+- endif()
+-
+ # Test CTest Update with BZR
+ find_program(BZR_EXECUTABLE NAMES bzr)
+ mark_as_advanced(BZR_EXECUTABLE)
+@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
+ FAIL_REGULAR_EXPRESSION "SegFault")
+
+ configure_file(
+- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
+- @ONLY ESCAPE_QUOTES)
+- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
+- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
+- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
+- )
+- set_tests_properties(CTestTestUpload PROPERTIES
+- PASS_REGULAR_EXPRESSION "Upload\\.xml")
+-
+- configure_file(
+ "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
+ @ONLY ESCAPE_QUOTES)
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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2012-11-18 13:45 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2012-11-18 13:45 UTC (permalink / raw
To: gentoo-commits
commit: caa9549623d858b3f20615ccb94829d78f2856e9
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 13:42:05 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 13:42:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=caa95496
[dev-util/cmake] Moved to portage.
---
dev-util/cmake/cmake-2.8.10.1.ebuild | 177 -------------------
dev-util/cmake/cmake-2.8.10.ebuild | 181 --------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 -----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
.../cmake-2.8.0-darwin-default-install_name.patch | 20 ---
.../cmake/files/cmake-2.8.10-FindPythonLibs.patch | 13 --
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 ---
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 --
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------
.../files/cmake-2.8.10-more-no_host_paths.patch | 134 ---------------
dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 ---------
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 -----
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 --------
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 -----
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
18 files changed, 0 insertions(+), 945 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.10.1.ebuild b/dev-util/cmake/cmake-2.8.10.1.ebuild
deleted file mode 100644
index c929653..0000000
--- a/dev-util/cmake/cmake-2.8.10.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.9-r1.ebuild,v 1.1 2012/10/02 10:23:44 kensington Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses )
- qt4? (
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-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.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.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-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- einfo "Fixing java access violations ..."
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- base_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.10.ebuild b/dev-util/cmake/cmake-2.8.10.ebuild
deleted file mode 100644
index 90d7157..0000000
--- a/dev-util/cmake/cmake-2.8.10.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.9-r1.ebuild,v 1.1 2012/10/02 10:23:44 kensington Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses )
- qt4? (
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_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.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.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-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.10-tests.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
- # as it was never intended to be used this way.
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E BootstrapTest SimpleCOnly_sdcc \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- einfo "Fixing java access violations ..."
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- base_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4ef0c7b..0000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
deleted file mode 100644
index d4f18ff..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 0a9a990..6a13d22 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS)
- unset(_PYTHON2_VERSIONS)
- unset(_PYTHON3_VERSIONS)
-
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Python_VERSIONS)
- foreach(_CURRENT_VERSION ${_Python_VERSIONS})
- string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- if(WIN32)
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
deleted file mode 100644
index 9cb4777..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
deleted file mode 100644
index e0cefa9..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 052cc30..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-libform.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 88927a3..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-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-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch
deleted file mode 100644
index 944e3c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-tests.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Removes the following tests:
-
-- DeployQt4, which tries to break sandbox and ignores prefix
-- CTest.updatecvs, which fails to commit as root
-- TestUpload, which requires network access
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index b404333..50f4292 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -271,23 +271,6 @@ if(BUILD_TESTING)
- )
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
-
-- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
-- # this test also depends on the existence of the standard qtiff plugin
-- if(QT4_WORKS AND QT_QTSQL_FOUND)
-- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND}
-- --build-and-test
-- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
-- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
-- --build-generator ${CMAKE_TEST_GENERATOR}
-- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-- --build-project Qt4Deploy
-- --build-options
-- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-- )
-- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
-- endif()
--
- endif()
- endif()
-
-@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
- endif()
-
-- # Test CTest Update with CVS
-- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- find_package(CVS QUIET)
-- else()
-- find_program(CVS_EXECUTABLE NAMES cvs)
-- set(CVS_FOUND ${CVS_EXECUTABLE})
-- endif()
-- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
-- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- if("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
-- set(CTEST_TEST_UPDATE_CVS 0)
-- endif()
-- endif()
-- if(CTEST_TEST_UPDATE_CVS)
-- set(CTestUpdateCVS_DIR "CTest UpdateCVS")
-- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
-- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
-- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
-- )
-- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
-- endif()
--
- # Test CTest Update with BZR
- find_program(BZR_EXECUTABLE NAMES bzr)
- mark_as_advanced(BZR_EXECUTABLE)
-@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
- FAIL_REGULAR_EXPRESSION "SegFault")
-
- configure_file(
-- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
-- @ONLY ESCAPE_QUOTES)
-- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
-- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
-- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
-- )
-- set_tests_properties(CTestTestUpload PROPERTIES
-- PASS_REGULAR_EXPRESSION "Upload\\.xml")
--
-- configure_file(
- "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
- "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
- @ONLY ESCAPE_QUOTES)
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
deleted file mode 100644
index a91214c..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index edaa91f..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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
deleted file mode 100644
index 6808b80..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index c5e17c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-01-10 14:33 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2013-01-10 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 9adb3b0f90aa914c43e07a4216b77d175627bfb5
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 14:29:27 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 14:29:27 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9adb3b0f
[dev-util/cmake] Add improved Python patch for testing wrt bug #405181.
Package-Manager: portage-2.1.11.38
RepoMan-Options: --force
---
dev-util/cmake/cmake-2.8.10.2-r2.ebuild | 179 ++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 +++
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 +++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake-2.8.0-darwin-default-install_name.patch | 20 +++
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ++++++
.../cmake/files/cmake-2.8.10-FindPythonLibs.patch | 13 ++
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++
.../files/cmake-2.8.10-more-no_host_paths.patch | 134 +++++++++++++++
dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 +++++++++
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++
.../files/cmake-2.8.10.2-implicit-include.patch | 139 +++++++++++++++
dev-util/cmake/files/cmake-2.8.10.2-qt5.patch | 16 ++
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 ++
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 +++++
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 ++++++++
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++
dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 +++++++
.../files/cmake-2.8.9-more-no_host_paths.patch | 133 +++++++++++++++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
25 files changed, 1221 insertions(+), 0 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
new file mode 100644
index 0000000..964136e
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r1.ebuild,v 1.1 2013/01/01 19:25:58 creffett Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="CMake"
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+DEPEND="
+ >=app-arch/libarchive-2.8.0
+ >=dev-libs/expat-2.0.1
+ >=net-misc/curl-7.20.0-r1[ssl]
+ sys-libs/zlib
+ virtual/pkgconfig
+ ncurses? ( sys-libs/ncurses )
+ qt4? (
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ )
+"
+RDEPEND="${DEPEND}
+ emacs? ( virtual/emacs )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+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.0-darwin-default-install_name.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.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-desktop.patch
+ "${FILESDIR}"/${PN}-2.8.10-libform.patch
+ "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch
+ "${FILESDIR}"/${PN}-2.8.10.2-qt5.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
+
+ 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 test
+ # this is altered thanks to our eclass
+ sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # CTest.updatecvs, which fails to commit as root
+ # Qt4Deploy, which tries to break sandbox and ignores prefix
+ # TestUpload, which requires network access
+ "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+ -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+pkg_setup() {
+ einfo "Fixing java access violations ..."
+ # bug 387227
+ addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # disable running of cmake in boostrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+ cmake_src_bootstrap
+}
+
+src_configure() {
+ # make things work with gentoo java setup
+ # in case java-config cannot be run, the variable just becomes unset
+ # per bug #315229
+ export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ $(cmake-utils_use_build ncurses CursesDialog)
+ $(cmake-utils_use_build qt4 QtDialog)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use emacs; then
+ elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/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-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
new file mode 100644
index 0000000..6ee9b70
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
@@ -0,0 +1,23 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -23,7 +23,7 @@
+ SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ SET(CMAKE_SHARED_MODULE_PREFIX "lib")
+-SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
++SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ SET(CMAKE_MODULE_EXISTS 1)
+ SET(CMAKE_DL_LIBS "")
+
+@@ -45,7 +45,7 @@
+ SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+ SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+ SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+-SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
++SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
+
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
new file mode 100644
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.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
new file mode 100644
index 0000000..87c7247
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.1-libform.patch
@@ -0,0 +1,50 @@
+diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
+--- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
++++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
+@@ -314,9 +314,6 @@
+ ELSE (UNIX)
+ SET(BUILD_CursesDialog 0)
+ ENDIF (UNIX)
+- IF(BUILD_CursesDialog)
+- ADD_SUBDIRECTORY(Source/CursesDialog/form)
+- ENDIF(BUILD_CursesDialog)
+ ENDMACRO (CMAKE_BUILD_UTILITIES)
+
+
+diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
+--- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
++++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
+@@ -25,13 +25,18 @@
+ CursesDialog/ccmake
+ )
+
+-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
+- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
+ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
+
+
+ ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
+ TARGET_LINK_LIBRARIES(ccmake CMakeLib)
+-TARGET_LINK_LIBRARIES(ccmake cmForm)
++TARGET_LINK_LIBRARIES(ccmake form)
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
++IF(CURSES_EXTRA_LIBRARY)
++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
++ENDIF(CURSES_EXTRA_LIBRARY)
++
+
+ INSTALL_TARGETS(/bin ccmake)
++
++
+diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
+--- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
++++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
+@@ -15,8 +15,6 @@
+ #define _MSE_INT_H
+ #endif
+
+-#include <cmFormConfigure.h>
+-
+ #if defined(__hpux)
+ # define _BOOL_DEFINED
+ # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
new file mode 100644
index 0000000..d4f18ff
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index 0a9a990..6a13d22 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)
+ unset(_PYTHON3_VERSIONS)
+
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Python_VERSIONS)
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+ string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ if(WIN32)
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-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-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch
new file mode 100644
index 0000000..944e3c5
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-tests.patch
@@ -0,0 +1,83 @@
+Removes the following tests:
+
+- DeployQt4, which tries to break sandbox and ignores prefix
+- CTest.updatecvs, which fails to commit as root
+- TestUpload, which requires network access
+
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index b404333..50f4292 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -271,23 +271,6 @@ if(BUILD_TESTING)
+ )
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+- # this test also depends on the existence of the standard qtiff plugin
+- if(QT4_WORKS AND QT_QTSQL_FOUND)
+- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+- --build-and-test
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+- --build-generator ${CMAKE_TEST_GENERATOR}
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+- --build-project Qt4Deploy
+- --build-options
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+- )
+- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+- endif()
+-
+ endif()
+ endif()
+
+@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+ endif()
+
+- # Test CTest Update with CVS
+- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- find_package(CVS QUIET)
+- else()
+- find_program(CVS_EXECUTABLE NAMES cvs)
+- set(CVS_FOUND ${CVS_EXECUTABLE})
+- endif()
+- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- if("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+- set(CTEST_TEST_UPDATE_CVS 0)
+- endif()
+- endif()
+- if(CTEST_TEST_UPDATE_CVS)
+- set(CTestUpdateCVS_DIR "CTest UpdateCVS")
+- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+- )
+- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+- endif()
+-
+ # Test CTest Update with BZR
+ find_program(BZR_EXECUTABLE NAMES bzr)
+ mark_as_advanced(BZR_EXECUTABLE)
+@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
+ FAIL_REGULAR_EXPRESSION "SegFault")
+
+ configure_file(
+- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
+- @ONLY ESCAPE_QUOTES)
+- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
+- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
+- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
+- )
+- set_tests_properties(CTestTestUpload PROPERTIES
+- PASS_REGULAR_EXPRESSION "Upload\\.xml")
+-
+- configure_file(
+ "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
+ @ONLY ESCAPE_QUOTES)
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..53b395c
--- /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 requries 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.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
new file mode 100644
index 0000000..1f2bef0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
@@ -0,0 +1,16 @@
+--- Source/QtDoalog/CMakeLists.txt
++++ Source/QtDialog/CMakeLists.txt
+@@ -11,7 +11,12 @@
+ #=============================================================================
+
+ project(QtDialog)
+-find_package(Qt5Widgets QUIET)
++option(WITH_Qt5 ON)
++
++if(WITH_Qt5)
++ find_package(Qt5Widgets QUIET)
++endif()
++
+ if (Qt5Widgets_FOUND)
+ include_directories(${Qt5Widgets_INCLUDE_DIRS})
+ add_definitions(${Qt5Widgets_DEFINITONS})
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
new file mode 100644
index 0000000..28d2e4f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
@@ -0,0 +1,12 @@
+diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
+--- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
++++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
+@@ -33,6 +33,8 @@
+ ${Python_ADDITIONAL_VERSIONS}
+ 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Python_VERSIONS)
+ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
+ STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ IF(WIN32)
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-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch
new file mode 100644
index 0000000..64af9d3
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-tests.patch
@@ -0,0 +1,58 @@
+Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root
+--- cmake-2.8.8/Tests/CMakeLists.txt
++++ cmake-2.8.8/Tests/CMakeLists.txt
+@@ -273,23 +273,6 @@
+ )
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+- # this test also depends on the existence of the standard qtiff plugin
+- if(QT4_WORKS AND QT_QTSQL_FOUND)
+- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+- --build-and-test
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+- --build-generator ${CMAKE_TEST_GENERATOR}
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+- --build-project Qt4Deploy
+- --build-options
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+- )
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+- endif()
+-
+ endif()
+ endif()
+
+@@ -1548,30 +1531,6 @@
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+ ENDIF(Subversion_FOUND)
+
+- # Test CTest Update with CVS
+- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- FIND_PACKAGE(CVS QUIET)
+- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
+- SET(CVS_FOUND ${CVS_EXECUTABLE})
+- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+- SET(CTEST_TEST_UPDATE_CVS 0)
+- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- IF(CTEST_TEST_UPDATE_CVS)
+- SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
+- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+- )
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+- ENDIF(CTEST_TEST_UPDATE_CVS)
+-
+ # Test CTest Update with BZR
+ FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
+ MARK_AS_ADVANCED(BZR_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
new file mode 100644
index 0000000..4e833ca
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
@@ -0,0 +1,133 @@
+From 3f5fa933d17e24cafd75ae28c00f4fc0292eae92 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Wed, 15 Aug 2012 14:42:16 +0200
+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)
+Update by Johannes Huber (cmake-2.8.9)
+---
+ 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 eff07b2..cbedc47 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -228,24 +228,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 5ee7ddb..961746d 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.7.9.7
+
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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-02-07 16:11 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2013-02-07 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 9c83061f27fbcce3dea027d90276764e2d1ee14d
Author: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
AuthorDate: Thu Feb 7 16:09:50 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 16:10:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9c83061f
[dev-util/cmake] Add a fix for finding the Python interpreter wrt bug #405181.
Package-Manager: portage-2.1.11.50
---
dev-util/cmake/cmake-2.8.10.2-r2.ebuild | 1 +
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 ++++++++++++++++++++
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 2 +-
3 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
index 7c50be3..b455710 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -55,6 +55,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8.10-desktop.patch
"${FILESDIR}"/${PN}-2.8.10-libform.patch
"${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
"${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch
"${FILESDIR}"/${PN}-2.8.10.2-qt5.patch
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
index 53b395c..80cc4d3 100644
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -6,7 +6,7 @@ index bffa9fb..8fc90ee 100644
${_PYTHON_FIND_OTHER_VERSIONS}
)
-+# Gentoo portage requries that you use exactly the given python version
++# 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)
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-03-11 17:27 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2013-03-11 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 5e0bf63b4c6db966f11c558f724b180e8f162e70
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 17:26:28 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 17:26:28 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5e0bf63b
[dev-util/cmake] Add support for Qt5.
Package-Manager: portage-2.1.11.55
---
dev-util/cmake/cmake-2.8.10.2-r2.ebuild | 18 +++-
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 ----
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 --------
.../cmake/files/cmake-2.8.10-FindPythonLibs.patch | 13 --
dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 ------------
dev-util/cmake/files/cmake-2.8.10.2-qt5.patch | 16 ---
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 --
dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 ---------
.../files/cmake-2.8.9-more-no_host_paths.patch | 133 --------------------
dev-util/cmake/metadata.xml | 3 +
10 files changed, 18 insertions(+), 391 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
index 1ff4336..8c5612f 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -14,7 +14,9 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
+IUSE="emacs ncurses +qt4 qt5 vim-syntax"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
DEPEND="
>=app-arch/libarchive-2.8.0:=
@@ -27,6 +29,11 @@ DEPEND="
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 )
@@ -58,7 +65,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
"${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch
- "${FILESDIR}"/${PN}-2.8.10.2-qt5.patch
)
cmake_src_bootstrap() {
@@ -139,8 +145,14 @@ src_configure() {
-DCMAKE_MAN_DIR=/share/man
-DCMAKE_DATA_DIR=/share/${PN}
$(cmake-utils_use_build ncurses CursesDialog)
- $(cmake-utils_use_build qt4 QtDialog)
)
+
+ if use qt4 || use qt5 ; then
+ mycmakeargs+=(
+ -DBUILD_QtDialog=ON
+ $(cmake-utils_use_find_package qt5 Qt5Widgets)
+ )
+ fi
cmake-utils_src_configure
}
diff --git a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
deleted file mode 100644
index 6ee9b70..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
---- Modules/Platform/Darwin.cmake
-+++ Modules/Platform/Darwin.cmake
-@@ -23,7 +23,7 @@
- SET(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- SET(CMAKE_SHARED_MODULE_PREFIX "lib")
--SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- SET(CMAKE_MODULE_EXISTS 1)
- SET(CMAKE_DL_LIBS "")
-
-@@ -45,7 +45,7 @@
- SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
- SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
-+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
-
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.8.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch
deleted file mode 100644
index 87c7247..0000000
--- a/dev-util/cmake/files/cmake-2.8.1-libform.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
-+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
-@@ -314,9 +314,6 @@
- ELSE (UNIX)
- SET(BUILD_CursesDialog 0)
- ENDIF (UNIX)
-- IF(BUILD_CursesDialog)
-- ADD_SUBDIRECTORY(Source/CursesDialog/form)
-- ENDIF(BUILD_CursesDialog)
- ENDMACRO (CMAKE_BUILD_UTILITIES)
-
-
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
-@@ -25,13 +25,18 @@
- CursesDialog/ccmake
- )
-
--INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
-
-
- ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
- TARGET_LINK_LIBRARIES(ccmake CMakeLib)
--TARGET_LINK_LIBRARIES(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- INSTALL_TARGETS(/bin ccmake)
-+
-+
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
-+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
deleted file mode 100644
index d4f18ff..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 0a9a990..6a13d22 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS)
- unset(_PYTHON2_VERSIONS)
- unset(_PYTHON3_VERSIONS)
-
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Python_VERSIONS)
- foreach(_CURRENT_VERSION ${_Python_VERSIONS})
- string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- if(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.10-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch
deleted file mode 100644
index 944e3c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-tests.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Removes the following tests:
-
-- DeployQt4, which tries to break sandbox and ignores prefix
-- CTest.updatecvs, which fails to commit as root
-- TestUpload, which requires network access
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index b404333..50f4292 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -271,23 +271,6 @@ if(BUILD_TESTING)
- )
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
-
-- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
-- # this test also depends on the existence of the standard qtiff plugin
-- if(QT4_WORKS AND QT_QTSQL_FOUND)
-- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND}
-- --build-and-test
-- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
-- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
-- --build-generator ${CMAKE_TEST_GENERATOR}
-- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-- --build-project Qt4Deploy
-- --build-options
-- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-- )
-- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
-- endif()
--
- endif()
- endif()
-
-@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
- endif()
-
-- # Test CTest Update with CVS
-- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- find_package(CVS QUIET)
-- else()
-- find_program(CVS_EXECUTABLE NAMES cvs)
-- set(CVS_FOUND ${CVS_EXECUTABLE})
-- endif()
-- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
-- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- if("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
-- set(CTEST_TEST_UPDATE_CVS 0)
-- endif()
-- endif()
-- if(CTEST_TEST_UPDATE_CVS)
-- set(CTestUpdateCVS_DIR "CTest UpdateCVS")
-- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
-- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
-- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
-- )
-- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
-- endif()
--
- # Test CTest Update with BZR
- find_program(BZR_EXECUTABLE NAMES bzr)
- mark_as_advanced(BZR_EXECUTABLE)
-@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
- FAIL_REGULAR_EXPRESSION "SegFault")
-
- configure_file(
-- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
-- @ONLY ESCAPE_QUOTES)
-- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
-- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
-- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
-- )
-- set_tests_properties(CTestTestUpload PROPERTIES
-- PASS_REGULAR_EXPRESSION "Upload\\.xml")
--
-- configure_file(
- "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
- "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
- @ONLY ESCAPE_QUOTES)
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
deleted file mode 100644
index 1f2bef0..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Source/QtDoalog/CMakeLists.txt
-+++ Source/QtDialog/CMakeLists.txt
-@@ -11,7 +11,12 @@
- #=============================================================================
-
- project(QtDialog)
--find_package(Qt5Widgets QUIET)
-+option(WITH_Qt5 ON)
-+
-+if(WITH_Qt5)
-+ find_package(Qt5Widgets QUIET)
-+endif()
-+
- if (Qt5Widgets_FOUND)
- include_directories(${Qt5Widgets_INCLUDE_DIRS})
- add_definitions(${Qt5Widgets_DEFINITONS})
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
deleted file mode 100644
index 28d2e4f..0000000
--- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake
---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100
-+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100
-@@ -33,6 +33,8 @@
- ${Python_ADDITIONAL_VERSIONS}
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Python_VERSIONS)
- FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
- STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- IF(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch
deleted file mode 100644
index 64af9d3..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-tests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root
---- cmake-2.8.8/Tests/CMakeLists.txt
-+++ cmake-2.8.8/Tests/CMakeLists.txt
-@@ -273,23 +273,6 @@
- )
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
-
-- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
-- # this test also depends on the existence of the standard qtiff plugin
-- if(QT4_WORKS AND QT_QTSQL_FOUND)
-- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
-- --build-and-test
-- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
-- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
-- --build-generator ${CMAKE_TEST_GENERATOR}
-- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-- --build-project Qt4Deploy
-- --build-options
-- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-- )
-- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
-- endif()
--
- endif()
- endif()
-
-@@ -1548,30 +1531,6 @@
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
- ENDIF(Subversion_FOUND)
-
-- # Test CTest Update with CVS
-- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- FIND_PACKAGE(CVS QUIET)
-- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
-- SET(CVS_FOUND ${CVS_EXECUTABLE})
-- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
-- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
-- SET(CTEST_TEST_UPDATE_CVS 0)
-- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- IF(CTEST_TEST_UPDATE_CVS)
-- SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
-- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
-- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
-- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
-- )
-- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
-- ENDIF(CTEST_TEST_UPDATE_CVS)
--
- # Test CTest Update with BZR
- FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
- MARK_AS_ADVANCED(BZR_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
deleted file mode 100644
index 4e833ca..0000000
--- a/dev-util/cmake/files/cmake-2.8.9-more-no_host_paths.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 3f5fa933d17e24cafd75ae28c00f4fc0292eae92 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Wed, 15 Aug 2012 14:42:16 +0200
-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)
-Update by Johannes Huber (cmake-2.8.9)
----
- 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 eff07b2..cbedc47 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
-@@ -228,24 +228,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 5ee7ddb..961746d 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.7.9.7
-
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index a23f444..f5a3d63 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
+ <use>
+ <flag name="qt5">Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-04-09 19:25 Chris Reffett
0 siblings, 0 replies; 30+ messages in thread
From: Chris Reffett @ 2013-04-09 19:25 UTC (permalink / raw
To: gentoo-commits
commit: 7bbe1e2216b7fb36cb70f7487071bf23e00287f9
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 19:24:19 2013 +0000
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Tue Apr 9 19:24:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7bbe1e22
[dev-util/cmake] Version bump. Tests restricted for now due to one failing. Removed the implicit include patch because it appears to have been implemented in a slightly different way in the code. Re-rolled several patches.
Package-Manager: portage-2.2.0_alpha171
---
dev-util/cmake/cmake-2.8.11_rc2.ebuild | 197 ++++++++++++++++++++
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 +++++
.../files/cmake-2.8.11-FindBoost-python.patch | 57 ++++++
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 +++++++++++++
4 files changed, 432 insertions(+), 0 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.11_rc2.ebuild b/dev-util/cmake/cmake-2.8.11_rc2.ebuild
new file mode 100644
index 0000000..e9e5d4c
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.11_rc2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses +qt4 qt5 vim-syntax"
+
+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 )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+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.0-darwin-default-install_name.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-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
+)
+
+RESTRICT="test"
+
+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
+
+ 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 test
+ # this is altered thanks to our eclass
+ sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # CTest.updatecvs, which fails to commit as root
+ # Qt4Deploy, which tries to break sandbox and ignores prefix
+ # TestUpload, which requires network access
+ "${CMAKE_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
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/cmake-2.8.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..b8c580a
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
@@ -0,0 +1,57 @@
+--- a/Modules/FindBoost.cmake
++++ b/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")
++ # 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
+@@ -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_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
+@@ -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_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})
+@@ -952,6 +972,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.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
+ )
+
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-04-14 17:57 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2013-04-14 17:57 UTC (permalink / raw
To: gentoo-commits
commit: b8177ac2e3c374e46952d762aab8d8d98679455a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 17:55:25 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 17:55:25 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b8177ac2
[dev-util/cmake] Fix detection of newer imagemagic wrt bug #465898. Remove old.
Package-Manager: portage-2.1.11.62
---
dev-util/cmake/cmake-2.8.10.2-r2.ebuild | 191 --------------------
....8.11_rc2.ebuild => cmake-2.8.11_rc2-r1.ebuild} | 1 +
.../files/cmake-2.8.10-more-no_host_paths.patch | 134 --------------
.../files/cmake-2.8.10.2-implicit-include.patch | 139 --------------
.../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ++++
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 -----
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 --------
7 files changed, 35 insertions(+), 582 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
deleted file mode 100644
index 84291ad..0000000
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses +qt4 qt5 vim-syntax"
-
-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 )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-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.0-darwin-default-install_name.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.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-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.10.2-implicit-include.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
-
- 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 test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${CMAKE_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
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.11_rc2.ebuild b/dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-2.8.11_rc2.ebuild
rename to dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild
index e9e5d4c..4b075c6 100644
--- a/dev-util/cmake/cmake-2.8.11_rc2.ebuild
+++ b/dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
"${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-FindImageMagick.patch
"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
)
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
deleted file mode 100644
index 88927a3..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-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-implicit-include.patch b/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch
deleted file mode 100644
index f0ea5e8..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- 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-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.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
deleted file mode 100644
index a91214c..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index edaa91f..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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})
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-04-27 21:36 Chris Reffett
0 siblings, 0 replies; 30+ messages in thread
From: Chris Reffett @ 2013-04-27 21:36 UTC (permalink / raw
To: gentoo-commits
commit: e19d67fa5e29a9c3e2a143dd3a83fc09ae17276c
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 21:31:45 2013 +0000
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Sat Apr 27 21:35:40 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e19d67fa
[dev-util/cmake] Version bump, fix FindBoost-python.patch (credit to Arfrever for fix)
Package-Manager: portage-2.2.0_alpha173
---
....8.11_rc2-r1.ebuild => cmake-2.8.11_rc3.ebuild} | 0
.../files/cmake-2.8.11-FindBoost-python.patch | 52 +++++++++++++-------
2 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild b/dev-util/cmake/cmake-2.8.11_rc3.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-2.8.11_rc2-r1.ebuild
rename to dev-util/cmake/cmake-2.8.11_rc3.ebuild
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
index b8c580a..b00b4f7 100644
--- a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
@@ -1,12 +1,12 @@
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
+--- 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")
-+ # 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)
++ # 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()
+
@@ -18,11 +18,11 @@
${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} )
++ ${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}")
@@ -33,24 +33,40 @@
${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} )
++ ${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})
-@@ -952,6 +972,13 @@
+@@ -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_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} )
++ ${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")
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-06-09 12:09 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2013-06-09 12:09 UTC (permalink / raw
To: gentoo-commits
commit: b30ce47cd6e7c0dfd47b7902b86818c069961de2
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 12:09:28 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 12:09:28 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b30ce47c
[dev-util/cmake] Moved to tree.
Package-Manager: portage-2.2.0_alpha177
---
dev-util/cmake/cmake-2.8.11.1.ebuild | 196 ---------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
.../cmake-2.8.0-darwin-default-install_name.patch | 20 ---
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 ---
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 --
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 ---
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 ---
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 -----
.../files/cmake-2.8.11-FindBoost-python.patch | 73 --------
.../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ----
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 --------------
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 -----
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
18 files changed, 766 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.11.1.ebuild b/dev-util/cmake/cmake-2.8.11.1.ebuild
deleted file mode 100644
index d6c2707..0000000
--- a/dev-util/cmake/cmake-2.8.11.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses +qt4 qt5 vim-syntax"
-
-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 )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-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.0-darwin-default-install_name.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-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-FindImageMagick.patch
- "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.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
-
- 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 test
- # this is altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${CMAKE_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
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4ef0c7b..0000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 9cb4777..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
deleted file mode 100644
index e0cefa9..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 052cc30..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-libform.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea1c033..ae479ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
- else ()
- set(BUILD_CursesDialog 0)
- endif ()
-- if(BUILD_CursesDialog)
-- add_subdirectory(Source/CursesDialog/form)
-- endif()
- endmacro ()
-
- #-----------------------------------------------------------------------
-diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
-index 96e28b4..4102379 100644
---- a/Source/CursesDialog/CMakeLists.txt
-+++ b/Source/CursesDialog/CMakeLists.txt
-@@ -25,13 +25,16 @@ set( CURSES_SRCS
- CursesDialog/ccmake
- )
-
--include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- include_directories(${CURSES_INCLUDE_PATH})
-
-
- add_executable(ccmake ${CURSES_SRCS} )
- target_link_libraries(ccmake CMakeLib)
--target_link_libraries(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- install_targets(/bin ccmake)
-diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
-index b157a28..f131ea4 100644
---- a/Source/CursesDialog/cmCursesStandardIncludes.h
-+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
deleted file mode 100644
index a7e8688..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index 80cc4d3..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index bffa9fb..8fc90ee 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -74,6 +74,19 @@ set(_Python_VERSIONS
- ${_PYTHON_FIND_OTHER_VERSIONS}
- )
-
-+# Gentoo portage requires that you use exactly the given python version
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Gentoo_Python_VERSION)
-+ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
-+ if (_Gentoo_Python_INDEX EQUAL -1)
-+ # the current Gentoo python version is not compatible with what is requested
-+ set(_Python_VERSIONS)
-+ else ()
-+ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
-+ endif ()
-+endif()
-+
- unset(_PYTHON_FIND_OTHER_VERSIONS)
- unset(_PYTHON1_VERSIONS)
- unset(_PYTHON2_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
deleted file mode 100644
index 02e44fb..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
deleted file mode 100644
index b00b4f7..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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
deleted file mode 100644
index f5b70c1..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 36f4ded..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
deleted file mode 100644
index 6808b80..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index c5e17c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-09-01 15:00 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2013-09-01 15:00 UTC (permalink / raw
To: gentoo-commits
commit: 92a917e50fcf53fa66ddad9e373e13afb45dd350
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 1 14:56:58 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep 1 14:56:58 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=92a917e5
[dev-util/cmake] Version bump wrt bug #483150.
Package-Manager: portage-2.2.1
---
dev-util/cmake/cmake-2.8.11.2.ebuild | 199 +++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake-2.8.0-darwin-default-install_name.patch | 20 +++
.../cmake/files/cmake-2.8.10-FindPythonLibs.patch | 13 ++
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++++++
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++
.../files/cmake-2.8.10-more-no_host_paths.patch | 134 ++++++++++++++
dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 +++++++++
.../files/cmake-2.8.10.2-FindImageMagick.patch | 34 ++++
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 +++
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++
.../files/cmake-2.8.10.2-implicit-include.patch | 139 ++++++++++++++
dev-util/cmake/files/cmake-2.8.10.2-qt5.patch | 16 ++
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 +++++
.../files/cmake-2.8.11-FindBoost-python.patch | 73 ++++++++
.../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ++++
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 ++++++++++++++
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 +++++
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 ++++++++
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
27 files changed, 1356 insertions(+)
diff --git a/dev-util/cmake/cmake-2.8.11.2.ebuild b/dev-util/cmake/cmake-2.8.11.2.ebuild
new file mode 100644
index 0000000..225bbcd
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.11.2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit 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"
+SLOT="0"
+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"
+IUSE="emacs ncurses qt4 qt5 vim-syntax"
+
+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 )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+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.0-darwin-default-install_name.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-FindImageMagick.patch
+ "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.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
+
+ 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 "${CMAKE_BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # CTest.updatecvs, which fails to commit as root
+ # Qt4Deploy, which tries to break sandbox and ignores prefix
+ # TestUpload, which requires network access
+ "${CMAKE_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
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
new file mode 100644
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-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
new file mode 100644
index 0000000..d4f18ff
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index 0a9a990..6a13d22 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)
+ unset(_PYTHON3_VERSIONS)
+
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Python_VERSIONS)
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+ string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ if(WIN32)
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-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch
new file mode 100644
index 0000000..944e3c5
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-tests.patch
@@ -0,0 +1,83 @@
+Removes the following tests:
+
+- DeployQt4, which tries to break sandbox and ignores prefix
+- CTest.updatecvs, which fails to commit as root
+- TestUpload, which requires network access
+
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index b404333..50f4292 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -271,23 +271,6 @@ if(BUILD_TESTING)
+ )
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+- # this test also depends on the existence of the standard qtiff plugin
+- if(QT4_WORKS AND QT_QTSQL_FOUND)
+- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+- --build-and-test
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+- --build-generator ${CMAKE_TEST_GENERATOR}
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+- --build-project Qt4Deploy
+- --build-options
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+- )
+- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+- endif()
+-
+ endif()
+ endif()
+
+@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+ endif()
+
+- # Test CTest Update with CVS
+- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- find_package(CVS QUIET)
+- else()
+- find_program(CVS_EXECUTABLE NAMES cvs)
+- set(CVS_FOUND ${CVS_EXECUTABLE})
+- endif()
+- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- if("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+- set(CTEST_TEST_UPDATE_CVS 0)
+- endif()
+- endif()
+- if(CTEST_TEST_UPDATE_CVS)
+- set(CTestUpdateCVS_DIR "CTest UpdateCVS")
+- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+- )
+- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+- endif()
+-
+ # Test CTest Update with BZR
+ find_program(BZR_EXECUTABLE NAMES bzr)
+ mark_as_advanced(BZR_EXECUTABLE)
+@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
+ FAIL_REGULAR_EXPRESSION "SegFault")
+
+ configure_file(
+- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
+- @ONLY ESCAPE_QUOTES)
+- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
+- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
+- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
+- )
+- set_tests_properties(CTestTestUpload PROPERTIES
+- PASS_REGULAR_EXPRESSION "Upload\\.xml")
+-
+- configure_file(
+ "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
+ @ONLY ESCAPE_QUOTES)
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..80cc4d3
--- /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.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
new file mode 100644
index 0000000..1f2bef0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
@@ -0,0 +1,16 @@
+--- Source/QtDoalog/CMakeLists.txt
++++ Source/QtDialog/CMakeLists.txt
+@@ -11,7 +11,12 @@
+ #=============================================================================
+
+ project(QtDialog)
+-find_package(Qt5Widgets QUIET)
++option(WITH_Qt5 ON)
++
++if(WITH_Qt5)
++ find_package(Qt5Widgets QUIET)
++endif()
++
+ if (Qt5Widgets_FOUND)
+ include_directories(${Qt5Widgets_INCLUDE_DIRS})
+ add_definitions(${Qt5Widgets_DEFINITONS})
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.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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-09-11 18:02 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2013-09-11 18:02 UTC (permalink / raw
To: gentoo-commits
commit: b9d2559d5fe28c3aabcfa6d3d35ebb7a280a527c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 11 17:59:34 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 17:59:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b9d2559d
[dev-util/cmake] Moved to portage.
---
dev-util/cmake/cmake-2.8.11.2.ebuild | 199 ---------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
.../cmake-2.8.0-darwin-default-install_name.patch | 20 ---
.../cmake/files/cmake-2.8.10-FindPythonLibs.patch | 13 --
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 ---
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ------
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 --
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------
.../files/cmake-2.8.10-more-no_host_paths.patch | 134 --------------
dev-util/cmake/files/cmake-2.8.10-tests.patch | 83 ---------
.../files/cmake-2.8.10.2-FindImageMagick.patch | 34 ----
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 ---
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 ---
.../files/cmake-2.8.10.2-implicit-include.patch | 139 --------------
dev-util/cmake/files/cmake-2.8.10.2-qt5.patch | 16 --
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 -----
.../files/cmake-2.8.11-FindBoost-python.patch | 73 --------
.../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ----
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 --------------
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 -----
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 --------
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 -----
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
27 files changed, 1356 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.11.2.ebuild b/dev-util/cmake/cmake-2.8.11.2.ebuild
deleted file mode 100644
index 225bbcd..0000000
--- a/dev-util/cmake/cmake-2.8.11.2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit 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"
-SLOT="0"
-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"
-IUSE="emacs ncurses qt4 qt5 vim-syntax"
-
-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 )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-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.0-darwin-default-install_name.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-FindImageMagick.patch
- "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.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
-
- 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 "${CMAKE_BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${CMAKE_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
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4ef0c7b..0000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
deleted file mode 100644
index d4f18ff..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 0a9a990..6a13d22 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS)
- unset(_PYTHON2_VERSIONS)
- unset(_PYTHON3_VERSIONS)
-
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Python_VERSIONS)
- foreach(_CURRENT_VERSION ${_Python_VERSIONS})
- string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- if(WIN32)
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
deleted file mode 100644
index 9cb4777..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 97c93aa..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index e0cefa9..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 052cc30..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-libform.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 88927a3..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-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-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch
deleted file mode 100644
index 944e3c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-tests.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Removes the following tests:
-
-- DeployQt4, which tries to break sandbox and ignores prefix
-- CTest.updatecvs, which fails to commit as root
-- TestUpload, which requires network access
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index b404333..50f4292 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -271,23 +271,6 @@ if(BUILD_TESTING)
- )
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
-
-- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
-- # this test also depends on the existence of the standard qtiff plugin
-- if(QT4_WORKS AND QT_QTSQL_FOUND)
-- add_test(Qt4Deploy ${CMAKE_CTEST_COMMAND}
-- --build-and-test
-- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
-- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
-- --build-generator ${CMAKE_TEST_GENERATOR}
-- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-- --build-project Qt4Deploy
-- --build-options
-- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-- )
-- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
-- endif()
--
- endif()
- endif()
-
-@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
- endif()
-
-- # Test CTest Update with CVS
-- if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
-- find_package(CVS QUIET)
-- else()
-- find_program(CVS_EXECUTABLE NAMES cvs)
-- set(CVS_FOUND ${CVS_EXECUTABLE})
-- endif()
-- set(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
-- if(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
-- if("${CVS_EXECUTABLE}" MATCHES "cygwin")
-- message(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
-- set(CTEST_TEST_UPDATE_CVS 0)
-- endif()
-- endif()
-- if(CTEST_TEST_UPDATE_CVS)
-- set(CTestUpdateCVS_DIR "CTest UpdateCVS")
-- configure_file("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
-- add_test(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
-- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
-- )
-- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
-- endif()
--
- # Test CTest Update with BZR
- find_program(BZR_EXECUTABLE NAMES bzr)
- mark_as_advanced(BZR_EXECUTABLE)
-@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
- FAIL_REGULAR_EXPRESSION "SegFault")
-
- configure_file(
-- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
-- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
-- @ONLY ESCAPE_QUOTES)
-- add_test(CTestTestUpload ${CMAKE_CTEST_COMMAND}
-- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
-- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
-- )
-- set_tests_properties(CTestTestUpload PROPERTIES
-- PASS_REGULAR_EXPRESSION "Upload\\.xml")
--
-- configure_file(
- "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
- "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
- @ONLY ESCAPE_QUOTES)
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
deleted file mode 100644
index 6a79a58..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index a7e8688..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index 80cc4d3..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index f0ea5e8..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- 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.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
deleted file mode 100644
index 1f2bef0..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Source/QtDoalog/CMakeLists.txt
-+++ Source/QtDialog/CMakeLists.txt
-@@ -11,7 +11,12 @@
- #=============================================================================
-
- project(QtDialog)
--find_package(Qt5Widgets QUIET)
-+option(WITH_Qt5 ON)
-+
-+if(WITH_Qt5)
-+ find_package(Qt5Widgets QUIET)
-+endif()
-+
- if (Qt5Widgets_FOUND)
- include_directories(${Qt5Widgets_INCLUDE_DIRS})
- add_definitions(${Qt5Widgets_DEFINITONS})
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
deleted file mode 100644
index 02e44fb..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
deleted file mode 100644
index b00b4f7..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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
deleted file mode 100644
index f5b70c1..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 36f4ded..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
deleted file mode 100644
index a91214c..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index edaa91f..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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
deleted file mode 100644
index 6808b80..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index c5e17c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-10-13 16:27 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2013-10-13 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 33736ea90a3c7fb5dd44157316462d7a3b0bad95
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 18:23:51 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 18:23:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=33736ea9
[dev-util/cmake] Version bump wrt bug #487604.
Package-Manager: portage-2.2.7
---
dev-util/cmake/cmake-2.8.12.ebuild | 197 +++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake-2.8.0-darwin-default-install_name.patch | 20 +++
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++++++
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 +++
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 +++++
.../files/cmake-2.8.11-FindBoost-python.patch | 73 ++++++++
.../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ++++
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 ++++++++++++++
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
19 files changed, 817 insertions(+)
diff --git a/dev-util/cmake/cmake-2.8.12.ebuild b/dev-util/cmake/cmake-2.8.12.ebuild
new file mode 100644
index 0000000..24231c9
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.12.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.2.ebuild,v 1.1 2013/09/11 18:00:59 kensington Exp $
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit 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 vim-syntax"
+
+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 )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+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
+)
+
+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
+
+ 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 "${CMAKE_BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # CTest.updatecvs, which fails to commit as root
+ # Qt4Deploy, which tries to break sandbox and ignores prefix
+ # TestUpload, which requires network access
+ "${CMAKE_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
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
new file mode 100644
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.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
new file mode 100644
index 0000000..a7e8688
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
@@ -0,0 +1,22 @@
+--- Modules/FindPythonInterp.cmake
++++ Modules/FindPythonInterp.cmake
+@@ -60,6 +60,10 @@
+
+ list(APPEND _Python_NAMES python)
+
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ set(_Python_NAMES python)
++endif()
++
+ # Search for the current active python version first
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+
+@@ -76,7 +80,7 @@
+ unset(_PYTHON3_VERSIONS)
+
+ # Search for newest python version if python executable isn't found
+-if(NOT PYTHON_EXECUTABLE)
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+ set(_Python_NAMES python${_CURRENT_VERSION})
+ if(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
new file mode 100644
index 0000000..2a83ff7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -0,0 +1,24 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index bffa9fb..8fc90ee 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -74,6 +74,19 @@ set(_Python_VERSIONS
+ ${_PYTHON_FIND_OTHER_VERSIONS}
+ )
+
++# Gentoo portage requires that you use exactly the given python version
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Gentoo_Python_VERSION)
++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
++ if (_Gentoo_Python_INDEX EQUAL -1)
++ # the current Gentoo python version is not compatible with what is requested
++ set(_Python_VERSIONS)
++ else ()
++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
++ endif ()
++endif()
++
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
new file mode 100644
index 0000000..02e44fb
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
@@ -0,0 +1,48 @@
+--- b/Modules/FindBLAS.cmake
++++ a/Modules/FindBLAS.cmake
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find BLAS library
+ # This module finds an installed fortran library that implements the BLAS
+ # linear-algebra interface (see http://www.netlib.org/blas/).
+@@ -40,6 +46,26 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_BLAS blas)
++if(PC_BLAS_FOUND)
++ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
++ if (NOT ${PC_LIB}_LIBRARY)
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
++ endif (NOT ${PC_LIB}_LIBRARY)
++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
++ endforeach(PC_LIB)
++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
++ mark_as_advanced(BLAS_LIBRARIES)
++else(PC_BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
++
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+
+@@ -604,3 +630,8 @@
+ endif()
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++
++endif(PC_BLAS_FOUND)
++
++
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
new file mode 100644
index 0000000..b00b4f7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
@@ -0,0 +1,73 @@
+--- Modules/FindBoost.cmake
++++ Modules/FindBoost.cmake
+@@ -903,6 +903,11 @@
+
+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ # Get version of Python.
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
++ endif()
++
+
+ #
+ # Find RELEASE libraries
+@@ -913,6 +918,14 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++ endif()
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+ list(APPEND _boost_RELEASE_NAMES
+@@ -920,6 +933,13 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -945,6 +965,15 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++ endif()
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+ list(APPEND _boost_DEBUG_NAMES
+@@ -952,6 +981,13 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cmake/files/cmake-2.8.11-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.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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2013-10-21 3:28 Chris Reffett
0 siblings, 0 replies; 30+ messages in thread
From: Chris Reffett @ 2013-10-21 3:28 UTC (permalink / raw
To: gentoo-commits
commit: 324d199fb840c0900ccf4d666bdd2a59bdeef3f9
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 03:26:23 2013 +0000
Commit: Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 03:26:23 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=324d199f
[dev-util/cmake] Moved to tree
---
dev-util/cmake/cmake-2.8.12.ebuild | 197 ---------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
.../cmake-2.8.0-darwin-default-install_name.patch | 20 ---
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 ---
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ------
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 --
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 ---
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 ---
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 -----
.../files/cmake-2.8.11-FindBoost-python.patch | 73 --------
.../cmake/files/cmake-2.8.11-FindImageMagick.patch | 34 ----
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 --------------
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 -----
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
19 files changed, 817 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.12.ebuild b/dev-util/cmake/cmake-2.8.12.ebuild
deleted file mode 100644
index bfd1f2c..0000000
--- a/dev-util/cmake/cmake-2.8.12.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.2.ebuild,v 1.1 2013/09/11 18:00:59 kensington Exp $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit 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 vim-syntax"
-
-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 )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-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
-)
-
-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
-
- 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
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${VIMFILE}"
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 4ef0c7b..0000000
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 9cb4777..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 97c93aa..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index e0cefa9..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 052cc30..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-libform.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea1c033..ae479ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
- else ()
- set(BUILD_CursesDialog 0)
- endif ()
-- if(BUILD_CursesDialog)
-- add_subdirectory(Source/CursesDialog/form)
-- endif()
- endmacro ()
-
- #-----------------------------------------------------------------------
-diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
-index 96e28b4..4102379 100644
---- a/Source/CursesDialog/CMakeLists.txt
-+++ b/Source/CursesDialog/CMakeLists.txt
-@@ -25,13 +25,16 @@ set( CURSES_SRCS
- CursesDialog/ccmake
- )
-
--include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- include_directories(${CURSES_INCLUDE_PATH})
-
-
- add_executable(ccmake ${CURSES_SRCS} )
- target_link_libraries(ccmake CMakeLib)
--target_link_libraries(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- install_targets(/bin ccmake)
-diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
-index b157a28..f131ea4 100644
---- a/Source/CursesDialog/cmCursesStandardIncludes.h
-+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
deleted file mode 100644
index a7e8688..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index 2a83ff7..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index bffa9fb..8fc90ee 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -74,6 +74,19 @@ set(_Python_VERSIONS
- ${_PYTHON_FIND_OTHER_VERSIONS}
- )
-
-+# Gentoo portage requires that you use exactly the given python version
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Gentoo_Python_VERSION)
-+ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
-+ if (_Gentoo_Python_INDEX EQUAL -1)
-+ # the current Gentoo python version is not compatible with what is requested
-+ set(_Python_VERSIONS)
-+ else ()
-+ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
-+ endif ()
-+endif()
-+
- unset(_PYTHON_FIND_OTHER_VERSIONS)
- unset(_PYTHON1_VERSIONS)
- unset(_PYTHON2_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
deleted file mode 100644
index 02e44fb..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
deleted file mode 100644
index b00b4f7..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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
deleted file mode 100644
index f5b70c1..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 36f4ded..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
deleted file mode 100644
index 6808b80..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index c5e17c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2014-02-25 19:23 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2014-02-25 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 49f71dc215bb4d7337c826e7fbad8b1539e5ab81
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 19:22:40 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 19:22:40 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=49f71dc2
[dev-util/cmake] Improve boost python patch to fix libboost_python detection outside of portage wrt bug #500442.
Package-Manager: portage-2.2.7
---
dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 200 +++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++++++
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 ++
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 +++
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 +++++
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 ++++++++++++++
.../files/cmake-2.8.11.2-hppa-bootstrap.patch | 20 +++
.../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 +++++
.../files/cmake-2.8.12.1-FindImageMagick.patch | 23 +++
.../files/cmake-2.8.12.2-FindBoost-python.patch | 77 ++++++++
.../files/cmake-2.8.12.2-hppa-bootstrap.patch | 27 +++
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 +++++
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
21 files changed, 883 insertions(+)
diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
new file mode 100644
index 0000000..c0a59db
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
@@ -0,0 +1,200 @@
+# 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.2 2014/02/05 16:10:57 kensington 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-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-FindBoost-python.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.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
new file mode 100644
index 0000000..9cb4777
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
@@ -0,0 +1,23 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -26,7 +26,7 @@
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ set(CMAKE_SHARED_MODULE_PREFIX "lib")
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ set(CMAKE_MODULE_EXISTS 1)
+ set(CMAKE_DL_LIBS "")
+
+@@ -48,7 +48,7 @@
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
+ set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+ set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
+
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
new file mode 100644
index 0000000..97c93aa
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
@@ -0,0 +1,50 @@
+Do not detect Xcode and set -isysroot for its SDK, since that messes up
+our toolchain, and hence makes any compilation fail, bug #445308
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -60,18 +60,18 @@
+ endif()
+
+ # Ask xcode-select where to find /Developer or fall back to ancient location.
+-execute_process(COMMAND xcode-select -print-path
+- OUTPUT_VARIABLE _stdout
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_VARIABLE _stderr
+- RESULT_VARIABLE _failed)
+-if(NOT _failed AND IS_DIRECTORY ${_stdout})
+- set(OSX_DEVELOPER_ROOT ${_stdout})
+-elseif(IS_DIRECTORY "/Developer")
+- set(OSX_DEVELOPER_ROOT "/Developer")
+-else()
++#execute_process(COMMAND xcode-select -print-path
++# OUTPUT_VARIABLE _stdout
++# OUTPUT_STRIP_TRAILING_WHITESPACE
++# ERROR_VARIABLE _stderr
++# RESULT_VARIABLE _failed)
++#if(NOT _failed AND IS_DIRECTORY ${_stdout})
++# set(OSX_DEVELOPER_ROOT ${_stdout})
++#elseif(IS_DIRECTORY "/Developer")
++# set(OSX_DEVELOPER_ROOT "/Developer")
++#else()
+ set(OSX_DEVELOPER_ROOT "")
+-endif()
++#endif()
+
+ execute_process(COMMAND sw_vers -productVersion
+ OUTPUT_VARIABLE CURRENT_OSX_VERSION
+@@ -91,10 +91,10 @@
+ # CMAKE_OSX_DEPLOYMENT_TARGET
+
+ # Set cache variable - end user may change this during ccmake or cmake-gui configure.
+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
+- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+-endif()
++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
++#endif()
+
+ #----------------------------------------------------------------------------
+ # CMAKE_OSX_SYSROOT
diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
new file mode 100644
index 0000000..e0cefa9
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-desktop.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
+index 645eb76..7be495f 100644
+--- a/Source/QtDialog/CMake.desktop
++++ b/Source/QtDialog/CMake.desktop
+@@ -3,7 +3,7 @@ Version=1.0
+ Name=CMake
+ Comment=Cross-platform buildsystem
+ Exec=cmake-gui %f
+-Icon=CMakeSetup32.png
++Icon=CMakeSetup32
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch
new file mode 100644
index 0000000..052cc30
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch
@@ -0,0 +1,51 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea1c033..ae479ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
+ else ()
+ set(BUILD_CursesDialog 0)
+ endif ()
+- if(BUILD_CursesDialog)
+- add_subdirectory(Source/CursesDialog/form)
+- endif()
+ endmacro ()
+
+ #-----------------------------------------------------------------------
+diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
+index 96e28b4..4102379 100644
+--- a/Source/CursesDialog/CMakeLists.txt
++++ b/Source/CursesDialog/CMakeLists.txt
+@@ -25,13 +25,16 @@ set( CURSES_SRCS
+ CursesDialog/ccmake
+ )
+
+-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
+- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
+ include_directories(${CURSES_INCLUDE_PATH})
+
+
+ add_executable(ccmake ${CURSES_SRCS} )
+ target_link_libraries(ccmake CMakeLib)
+-target_link_libraries(ccmake cmForm)
++TARGET_LINK_LIBRARIES(ccmake form)
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
++IF(CURSES_EXTRA_LIBRARY)
++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
++ENDIF(CURSES_EXTRA_LIBRARY)
++
+
+ install_targets(/bin ccmake)
+diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
+index b157a28..f131ea4 100644
+--- a/Source/CursesDialog/cmCursesStandardIncludes.h
++++ b/Source/CursesDialog/cmCursesStandardIncludes.h
+@@ -15,8 +15,6 @@
+ #define _MSE_INT_H
+ #endif
+
+-#include <cmFormConfigure.h>
+-
+ #if defined(__hpux)
+ # define _BOOL_DEFINED
+ # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
new file mode 100644
index 0000000..a7e8688
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
@@ -0,0 +1,22 @@
+--- Modules/FindPythonInterp.cmake
++++ Modules/FindPythonInterp.cmake
+@@ -60,6 +60,10 @@
+
+ list(APPEND _Python_NAMES python)
+
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ set(_Python_NAMES python)
++endif()
++
+ # Search for the current active python version first
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+
+@@ -76,7 +80,7 @@
+ unset(_PYTHON3_VERSIONS)
+
+ # Search for newest python version if python executable isn't found
+-if(NOT PYTHON_EXECUTABLE)
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+ set(_Python_NAMES python${_CURRENT_VERSION})
+ if(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
new file mode 100644
index 0000000..2a83ff7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -0,0 +1,24 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index bffa9fb..8fc90ee 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -74,6 +74,19 @@ set(_Python_VERSIONS
+ ${_PYTHON_FIND_OTHER_VERSIONS}
+ )
+
++# Gentoo portage requires that you use exactly the given python version
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Gentoo_Python_VERSION)
++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
++ if (_Gentoo_Python_INDEX EQUAL -1)
++ # the current Gentoo python version is not compatible with what is requested
++ set(_Python_VERSIONS)
++ else ()
++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
++ endif ()
++endif()
++
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
new file mode 100644
index 0000000..02e44fb
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
@@ -0,0 +1,48 @@
+--- b/Modules/FindBLAS.cmake
++++ a/Modules/FindBLAS.cmake
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration for blas is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find BLAS library
+ # This module finds an installed fortran library that implements the BLAS
+ # linear-algebra interface (see http://www.netlib.org/blas/).
+@@ -40,6 +46,26 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_BLAS blas)
++if(PC_BLAS_FOUND)
++ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
++ if (NOT ${PC_LIB}_LIBRARY)
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
++ endif (NOT ${PC_LIB}_LIBRARY)
++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
++ endforeach(PC_LIB)
++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
++ mark_as_advanced(BLAS_LIBRARIES)
++else(PC_BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
++
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+
+@@ -604,3 +630,8 @@
+ endif()
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++
++endif(PC_BLAS_FOUND)
++
++
diff --git a/dev-util/cmake/files/cmake-2.8.11-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-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
new file mode 100644
index 0000000..4a5474a
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
@@ -0,0 +1,77 @@
+--- Modules/FindBoost.cmake
++++ Modules/FindBoost.cmake
+@@ -905,6 +905,15 @@
+
+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ # Get version of Python.
++ if (NOT PYTHON_EXECUTABLE)
++ #if a certain version of python was detected by cmake before use that one
++ set(PYTHON_EXECUTABLE "python")
++ endif (NOT PYTHON_EXECUTABLE)
++ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
++ endif()
++
+
+ #
+ # Find RELEASE libraries
+@@ -915,6 +924,14 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++ endif()
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+ list(APPEND _boost_RELEASE_NAMES
+@@ -922,6 +939,13 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -951,6 +975,15 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++ endif()
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+ list(APPEND _boost_DEBUG_NAMES
+@@ -958,6 +991,13 @@
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-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-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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2014-05-06 12:24 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2014-05-06 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 1ba36b9dead51008e9fb3f0eccb53ebdb7ac9bd5
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May 6 12:23:55 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May 6 12:23:55 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1ba36b9d
[dev-util/cmake] Moved to tree
Package-Manager: portage-2.2.10
---
dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 200 ---------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ----
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 ---
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ------
dev-util/cmake/files/cmake-2.8.10-desktop.patch | 13 --
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 ---
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 ---
dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 -----
.../files/cmake-2.8.11-more-no_host_paths.patch | 130 --------------
.../files/cmake-2.8.11.2-hppa-bootstrap.patch | 20 ---
.../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 -----
.../files/cmake-2.8.12.1-FindImageMagick.patch | 23 ---
.../files/cmake-2.8.12.2-FindBoost-python.patch | 77 --------
.../files/cmake-2.8.12.2-hppa-bootstrap.patch | 27 ---
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 -----
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
21 files changed, 883 deletions(-)
diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
deleted file mode 100644
index 0581bb0..0000000
--- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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-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-FindBoost-python.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
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch by Heiko Przybyl
-
---- Source/cmComputeLinkInformation.cxx
-+++ Source/cmComputeLinkInformation.cxx
-@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
- for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
- ri != runtimeDirs.end(); ++ri)
- {
-+ // Do not add duplicates.
-+ // I'd like to have that check already in the list generation code
-+ // but that would need lots of more changes, even in ExpandListArgument().
-+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
-+ {
-+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
-+ continue;
-+ }
- // Separate from previous path.
- rpath += sep;
- sep = this->GetRuntimeSep().c_str();
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
deleted file mode 100644
index 9cb4777..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 97c93aa..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index e0cefa9..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 052cc30..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-libform.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea1c033..ae479ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
- else ()
- set(BUILD_CursesDialog 0)
- endif ()
-- if(BUILD_CursesDialog)
-- add_subdirectory(Source/CursesDialog/form)
-- endif()
- endmacro ()
-
- #-----------------------------------------------------------------------
-diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
-index 96e28b4..4102379 100644
---- a/Source/CursesDialog/CMakeLists.txt
-+++ b/Source/CursesDialog/CMakeLists.txt
-@@ -25,13 +25,16 @@ set( CURSES_SRCS
- CursesDialog/ccmake
- )
-
--include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- include_directories(${CURSES_INCLUDE_PATH})
-
-
- add_executable(ccmake ${CURSES_SRCS} )
- target_link_libraries(ccmake CMakeLib)
--target_link_libraries(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- install_targets(/bin ccmake)
-diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
-index b157a28..f131ea4 100644
---- a/Source/CursesDialog/cmCursesStandardIncludes.h
-+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
deleted file mode 100644
index a7e8688..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index 2a83ff7..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index bffa9fb..8fc90ee 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -74,6 +74,19 @@ set(_Python_VERSIONS
- ${_PYTHON_FIND_OTHER_VERSIONS}
- )
-
-+# Gentoo portage requires that you use exactly the given python version
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+ OUTPUT_VARIABLE _Gentoo_Python_VERSION)
-+ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
-+ if (_Gentoo_Python_INDEX EQUAL -1)
-+ # the current Gentoo python version is not compatible with what is requested
-+ set(_Python_VERSIONS)
-+ else ()
-+ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
-+ endif ()
-+endif()
-+
- unset(_PYTHON_FIND_OTHER_VERSIONS)
- unset(_PYTHON1_VERSIONS)
- unset(_PYTHON2_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
deleted file mode 100644
index 02e44fb..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
deleted file mode 100644
index 36f4ded..0000000
--- a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-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
deleted file mode 100644
index 9928e14..0000000
--- a/dev-util/cmake/files/cmake-2.8.11.2-hppa-bootstrap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 6dc244c..0000000
--- a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index b094f17..0000000
--- a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Modules/FindImageMagick.cmake
-+++ Modules/FindImageMagick.cmake
-@@ -147,17 +147,17 @@
- )
- if(component STREQUAL "Magick++")
- FIND_IMAGEMAGICK_API(Magick++ Magick++.h
-- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
-+ Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
- elseif(component STREQUAL "MagickWand")
- FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
-- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
-+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
- elseif(component STREQUAL "MagickCore")
- FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
-- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
-+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI
- )
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
- else()
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
deleted file mode 100644
index 4a5474a..0000000
--- a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- Modules/FindBoost.cmake
-+++ Modules/FindBoost.cmake
-@@ -905,6 +905,15 @@
-
- set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
- set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ # Get version of Python.
-+ if (NOT PYTHON_EXECUTABLE)
-+ #if a certain version of python was detected by cmake before use that one
-+ set(PYTHON_EXECUTABLE "python")
-+ endif (NOT PYTHON_EXECUTABLE)
-+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
-+ endif()
-+
-
- #
- # Find RELEASE libraries
-@@ -915,6 +924,14 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
- list(APPEND _boost_RELEASE_NAMES
-@@ -922,6 +939,13 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
-@@ -951,6 +975,15 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
- list(APPEND _boost_DEBUG_NAMES
-@@ -958,6 +991,13 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch
deleted file mode 100644
index 99e39a2..0000000
--- a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
deleted file mode 100644
index 6808b80..0000000
--- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
deleted file mode 100644
index c5e17c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2014-06-18 14:45 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2014-06-18 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 431060f44d9736052138f911452f74f27271ebf7
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 18 14:44:47 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jun 18 14:44:47 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=431060f4
[dev-util/cmake] Version bump.
Package-Manager: portage-2.2.10
---
dev-util/cmake/cmake-3.0.0.ebuild | 193 +++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 +++++
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ++
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++++++
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ++++++
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 +++
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++
.../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 +++++
.../files/cmake-2.8.12.1-FindImageMagick.patch | 23 +++
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++
dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch | 43 +++++
.../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 ++++++++++
dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch | 44 +++++
dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 +++++++++++++++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
18 files changed, 839 insertions(+)
diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
new file mode 100644
index 0000000..1f4c068
--- /dev/null
+++ b/dev-util/cmake/cmake-3.0.0.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+# "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
+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.8-FindPkgConfig.patch
+ "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.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.12.1-FindImageMagick.patch
+ "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.0.0-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+ "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.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 Auxiliary/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Auxiliary/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${PN}.vim"
+
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+ rm -rf "${D}/usr/share/cmake/completions" || die
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
new file mode 100644
index 0000000..e4a1a6d
--- /dev/null
+++ b/dev-util/cmake/files/50cmake-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t)
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
new file mode 100644
index 0000000..02c3011
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
@@ -0,0 +1,39 @@
+http://public.kitware.com/Bug/view.php?id=7933
+
+diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx
+--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008
++++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008
+@@ -38,6 +38,13 @@
+ int main() { return 0; }
+ #endif
+
++#ifdef TEST_KWSYS_LFS_SUPPORT
++#define _LARGE_FILES
++#include <iostream>
++int main() { return 0; }
++#endif
++
++
+ #ifdef TEST_KWSYS_IOS_HAVE_STD
+ #include <iosfwd>
+ void f(std ::ostream*) {}
+diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap
+--- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008
++++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008
+@@ -1005,6 +1005,16 @@
+ echo "${cmake_cxx_compiler} does not have stl iterator_traits"
+ fi
+
++if cmake_try_run "${cmake_cxx_compiler}" \
++ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \
++ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then
++ KWSYS_LFS_AVAILABLE=1
++ echo "LFS support available"
++else
++ KWSYS_LFS_AVAILABLE=0
++ echo "LFS support unavailable, disabled"
++fi
++
+ if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then
+ if cmake_try_run "${cmake_cxx_compiler}" \
+ "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \
diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
new file mode 100644
index 0000000..ceb205f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
@@ -0,0 +1,19 @@
+Patch by Heiko Przybyl
+
+--- Source/cmComputeLinkInformation.cxx
++++ Source/cmComputeLinkInformation.cxx
+@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
+ for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
+ ri != runtimeDirs.end(); ++ri)
+ {
++ // Do not add duplicates.
++ // I'd like to have that check already in the list generation code
++ // but that would need lots of more changes, even in ExpandListArgument().
++ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
++ {
++ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
++ continue;
++ }
+ // Separate from previous path.
+ rpath += sep;
+ sep = this->GetRuntimeSep().c_str();
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
new file mode 100644
index 0000000..9cb4777
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
@@ -0,0 +1,23 @@
+Don't use .so for modules on darwin/macos. Use .bundle instead.
+Patch by Heiko Przybyl
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -26,7 +26,7 @@
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ set(CMAKE_SHARED_MODULE_PREFIX "lib")
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ set(CMAKE_MODULE_EXISTS 1)
+ set(CMAKE_DL_LIBS "")
+
+@@ -48,7 +48,7 @@
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
+ set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+ set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
+
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
new file mode 100644
index 0000000..97c93aa
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
@@ -0,0 +1,50 @@
+Do not detect Xcode and set -isysroot for its SDK, since that messes up
+our toolchain, and hence makes any compilation fail, bug #445308
+
+--- Modules/Platform/Darwin.cmake
++++ Modules/Platform/Darwin.cmake
+@@ -60,18 +60,18 @@
+ endif()
+
+ # Ask xcode-select where to find /Developer or fall back to ancient location.
+-execute_process(COMMAND xcode-select -print-path
+- OUTPUT_VARIABLE _stdout
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_VARIABLE _stderr
+- RESULT_VARIABLE _failed)
+-if(NOT _failed AND IS_DIRECTORY ${_stdout})
+- set(OSX_DEVELOPER_ROOT ${_stdout})
+-elseif(IS_DIRECTORY "/Developer")
+- set(OSX_DEVELOPER_ROOT "/Developer")
+-else()
++#execute_process(COMMAND xcode-select -print-path
++# OUTPUT_VARIABLE _stdout
++# OUTPUT_STRIP_TRAILING_WHITESPACE
++# ERROR_VARIABLE _stderr
++# RESULT_VARIABLE _failed)
++#if(NOT _failed AND IS_DIRECTORY ${_stdout})
++# set(OSX_DEVELOPER_ROOT ${_stdout})
++#elseif(IS_DIRECTORY "/Developer")
++# set(OSX_DEVELOPER_ROOT "/Developer")
++#else()
+ set(OSX_DEVELOPER_ROOT "")
+-endif()
++#endif()
+
+ execute_process(COMMAND sw_vers -productVersion
+ OUTPUT_VARIABLE CURRENT_OSX_VERSION
+@@ -91,10 +91,10 @@
+ # CMAKE_OSX_DEPLOYMENT_TARGET
+
+ # Set cache variable - end user may change this during ccmake or cmake-gui configure.
+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
+- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+-endif()
++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
++#endif()
+
+ #----------------------------------------------------------------------------
+ # CMAKE_OSX_SYSROOT
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch
new file mode 100644
index 0000000..052cc30
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch
@@ -0,0 +1,51 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea1c033..ae479ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
+ else ()
+ set(BUILD_CursesDialog 0)
+ endif ()
+- if(BUILD_CursesDialog)
+- add_subdirectory(Source/CursesDialog/form)
+- endif()
+ endmacro ()
+
+ #-----------------------------------------------------------------------
+diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
+index 96e28b4..4102379 100644
+--- a/Source/CursesDialog/CMakeLists.txt
++++ b/Source/CursesDialog/CMakeLists.txt
+@@ -25,13 +25,16 @@ set( CURSES_SRCS
+ CursesDialog/ccmake
+ )
+
+-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
+- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
+ include_directories(${CURSES_INCLUDE_PATH})
+
+
+ add_executable(ccmake ${CURSES_SRCS} )
+ target_link_libraries(ccmake CMakeLib)
+-target_link_libraries(ccmake cmForm)
++TARGET_LINK_LIBRARIES(ccmake form)
++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
++IF(CURSES_EXTRA_LIBRARY)
++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
++ENDIF(CURSES_EXTRA_LIBRARY)
++
+
+ install_targets(/bin ccmake)
+diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
+index b157a28..f131ea4 100644
+--- a/Source/CursesDialog/cmCursesStandardIncludes.h
++++ b/Source/CursesDialog/cmCursesStandardIncludes.h
+@@ -15,8 +15,6 @@
+ #define _MSE_INT_H
+ #endif
+
+-#include <cmFormConfigure.h>
+-
+ #if defined(__hpux)
+ # define _BOOL_DEFINED
+ # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
new file mode 100644
index 0000000..a7e8688
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
@@ -0,0 +1,22 @@
+--- Modules/FindPythonInterp.cmake
++++ Modules/FindPythonInterp.cmake
+@@ -60,6 +60,10 @@
+
+ list(APPEND _Python_NAMES python)
+
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ set(_Python_NAMES python)
++endif()
++
+ # Search for the current active python version first
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+
+@@ -76,7 +80,7 @@
+ unset(_PYTHON3_VERSIONS)
+
+ # Search for newest python version if python executable isn't found
+-if(NOT PYTHON_EXECUTABLE)
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
+ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+ set(_Python_NAMES python${_CURRENT_VERSION})
+ if(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
new file mode 100644
index 0000000..2a83ff7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -0,0 +1,24 @@
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index bffa9fb..8fc90ee 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -74,6 +74,19 @@ set(_Python_VERSIONS
+ ${_PYTHON_FIND_OTHER_VERSIONS}
+ )
+
++# Gentoo portage requires that you use exactly the given python version
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++ OUTPUT_VARIABLE _Gentoo_Python_VERSION)
++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
++ if (_Gentoo_Python_INDEX EQUAL -1)
++ # the current Gentoo python version is not compatible with what is requested
++ set(_Python_VERSIONS)
++ else ()
++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
++ endif ()
++endif()
++
+ unset(_PYTHON_FIND_OTHER_VERSIONS)
+ unset(_PYTHON1_VERSIONS)
+ unset(_PYTHON2_VERSIONS)
diff --git a/dev-util/cmake/files/cmake-2.8.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.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
new file mode 100644
index 0000000..c5e17c5
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
@@ -0,0 +1,18 @@
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index c47f583..5783d37 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -87,7 +87,12 @@
+ set(PKG_CONFIG_VERSION 1)
+ set(PKG_CONFIG_FOUND 0)
+
+-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
++if(NOT PKG_CONFIG_EXECUTABLE)
++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG})
++ if(NOT PKG_CONFIG_EXECUTABLE)
++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
++ endif(NOT PKG_CONFIG_EXECUTABLE)
++endif(NOT PKG_CONFIG_EXECUTABLE)
+ mark_as_advanced(PKG_CONFIG_EXECUTABLE)
+
+ if(PKG_CONFIG_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
new file mode 100644
index 0000000..86c5dc7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
@@ -0,0 +1,43 @@
+--- Modules/FindBLAS.cmake
++++ Modules/FindBLAS.cmake
+@@ -4,6 +4,10 @@
+ #
+ # Find BLAS library
+ #
++# Version modified for Gentoo Linux.
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
+ # This module finds an installed fortran library that implements the
+ # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
+ # list of libraries searched for is taken from the autoconf macro file,
+@@ -50,6 +54,23 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_BLAS blas)
++if(PC_BLAS_FOUND)
++ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
++ if (NOT ${PC_LIB}_LIBRARY)
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
++ endif (NOT ${PC_LIB}_LIBRARY)
++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
++ endforeach(PC_LIB)
++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
++ mark_as_advanced(BLAS_LIBRARIES)
++else(PC_BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+
+@@ -688,3 +709,5 @@
+ endif()
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_BLAS_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
new file mode 100644
index 0000000..a6291d2
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
@@ -0,0 +1,93 @@
+From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 19 Jun 2014 00:17:48 +1000
+Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
+ wrt bug #400969.
+
+---
+ Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index dfd4460..70bfb4f 100644
+--- a/Modules/FindBoost.cmake
++++ b/Modules/FindBoost.cmake
+@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
+
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ # Get version of Python.
++ if (NOT PYTHON_EXECUTABLE)
++ #if a certain version of python was detected by cmake before use that one
++ set(PYTHON_EXECUTABLE "python")
++ endif (NOT PYTHON_EXECUTABLE)
++ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
++ endif()
++
+ # Compute component-specific hints.
+ set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
+ if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
+@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++ endif()
++
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+ list(APPEND _boost_RELEASE_NAMES
+@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++ endif()
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+ list(APPEND _boost_DEBUG_NAMES
+@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
+--
+1.8.5.5
+
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch
new file mode 100644
index 0000000..611c5ce
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch
@@ -0,0 +1,44 @@
+--- Modules/FindLAPACK.cmake
++++ Modules/FindLAPACK.cmake
+@@ -4,6 +4,10 @@
+ #
+ # Find LAPACK library
+ #
++# Version modified for Gentoo Linux.
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
+ # This module finds an installed fortran library that implements the
+ # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
+ #
+@@ -72,6 +76,24 @@
+ # N.B. _prefix is the prefix applied to the names of all cached variables that
+ # are generated internally and marked advanced by this macro.
+
++#
++# 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(_libraries_work TRUE)
+ set(${LIBRARIES})
+ set(_combined_name)
+@@ -348,3 +370,5 @@
+ endif()
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
new file mode 100644
index 0000000..decfb91
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
@@ -0,0 +1,142 @@
+From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 19 Jun 2014 00:08:13 +1000
+Subject: [PATCH] Set some proper paths to make cmake find our tools.
+
+The ebuild now adds an extra / at the end of $EPREFIX so that it is
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
+correct)
+
+Original patch by Heiko Przybyl.
+Updated by Chris Reffett (cmake-2.8.8)
+Updated by Johannes Huber (cmake-2.8.9)
+Updated by Michael Palimaka (cmake-2.8.10)
+Updated by Chris Reffett (cmake-2.8.11)
+Updated by Michael Palimaka (cmake-3.0.0)
+---
+ Modules/Platform/Darwin.cmake | 12 +++++++----
+ Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
+ 2 files changed, 29 insertions(+), 26 deletions(-)
+
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index e25df1e..9b22a6a 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
+ set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
+ set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
+
+-# default to searching for frameworks first
++# default to searching for frameworks last
+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+- set(CMAKE_FIND_FRAMEWORK FIRST)
++ set(CMAKE_FIND_FRAMEWORK LAST)
+ endif()
+
+ # Older OS X linkers do not report their framework search path
+@@ -156,6 +156,8 @@ endif()
+
+ # set up the default search directories for frameworks
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH
++ @GENTOO_PORTAGE_EPREFIX@Frameworks
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
+ ~/Library/Frameworks
+ )
+ if(_CMAKE_OSX_SYSROOT_PATH)
+@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
+ endif()
+ endif()
+
+-# default to searching for application bundles first
++# default to searching for application bundles last
+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+- set(CMAKE_FIND_APPBUNDLE FIRST)
++ set(CMAKE_FIND_APPBUNDLE LAST)
+ endif()
+ # set up the default search directories for application bundles
+ set(_apps_paths)
+ foreach(_path
++ @GENTOO_PORTAGE_EPREFIX@Applications
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
+ "~/Applications"
+ "/Applications"
+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index 20ee1d1..3481ca8 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ # Standard
++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
+ /usr/local /usr /
+
+ # CMake install location
+@@ -53,43 +54,41 @@ endif()
+
+ # List common include file locations not under the common prefixes.
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+- # Windows API on Cygwin
+- /usr/include/w32api
+-
+- # X11
+- /usr/X11R6/include /usr/include/X11
+-
+- # Other
+- /usr/pkg/include
+- /opt/csw/include /opt/include
+- /usr/openwin/include
++ @GENTOO_PORTAGE_EPREFIX@usr/include
+ )
+
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+- # Windows API on Cygwin
+- /usr/lib/w32api
+-
+- # X11
+- /usr/X11R6/lib /usr/lib/X11
+-
+- # Other
+- /usr/pkg/lib
+- /opt/csw/lib /opt/lib
+- /usr/openwin/lib
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++ @GENTOO_PORTAGE_GCCLIBDIR@
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
+ )
+
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+- /usr/pkg/bin
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
++ @GENTOO_PORTAGE_EPREFIX@bin
+ )
+
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++ @GENTOO_PORTAGE_GCCLIBDIR@
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
+ )
+
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
++ GENTOO_PORTAGE_EPREFIX@usr/include
+ /usr/include
+ )
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
++ @GENTOO_PORTAGE_EPREFIX@usr/include
+ /usr/include
+ )
+
+--
+1.8.5.5
+
diff --git a/dev-util/cmake/files/cmake.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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2014-06-19 15:40 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2014-06-19 15:40 UTC (permalink / raw
To: gentoo-commits
commit: ab814d7a8726e7231ac5abf2f6fc6ab066888e17
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 15:39:47 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 15:39:47 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ab814d7a
[dev-util/cmake] Drop ~ppc-aix KEYWORD and patch.
According to upstream, the issue should be fixed. However, I don't have the
hardware to test, so dropping the keyword for now.
Package-Manager: portage-2.2.10
---
dev-util/cmake/cmake-3.0.0.ebuild | 3 +-
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ----------------------
2 files changed, 1 insertion(+), 41 deletions(-)
diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
index 87a18e7..63b4bf6 100644
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ b/dev-util/cmake/cmake-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar
LICENSE="CMake"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="emacs ncurses qt4 qt5"
REQUIRED_USE="?? ( qt4 qt5 )"
@@ -43,7 +43,6 @@ 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.8-FindPkgConfig.patch
"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
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
deleted file mode 100644
index 02c3011..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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}" \
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2014-07-27 12:24 Johannes Huber
0 siblings, 0 replies; 30+ messages in thread
From: Johannes Huber @ 2014-07-27 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 3b0721973def80758010c73f486239fe16eded80
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 27 10:23:55 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 10:23:55 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3b072197
[dev-util/cmake] Moved to tree
Package-Manager: portage-2.2.10
---
dev-util/cmake/cmake-3.0.0.ebuild | 183 ---------------------
dev-util/cmake/files/50cmake-gentoo.el | 4 -
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 ---
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 ---
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ------
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 ---
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 ---
.../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 -----
.../files/cmake-2.8.12.1-FindImageMagick.patch | 23 ---
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 --
dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch | 43 -----
.../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 -----------
dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch | 44 -----
dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 ----------------
dev-util/cmake/files/cmake.vim | 3 -
dev-util/cmake/metadata.xml | 5 -
17 files changed, 790 deletions(-)
diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
deleted file mode 100644
index 63b4bf6..0000000
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-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
- emacs? ( virtual/emacs )
- 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}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.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-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.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
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_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 Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}/usr/share/cmake/{completions,editors}" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
deleted file mode 100644
index e4a1a6d..0000000
--- a/dev-util/cmake/files/50cmake-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(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-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
deleted file mode 100644
index ceb205f..0000000
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch by Heiko Przybyl
-
---- Source/cmComputeLinkInformation.cxx
-+++ Source/cmComputeLinkInformation.cxx
-@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
- for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
- ri != runtimeDirs.end(); ++ri)
- {
-+ // Do not add duplicates.
-+ // I'd like to have that check already in the list generation code
-+ // but that would need lots of more changes, even in ExpandListArgument().
-+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
-+ {
-+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
-+ continue;
-+ }
- // Separate from previous path.
- rpath += sep;
- sep = this->GetRuntimeSep().c_str();
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
deleted file mode 100644
index 9cb4777..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 97c93aa..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch
deleted file mode 100644
index 052cc30..0000000
--- a/dev-util/cmake/files/cmake-2.8.10-libform.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea1c033..ae479ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
- else ()
- set(BUILD_CursesDialog 0)
- endif ()
-- if(BUILD_CursesDialog)
-- add_subdirectory(Source/CursesDialog/form)
-- endif()
- endmacro ()
-
- #-----------------------------------------------------------------------
-diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
-index 96e28b4..4102379 100644
---- a/Source/CursesDialog/CMakeLists.txt
-+++ b/Source/CursesDialog/CMakeLists.txt
-@@ -25,13 +25,16 @@ set( CURSES_SRCS
- CursesDialog/ccmake
- )
-
--include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- include_directories(${CURSES_INCLUDE_PATH})
-
-
- add_executable(ccmake ${CURSES_SRCS} )
- target_link_libraries(ccmake CMakeLib)
--target_link_libraries(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
-
- install_targets(/bin ccmake)
-diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
-index b157a28..f131ea4 100644
---- a/Source/CursesDialog/cmCursesStandardIncludes.h
-+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
-@@ -15,8 +15,6 @@
- #define _MSE_INT_H
- #endif
-
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
deleted file mode 100644
index a7e8688..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index 2a83ff7..0000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
deleted file mode 100644
index 6dc244c..0000000
--- a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index b094f17..0000000
--- a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
deleted file mode 100644
index c5e17c5..0000000
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index c47f583..5783d37 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -87,7 +87,12 @@
- set(PKG_CONFIG_VERSION 1)
- set(PKG_CONFIG_FOUND 0)
-
--find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
-+if(NOT PKG_CONFIG_EXECUTABLE)
-+ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG})
-+ if(NOT PKG_CONFIG_EXECUTABLE)
-+ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
-+ endif(NOT PKG_CONFIG_EXECUTABLE)
-+endif(NOT PKG_CONFIG_EXECUTABLE)
- mark_as_advanced(PKG_CONFIG_EXECUTABLE)
-
- if(PKG_CONFIG_EXECUTABLE)
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
deleted file mode 100644
index 86c5dc7..0000000
--- a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Modules/FindBLAS.cmake
-+++ Modules/FindBLAS.cmake
-@@ -4,6 +4,10 @@
- #
- # Find BLAS library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
- # list of libraries searched for is taken from the autoconf macro file,
-@@ -50,6 +54,23 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_BLAS blas)
-+if(PC_BLAS_FOUND)
-+ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
-+ if (NOT ${PC_LIB}_LIBRARY)
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
-+ endif (NOT ${PC_LIB}_LIBRARY)
-+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
-+ endforeach(PC_LIB)
-+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
-+ mark_as_advanced(BLAS_LIBRARIES)
-+else(PC_BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
-
-@@ -688,3 +709,5 @@
- endif()
-
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_BLAS_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
deleted file mode 100644
index a6291d2..0000000
--- a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 19 Jun 2014 00:17:48 +1000
-Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
- wrt bug #400969.
-
----
- Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 41 insertions(+)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index dfd4460..70bfb4f 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
- set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
-
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ # Get version of Python.
-+ if (NOT PYTHON_EXECUTABLE)
-+ #if a certain version of python was detected by cmake before use that one
-+ set(PYTHON_EXECUTABLE "python")
-+ endif (NOT PYTHON_EXECUTABLE)
-+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
-+ endif()
-+
- # Compute component-specific hints.
- set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
- if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
-@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+ endif()
-+
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
- list(APPEND _boost_RELEASE_NAMES
-@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
-@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
- list(APPEND _boost_DEBUG_NAMES
-@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
---
-1.8.5.5
-
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch
deleted file mode 100644
index 611c5ce..0000000
--- a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- Modules/FindLAPACK.cmake
-+++ Modules/FindLAPACK.cmake
-@@ -4,6 +4,10 @@
- #
- # Find LAPACK library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
- #
-@@ -72,6 +76,24 @@
- # N.B. _prefix is the prefix applied to the names of all cached variables that
- # are generated internally and marked advanced by this macro.
-
-+#
-+# 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(_libraries_work TRUE)
- set(${LIBRARIES})
- set(_combined_name)
-@@ -348,3 +370,5 @@
- endif()
-
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
deleted file mode 100644
index decfb91..0000000
--- a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 19 Jun 2014 00:08:13 +1000
-Subject: [PATCH] Set some proper paths to make cmake find our tools.
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
-Original patch by Heiko Przybyl.
-Updated by Chris Reffett (cmake-2.8.8)
-Updated by Johannes Huber (cmake-2.8.9)
-Updated by Michael Palimaka (cmake-2.8.10)
-Updated by Chris Reffett (cmake-2.8.11)
-Updated by Michael Palimaka (cmake-3.0.0)
----
- Modules/Platform/Darwin.cmake | 12 +++++++----
- Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
- 2 files changed, 29 insertions(+), 26 deletions(-)
-
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index e25df1e..9b22a6a 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
-@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
-
--# default to searching for frameworks first
-+# default to searching for frameworks last
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
-- set(CMAKE_FIND_FRAMEWORK FIRST)
-+ set(CMAKE_FIND_FRAMEWORK LAST)
- endif()
-
- # Older OS X linkers do not report their framework search path
-@@ -156,6 +156,8 @@ endif()
-
- # set up the default search directories for frameworks
- set(CMAKE_SYSTEM_FRAMEWORK_PATH
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
- ~/Library/Frameworks
- )
- if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
- endif()
- endif()
-
--# default to searching for application bundles first
-+# default to searching for application bundles last
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
-- set(CMAKE_FIND_APPBUNDLE FIRST)
-+ set(CMAKE_FIND_APPBUNDLE LAST)
- endif()
- # set up the default search directories for application bundles
- set(_apps_paths)
- foreach(_path
-+ @GENTOO_PORTAGE_EPREFIX@Applications
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
- "~/Applications"
- "/Applications"
- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 20ee1d1..3481ca8 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # Standard
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
- /usr/local /usr /
-
- # CMake install location
-@@ -53,43 +54,41 @@ endif()
-
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-- # Windows API on Cygwin
-- /usr/include/w32api
--
-- # X11
-- /usr/X11R6/include /usr/include/X11
--
-- # Other
-- /usr/pkg/include
-- /opt/csw/include /opt/include
-- /usr/openwin/include
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- )
-
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
-- # Windows API on Cygwin
-- /usr/lib/w32api
--
-- # X11
-- /usr/X11R6/lib /usr/lib/X11
--
-- # Other
-- /usr/pkg/lib
-- /opt/csw/lib /opt/lib
-- /usr/openwin/lib
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
- )
-
- list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-- /usr/pkg/bin
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin
-+ @GENTOO_PORTAGE_EPREFIX@bin
- )
-
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+ @GENTOO_PORTAGE_GCCLIBDIR@
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib
-+ @GENTOO_PORTAGE_EPREFIX@lib
-+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
- )
-
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+ GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+ @GENTOO_PORTAGE_EPREFIX@usr/include
- /usr/include
- )
-
---
-1.8.5.5
-
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim
deleted file mode 100644
index 5cecd7d..0000000
--- a/dev-util/cmake/files/cmake.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a23f444..0000000
--- a/dev-util/cmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 30+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
@ 2015-04-01 13:19 Michael Palimaka
0 siblings, 0 replies; 30+ messages in thread
From: Michael Palimaka @ 2015-04-01 13:19 UTC (permalink / raw
To: gentoo-commits
commit: a1c2506d564ca4527b029d542eef35d38d466570
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 1 13:19:31 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 1 13:19:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1c2506d
[dev-util/cmake] Version bump wrt bug #543700.
Package-Manager: portage-2.2.18
dev-util/cmake/cmake-3.2.1.ebuild | 192 +++++++++++++++++++++
dev-util/cmake/files/50cmake-gentoo.el | 4 +
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++
.../files/cmake-2.8.12.1-FindImageMagick.patch | 23 +++
dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch | 43 +++++
.../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 ++++++++++
dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 +++++++++++++++
dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch | 43 +++++
.../cmake/files/cmake-3.1.0-FindPythonInterp.patch | 29 ++++
.../cmake/files/cmake-3.1.0-darwin-isysroot.patch | 48 ++++++
dev-util/cmake/files/cmake.vim | 3 +
dev-util/cmake/metadata.xml | 5 +
13 files changed, 672 insertions(+)
diff --git a/dev-util/cmake/cmake-3.2.1.ebuild b/dev-util/cmake/cmake-3.2.1.ebuild
new file mode 100644
index 0000000..97a8121
--- /dev/null
+++ b/dev-util/cmake/cmake-3.2.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.1.0.ebuild,v 1.1 2015/01/16 20:35:46 johu Exp $
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt4 qt5"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
+
+RDEPEND="
+ >=app-arch/libarchive-2.8.0:=
+ >=dev-libs/expat-2.0.1
+ >=dev-libs/jsoncpp-0.6.0_rc2
+ >=net-misc/curl-7.20.0-r1[ssl]
+ sys-libs/zlib
+ virtual/pkgconfig
+ emacs? ( virtual/emacs )
+ 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
+ )
+"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+ # prefix
+ "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+ "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+ # handle gentoo packaging in find modules
+ "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+ "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+ "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+
+ # respect python eclasses
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+)
+
+cmake_src_bootstrap() {
+ # Cleanup args to extract only JOBS.
+ # Because bootstrap does not know anything else.
+ echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+ if [ $? -eq 0 ]; then
+ par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+ par_arg="--parallel=${par_arg}"
+ else
+ par_arg="--parallel=1"
+ fi
+
+ # execinfo.h on Solaris isn't quite what it is on Darwin
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+ fi
+
+ tc-export CC CXX LD
+
+ # bootstrap script isn't exactly /bin/sh compatible
+ ${CONFIG_SHELL:-sh} ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ ${par_arg} \
+ || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+ # fix OutDir and SelectLibraryConfigurations tests
+ # these are altered thanks to our eclass
+ sed -i -e 's:#IGNORE ::g' \
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+ || die
+
+ pushd "${BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # BundleUtilities: bundle creation broken
+ # CTest.updatecvs: which fails to commit as root
+ # Fortran: requires fortran
+ # Qt4Deploy, which tries to break sandbox and ignores prefix
+ # TestUpload, which requires network access
+ "${BUILD_DIR}"/bin/ctest ${ctestargs} \
+ -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # disable running of cmake in boostrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+ cmake_src_bootstrap
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ -DSPHINX_MAN=$(usex doc)
+ -DSPHINX_HTML=$(usex doc)
+ $(cmake-utils_use_build ncurses CursesDialog)
+ )
+
+ if use qt4 || use qt5 ; then
+ mycmakeargs+=(
+ -DBUILD_QtDialog=ON
+ $(cmake-utils_use_find_package qt5 Qt5Widgets)
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+ VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use emacs; then
+ elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Auxiliary/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Auxiliary/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${PN}.vim"
+
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+ rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el
new file mode 100644
index 0000000..e4a1a6d
--- /dev/null
+++ b/dev-util/cmake/files/50cmake-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t)
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
diff --git a/dev-util/cmake/files/cmake-2.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.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.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-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
new file mode 100644
index 0000000..86c5dc7
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
@@ -0,0 +1,43 @@
+--- Modules/FindBLAS.cmake
++++ Modules/FindBLAS.cmake
+@@ -4,6 +4,10 @@
+ #
+ # Find BLAS library
+ #
++# Version modified for Gentoo Linux.
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
+ # This module finds an installed fortran library that implements the
+ # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
+ # list of libraries searched for is taken from the autoconf macro file,
+@@ -50,6 +54,23 @@
+ # (To distribute this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_BLAS blas)
++if(PC_BLAS_FOUND)
++ foreach(PC_LIB ${PC_BLAS_LIBRARIES})
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
++ if (NOT ${PC_LIB}_LIBRARY)
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
++ endif (NOT ${PC_LIB}_LIBRARY)
++ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY})
++ endforeach(PC_LIB)
++ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
++ mark_as_advanced(BLAS_LIBRARIES)
++else(PC_BLAS_FOUND)
++message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+
+@@ -688,3 +709,5 @@
+ endif()
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_BLAS_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
new file mode 100644
index 0000000..a6291d2
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch
@@ -0,0 +1,93 @@
+From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 19 Jun 2014 00:17:48 +1000
+Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
+ wrt bug #400969.
+
+---
+ Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index dfd4460..70bfb4f 100644
+--- a/Modules/FindBoost.cmake
++++ b/Modules/FindBoost.cmake
+@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+ set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
+
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ # Get version of Python.
++ if (NOT PYTHON_EXECUTABLE)
++ #if a certain version of python was detected by cmake before use that one
++ set(PYTHON_EXECUTABLE "python")
++ endif (NOT PYTHON_EXECUTABLE)
++ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
++ endif()
++
+ # Compute component-specific hints.
+ set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
+ if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
+@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++ endif()
++
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+ list(APPEND _boost_RELEASE_NAMES
+@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_RELEASE_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++ endif()
+ if(_boost_STATIC_RUNTIME_WORKAROUND)
+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+ list(APPEND _boost_DEBUG_NAMES
+@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++ list(APPEND _boost_DEBUG_NAMES
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++ endif()
+ endif()
+ if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
+--
+1.8.5.5
+
diff --git a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
new file mode 100644
index 0000000..decfb91
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch
@@ -0,0 +1,142 @@
+From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 19 Jun 2014 00:08:13 +1000
+Subject: [PATCH] Set some proper paths to make cmake find our tools.
+
+The ebuild now adds an extra / at the end of $EPREFIX so that it is
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
+correct)
+
+Original patch by Heiko Przybyl.
+Updated by Chris Reffett (cmake-2.8.8)
+Updated by Johannes Huber (cmake-2.8.9)
+Updated by Michael Palimaka (cmake-2.8.10)
+Updated by Chris Reffett (cmake-2.8.11)
+Updated by Michael Palimaka (cmake-3.0.0)
+---
+ Modules/Platform/Darwin.cmake | 12 +++++++----
+ Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
+ 2 files changed, 29 insertions(+), 26 deletions(-)
+
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index e25df1e..9b22a6a 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
+ set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
+ set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
+
+-# default to searching for frameworks first
++# default to searching for frameworks last
+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+- set(CMAKE_FIND_FRAMEWORK FIRST)
++ set(CMAKE_FIND_FRAMEWORK LAST)
+ endif()
+
+ # Older OS X linkers do not report their framework search path
+@@ -156,6 +156,8 @@ endif()
+
+ # set up the default search directories for frameworks
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH
++ @GENTOO_PORTAGE_EPREFIX@Frameworks
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
+ ~/Library/Frameworks
+ )
+ if(_CMAKE_OSX_SYSROOT_PATH)
+@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
+ endif()
+ endif()
+
+-# default to searching for application bundles first
++# default to searching for application bundles last
+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+- set(CMAKE_FIND_APPBUNDLE FIRST)
++ set(CMAKE_FIND_APPBUNDLE LAST)
+ endif()
+ # set up the default search directories for application bundles
+ set(_apps_paths)
+ foreach(_path
++ @GENTOO_PORTAGE_EPREFIX@Applications
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
+ "~/Applications"
+ "/Applications"
+ "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index 20ee1d1..3481ca8 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ # Standard
++ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
+ /usr/local /usr /
+
+ # CMake install location
+@@ -53,43 +54,41 @@ endif()
+
+ # List common include file locations not under the common prefixes.
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+- # Windows API on Cygwin
+- /usr/include/w32api
+-
+- # X11
+- /usr/X11R6/include /usr/include/X11
+-
+- # Other
+- /usr/pkg/include
+- /opt/csw/include /opt/include
+- /usr/openwin/include
++ @GENTOO_PORTAGE_EPREFIX@usr/include
+ )
+
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+- # Windows API on Cygwin
+- /usr/lib/w32api
+-
+- # X11
+- /usr/X11R6/lib /usr/lib/X11
+-
+- # Other
+- /usr/pkg/lib
+- /opt/csw/lib /opt/lib
+- /usr/openwin/lib
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++ @GENTOO_PORTAGE_GCCLIBDIR@
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
+ )
+
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+- /usr/pkg/bin
++ @GENTOO_PORTAGE_EPREFIX@usr/bin
++ @GENTOO_PORTAGE_EPREFIX@bin
+ )
+
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
++ @GENTOO_PORTAGE_GCCLIBDIR@/gcc
++ @GENTOO_PORTAGE_GCCLIBDIR@
++ @GENTOO_PORTAGE_EPREFIX@usr/lib64
++ @GENTOO_PORTAGE_EPREFIX@usr/libx32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib32
++ @GENTOO_PORTAGE_EPREFIX@usr/lib
++ @GENTOO_PORTAGE_EPREFIX@lib
++ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
+ )
+
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
++ GENTOO_PORTAGE_EPREFIX@usr/include
+ /usr/include
+ )
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
++ @GENTOO_PORTAGE_EPREFIX@usr/include
+ /usr/include
+ )
+
+--
+1.8.5.5
+
diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
new file mode 100644
index 0000000..57250e4
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
@@ -0,0 +1,43 @@
+--- Modules/FindLAPACK.cmake.orig 2014-09-15 23:50:11.377111987 +0200
++++ Modules/FindLAPACK.cmake 2014-09-15 23:52:54.734388375 +0200
+@@ -4,6 +4,10 @@
+ #
+ # Find LAPACK library
+ #
++# Version modified for Gentoo Linux.
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
+ # This module finds an installed fortran library that implements the
+ # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
+ #
+@@ -140,6 +144,23 @@
+
+ endmacro()
+
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PC_LAPACK lapack)
++if(PC_LAPACK_FOUND)
++ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
++ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
++ if (NOT ${PC_LIB}_LIBRARY)
++ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
++ endif (NOT ${PC_LIB}_LIBRARY)
++ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
++ endforeach(PC_LIB)
++ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
++ mark_as_advanced(LAPACK_LIBRARIES)
++else(PC_LAPACK_FOUND)
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
+
+ set(LAPACK_LINKER_FLAGS)
+ set(LAPACK_LIBRARIES)
+@@ -348,3 +369,5 @@
+ endif()
+
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
new file mode 100644
index 0000000..78f622d
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
@@ -0,0 +1,29 @@
+--- Modules/FindPythonInterp.cmake.orig 2015-01-06 11:50:03.376357898 +0100
++++ Modules/FindPythonInterp.cmake 2015-01-06 12:25:48.614989290 +0100
+@@ -75,6 +75,11 @@
+ else()
+ set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
+ endif()
++
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ set(_Python_NAMES python)
++endif()
++
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+
+ # Set up the versions we know about, in the order we will search. Always add
+@@ -99,12 +104,13 @@
+ unset(_PYTHON3_VERSIONS)
+
+ # Search for newest python version if python executable isn't found
+-if(NOT PYTHON_EXECUTABLE)
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
+ foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
+ set(_Python_NAMES python${_CURRENT_VERSION})
+ if(WIN32)
+ list(APPEND _Python_NAMES python)
+ endif()
++
+ find_program(PYTHON_EXECUTABLE
+ NAMES ${_Python_NAMES}
+ PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]
diff --git a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
new file mode 100644
index 0000000..119001a
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
@@ -0,0 +1,48 @@
+Do not detect Xcode and set -isysroot for its SDK, since that messes up
+our toolchain, and hence makes any compilation fail, bug #445308
+
+--- Modules/Platform/Darwin-Initialize.cmake
++++ Modules/Platform/Darwin-Initialize.cmake
+@@ -1,16 +1,16 @@
+ # Ask xcode-select where to find /Developer or fall back to ancient location.
+-execute_process(COMMAND xcode-select -print-path
+- OUTPUT_VARIABLE _stdout
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_VARIABLE _stderr
+- RESULT_VARIABLE _failed)
+-if(NOT _failed AND IS_DIRECTORY ${_stdout})
+- set(OSX_DEVELOPER_ROOT ${_stdout})
+-elseif(IS_DIRECTORY "/Developer")
+- set(OSX_DEVELOPER_ROOT "/Developer")
+-else()
++#execute_process(COMMAND xcode-select -print-path
++# OUTPUT_VARIABLE _stdout
++# OUTPUT_STRIP_TRAILING_WHITESPACE
++# ERROR_VARIABLE _stderr
++# RESULT_VARIABLE _failed)
++#if(NOT _failed AND IS_DIRECTORY ${_stdout})
++# set(OSX_DEVELOPER_ROOT ${_stdout})
++#elseif(IS_DIRECTORY "/Developer")
++# set(OSX_DEVELOPER_ROOT "/Developer")
++#else()
+ set(OSX_DEVELOPER_ROOT "")
+-endif()
++#endif()
+
+ execute_process(COMMAND sw_vers -productVersion
+ OUTPUT_VARIABLE CURRENT_OSX_VERSION
+@@ -91,10 +91,10 @@
+ # CMAKE_OSX_DEPLOYMENT_TARGET
+
+ # Set cache variable - end user may change this during ccmake or cmake-gui configure.
+-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
+- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+-endif()
++#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
++# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
++# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
++#endif()
+
+ #----------------------------------------------------------------------------
+ # CMAKE_OSX_SYSROOT
diff --git a/dev-util/cmake/files/cmake.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>
^ permalink raw reply related [flat|nested] 30+ messages in thread
end of thread, other threads:[~2015-04-01 13:20 UTC | newest]
Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-22 14:47 [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2015-04-01 13:19 Michael Palimaka
2014-07-27 12:24 Johannes Huber
2014-06-19 15:40 Michael Palimaka
2014-06-18 14:45 Michael Palimaka
2014-05-06 12:24 Johannes Huber
2014-02-25 19:23 Michael Palimaka
2013-10-21 3:28 Chris Reffett
2013-10-13 16:27 Johannes Huber
2013-09-11 18:02 Michael Palimaka
2013-09-01 15:00 Michael Palimaka
2013-06-09 12:09 Johannes Huber
2013-04-27 21:36 Chris Reffett
2013-04-14 17:57 Michael Palimaka
2013-04-09 19:25 Chris Reffett
2013-03-11 17:27 Michael Palimaka
2013-02-07 16:11 Michael Palimaka
2013-01-10 14:33 Michael Palimaka
2012-11-18 13:45 Michael Palimaka
2012-11-06 13:10 Michael Palimaka
2012-08-19 12:59 Johannes Huber
2012-08-15 13:33 Johannes Huber
2012-05-02 21:13 Johannes Huber
2012-05-01 22:18 Chris Reffett
2012-04-30 9:04 Johannes Huber
2012-04-22 15:04 Chris Reffett
2012-01-22 16:35 Johannes Huber
2012-01-13 9:00 Johannes Huber
2011-10-15 15:07 Andreas Hüttel
2011-10-13 12:01 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox