From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9A6E71381F3 for ; Wed, 11 Sep 2013 18:02:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 254E8E0B5D; Wed, 11 Sep 2013 18:02:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7558BE0B5D for ; Wed, 11 Sep 2013 18:02:44 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6581733EAF5 for ; Wed, 11 Sep 2013 18:02:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 20D23E468F for ; Wed, 11 Sep 2013 18:02:42 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1378922374.b9d2559d5fe28c3aabcfa6d3d35ebb7a280a527c.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.11.2.ebuild dev-util/cmake/files/50cmake-gentoo.el dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch dev-util/cmake/files/cmake-2.8.10-desktop.patch dev-util/cmake/files/cmake-2.8.10-libform.patch dev-util/cmake/files/cmake-2.8.10-more-no_host_paths.patch dev-util/cmake/files/cmake-2.8.10-tests.patch dev-util/cmake/files/cmake-2.8.10.2-FindImageMagick.patch dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch dev-util/cmake/files/cmake-2.8.10.2-implicit-include.patch dev-util/cmake/files/cmake-2.8.10.2-qt5.patch dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch dev-util/cmake/files/cmak e-2.8.11-FindBoost-python.patch dev-util/cmake/files/cmake-2.8.11-FindImageMagick.patch dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch dev-util/cmake/files/cmake.vim dev-util/cmake/metadata.xml X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b9d2559d5fe28c3aabcfa6d3d35ebb7a280a527c X-VCS-Branch: master Date: Wed, 11 Sep 2013 18:02:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 770013c8-6888-431e-9203-98f15e3c22f1 X-Archives-Hash: c4cc7de793bffb2f15e3a1f144a38fb3 commit: b9d2559d5fe28c3aabcfa6d3d35ebb7a280a527c Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 11 17:59:34 2013 +0000 Commit: Michael Palimaka gentoo 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 -+int main() { return 0; } -+#endif -+ -+ - #ifdef TEST_KWSYS_IOS_HAVE_STD - #include - void f(std ::ostream*) {} -diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap ---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 -+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 -@@ -1005,6 +1005,16 @@ - echo "${cmake_cxx_compiler} does not have stl iterator_traits" - fi - -+if cmake_try_run "${cmake_cxx_compiler}" \ -+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ -+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then -+ KWSYS_LFS_AVAILABLE=1 -+ echo "LFS support available" -+else -+ KWSYS_LFS_AVAILABLE=0 -+ echo "LFS support unavailable, disabled" -+fi -+ - if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch 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::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 -- - #if defined(__hpux) - # define _BOOL_DEFINED - # include 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 -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 - " -o ") - - --# 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& 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& 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 impDirVec; -- cmSystemTools::ExpandListArgument(value, impDirVec); -- for(std::vector::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 impDirVec; -+ cmSystemTools::ExpandListArgument(value, impDirVec); -+ for(std::vector::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& 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 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 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::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 -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 @@ - " -o ") - - --# 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 @@ - - - - kde -