diff options
| -rw-r--r-- | dev-util/cmake/Manifest | 24 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.6.ebuild | 162 | ||||
| -rw-r--r-- | dev-util/cmake/files/50cmake-gentoo.el | 4 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch | 20 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch | 109 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch | 12 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.4-FindBoost.patch | 13 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake.vim | 3 | ||||
| -rw-r--r-- | dev-util/cmake/metadata.xml | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 2 | ||||
| -rw-r--r-- | profiles/package.mask.d/cmake | 1 |
16 files changed, 498 insertions, 0 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest new file mode 100644 index 00000000000..6215becea46 --- /dev/null +++ b/dev-util/cmake/Manifest @@ -0,0 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 +AUX cmake-2.6.3-darwin-bundle.patch 952 RMD160 157295c7080e3fa5a1414c6f7efba4877049c5e7 SHA1 595740c64fd64e93763d7b1f59d341f9f8117482 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca +AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 RMD160 38094f9f8516656cc30d6ead147bc1e2ae41f429 SHA1 5458b92849292d9e8ca3003654a94e339cb4a48c SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 +AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 RMD160 d927ce8bb08d57f452db3371a0b2e11d252b96c9 SHA1 6f88171a816c1157ddcf3c3d5c3e3ec080471883 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 +AUX cmake-2.8.0-darwin-default-install_name.patch 911 RMD160 6261482ff3f989ce455ea87cd5c540385420149b SHA1 6c473a538204826210f62fabdfafb2f5f19087bb SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d +AUX cmake-2.8.1-libform.patch 1818 RMD160 ca954dfe966cd73836ef9e01ffe8f0eda85f2f91 SHA1 8f8e9a0002b4a95cea7dcfc36c2df16c47008bec SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5 +AUX cmake-2.8.3-more-no_host_paths.patch 3052 RMD160 fb11585292980d19a2810a7ce5741c94aa7391a3 SHA1 3980e7b522ebe934fbf0625221cc5b42e2e19716 SHA256 55165d67bad9def6b349bf67d02ede28a2fc291d28a2a5296897e25980ce623c +AUX cmake-2.8.3-ruby_libname.patch 558 RMD160 b701ba52d7e13e69f25914ab661dcf9e7c7a606e SHA1 df61342fdae8b659ecb06fde85247f2c736501da SHA256 8205e354d78827b2a4cf67fb9d88fee39696398db07d1fa4f8d33c2bbeda3748 +AUX cmake-2.8.4-FindBoost.patch 635 RMD160 4a665b76e4cf10ee67d5370527867882f9a39127 SHA1 9a2491484d8818584411bf08b37cf6580027a7f4 SHA256 3c4d42b772b85e6838eaaecdb71ea345630fe519102d7c2f2234bcf8b9c63154 +AUX cmake-2.8.4-FindPythonLibs.patch 642 RMD160 b116a8f6d4dfd722943a88b1998bfd194a014853 SHA1 f599c1e88a5a64a215e7d27cbfd097543b42e389 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3 +AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 +DIST cmake-2.8.6.tar.gz 5583905 RMD160 c3095a4776367496f895b8075fda373568f01878 SHA1 7c2cbd42d27e26580cd4923892197b84b2a90675 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e +EBUILD cmake-2.8.6.ebuild 4526 RMD160 0518d452d77daa5d3de313d2886e97ffcfa13ec1 SHA1 686e9aeaaabae5352470e72f3bf5ddc2c77f78f7 SHA256 9ede5f6886b3277374135ac0f9b4bc211efb5289bea1ca5f8b76e956b3325790 +MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk6PDx4ACgkQvRf93N8BhGLh8wD+PbyUaNjccywIUW6kMq94+ZfH +BIEt46a62VBxB6eQ0DUA/3kNce325pk5Cn74yJH9cj59g1BQ69RuBbWv5qeRc3oc +=YOwb +-----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.8.6.ebuild b/dev-util/cmake/cmake-2.8.6.ebuild new file mode 100644 index 00000000000..b5f69666ff0 --- /dev/null +++ b/dev-util/cmake/cmake-2.8.6.ebuild @@ -0,0 +1,162 @@ +# 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 +) +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 new file mode 100644 index 00000000000..e4a1a6d47cb --- /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 00000000000..6ee9b709dff --- /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 00000000000..02c3011c8f7 --- /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 00000000000..ceb205ff586 --- /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 00000000000..4ef0c7b4b6f --- /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 00000000000..87c724776e5 --- /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 00000000000..38bad925c37 --- /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 00000000000..45d2b162c5b --- /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.4-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch new file mode 100644 index 00000000000..4a56d43a9e5 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.4-FindBoost.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 00000000000..28d2e4f8790 --- /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.vim b/dev-util/cmake/files/cmake.vim new file mode 100644 index 00000000000..5cecd7d05b6 --- /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 00000000000..a23f444b67d --- /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> diff --git a/profiles/package.mask b/profiles/package.mask index 7ef4d97bd25..8d002a2dc12 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -6,6 +6,8 @@ ~dev-libs/libdbusmenu-0.3.94 ~dev-libs/libindicate-0.4.91 +~dev-util/cmake-2.8.6 + # digikam-2 and kipi-plugins-2 depend on kde-4.7, so they are masked here =media-gfx/digikam-2* =media-plugins/kipi-plugins-2* diff --git a/profiles/package.mask.d/cmake b/profiles/package.mask.d/cmake new file mode 100644 index 00000000000..1382c77f7f3 --- /dev/null +++ b/profiles/package.mask.d/cmake @@ -0,0 +1 @@ +~dev-util/cmake-2.8.6 |
