Menu
▾
▴
[Libmage-cvs] SF.net SVN: libmage:[620] gentoo-portage-overlay/trunk
|
From: <za...@us...> - 2010-11-26 12:52:23
|
Revision: 620
http://libmage.svn.sourceforge.net/libmage/?rev=620&view=rev
Author: zaufi
Date: 2010-11-26 12:52:16 +0000 (Fri, 26 Nov 2010)
Log Message:
-----------
fresh cmake has been added
Added Paths:
-----------
gentoo-portage-overlay/trunk/dev-util/
gentoo-portage-overlay/trunk/dev-util/cmake/
gentoo-portage-overlay/trunk/dev-util/cmake/cmake-2.8.3.ebuild
gentoo-portage-overlay/trunk/dev-util/cmake/files/
gentoo-portage-overlay/trunk/dev-util/cmake/files/50cmake-gentoo.el
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.1-libform.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-FindJNI.patch
gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake.vim
Added: gentoo-portage-overlay/trunk/dev-util/cmake/cmake-2.8.3.ebuild
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/cmake-2.8.3.ebuild (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/cmake-2.8.3.ebuild 2010-11-26 12:52:16 UTC (rev 620)
@@ -0,0 +1,164 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+EAPI="3"
+
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils
+
+MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+DEPEND="
+ app-arch/libarchive
+ >=net-misc/curl-7.20.0-r1[ssl]
+ >=dev-libs/expat-2.0.1
+ sys-libs/zlib
+ ncurses? ( sys-libs/ncurses )
+ qt4? ( x11-libs/qt-gui:4 )
+"
+RDEPEND="${DEPEND}
+ emacs? ( virtual/emacs )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+ "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+ "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
+ "${FILESDIR}"/${PN}-2.8.0-darwin-no-app-with-qt.patch
+ "${FILESDIR}"/${PN}-2.8.1-FindBoost.patch
+ "${FILESDIR}"/${PN}-2.8.1-libform.patch
+ "${FILESDIR}"/${PN}-2.8.3-FindLibArchive.patch
+ "${FILESDIR}"/${PN}-2.8.3-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-2.8.3-FindPythonInterp.patch
+ "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
+)
+
+src_prepare() {
+ base_src_prepare
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib|g" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+}
+
+src_configure() {
+ if [[ "$(gcc-major-version)" -eq "3" ]] ; then
+ append-flags "-fno-stack-protector"
+ fi
+
+ # make things work with gentoo java setup
+ # in case java-config cannot be run, the variable just becomes unset
+ export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+ bootstrap=0
+ has_version ">=dev-util/cmake-2.6.1" || bootstrap=1
+ if [[ ${bootstrap} = 0 ]]; then
+ # Required version of CMake found, now test if it works
+ cmake --version &> /dev/null || bootstrap=1
+ fi
+
+ use test && bootstrap=1 #315223
+
+ if [[ ${bootstrap} = 1 ]]; then
+ local qt_arg par_arg
+ tc-export CC CXX LD
+
+ if use qt4; then
+ qt_arg="--qt-gui"
+ else
+ qt_arg="--no-qt-gui"
+ fi
+
+ echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+ if [ $? -eq 0 ]; then
+ par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
+ par_arg="--parallel=${par_arg}"
+ else
+ par_arg="--parallel=1"
+ fi
+
+ ./bootstrap \
+ --system-libs \
+ --prefix="${EPREFIX}"/usr \
+ --docdir=/share/doc/${PF} \
+ --datadir=/share/${PN} \
+ --mandir=/share/man \
+ "$qt_arg" \
+ "$par_arg" || die "./bootstrap failed"
+ else
+ # this is way much faster so we should prefer it if some cmake is
+ # around.
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ $(cmake-utils_use_build ncurses CursesDialog)
+ $(cmake-utils_use_build qt4 QtDialog)
+ )
+ cmake-utils_src_configure
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ if use emacs; then
+ elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
+ fi
+}
+
+src_test() {
+ emake test || die "Tests failed"
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use emacs; then
+ elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Docs/cmake-syntax.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Docs/cmake-indent.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${VIMFILE}"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/50cmake-gentoo.el
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/50cmake-gentoo.el (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/50cmake-gentoo.el 2010-11-26 12:52:16 UTC (rev 620)
@@ -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))
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -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
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -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}" \
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -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();
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -0,0 +1,22 @@
+--- Modules/FindBoost.cmake
++++ Modules/FindBoost.cmake
+@@ -57,7 +57,8 @@
+ #
+ # Currently this module searches for the following version numbers:
+ # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
+-# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
++# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
++# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0
+ #
+ # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
+ # add both 1.x and 1.x.0 as shown above. Official Boost include directories
+@@ -271,7 +272,8 @@
+ # The user has not requested an exact version. Among known
+ # versions, find those that are acceptable to the user request.
+ set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+- "1.38.0" "1.38" "1.37.0" "1.37"
++ "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42" "1.41.0" "1.41"
++ "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
+ "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
+ "1.34" "1.33.1" "1.33.0" "1.33")
+ set(_boost_TEST_VERSIONS)
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -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");
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -0,0 +1,74 @@
+Description: Don't build the GUI's app-bundle.
+Author: Heiko Przybyl <zu...@cs...>
+--- cmake-2.8.0/CMakeLists.txt.orig 2010-02-10 19:38:03 +0100
++++ cmake-2.8.0/CMakeLists.txt 2010-02-10 19:38:49 +0100
+@@ -381,7 +381,7 @@ IF(BUILD_CursesDialog)
+ ENDIF(BUILD_CursesDialog)
+
+ IF(BUILD_QtDialog)
+- IF(APPLE)
++ IF(FALSE)
+ SET(CMAKE_BUNDLE_NAME
+ "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
+ SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
+@@ -394,7 +394,7 @@ IF(BUILD_QtDialog)
+ ENDIF(NOT "${ENDCH}" STREQUAL "/")
+ SET(CMAKE_INSTALL_PREFIX
+ "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
+- ENDIF(APPLE)
++ ENDIF(FALSE)
+
+ SET(QT_NEED_RPATH FALSE)
+ IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
+--- cmake-2.8.0/Source/QtDialog/CMakeLists.txt.orig 2010-02-10 19:39:59 +0100
++++ cmake-2.8.0/Source/QtDialog/CMakeLists.txt 2010-02-10 19:42:12 +0100
+@@ -66,12 +66,12 @@ ELSE(NOT QT4_FOUND)
+ IF(Q_WS_WIN)
+ SET(SRCS ${SRCS} CMakeSetup.rc)
+ ENDIF(Q_WS_WIN)
+- IF(Q_WS_MAC)
++ IF(FALSE)
+ SET(SRCS ${SRCS} CMakeSetup.icns)
+ SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
+ SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES
+ MACOSX_PACKAGE_LOCATION Resources)
+- ENDIF(Q_WS_MAC)
++ ENDIF(FALSE)
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+@@ -79,13 +79,13 @@ ELSE(NOT QT4_FOUND)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+- ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
++ ADD_EXECUTABLE(cmake-gui WIN32 ${SRCS})
+ TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
+ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+- IF(APPLE)
++ IF(FALSE)
+ SET_TARGET_PROPERTIES(cmake-gui PROPERTIES
+ OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
+- ENDIF(APPLE)
++ ENDIF(FALSE)
+ SET(CMAKE_INSTALL_DESTINATION_ARGS
+ BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
+ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
+@@ -101,7 +101,7 @@ ELSE(NOT QT4_FOUND)
+ INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages )
+ ENDIF(UNIX)
+
+- IF(APPLE)
++ IF(FALSE)
+ SET(CMAKE_POSTFLIGHT_SCRIPT
+ "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
+ SET(CMAKE_POSTUPGRADE_SCRIPT
+@@ -115,7 +115,7 @@ ELSE(NOT QT4_FOUND)
+ INSTALL(CODE "set(input_file
+ \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}\")")
+ INSTALL(SCRIPT "${CMake_SOURCE_DIR}/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake")
+- ENDIF(APPLE)
++ ENDIF(FALSE)
+ CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
+ "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)
+ ENDIF(NOT QT4_FOUND)
\ No newline at end of file
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -0,0 +1,14 @@
+diff -u -r cmake-2.8.1.orig/Modules/FindBoost.cmake cmake-2.8.1/Modules/FindBoost.cmake
+--- cmake-2.8.1.orig/Modules/FindBoost.cmake 2010-03-16 21:29:29.000000000 +0100
++++ cmake-2.8.1/Modules/FindBoost.cmake 2010-04-04 19:52:50.000000000 +0200
+@@ -70,7 +70,9 @@
+ # omit the 3rd version number from include paths if it is 0 although not all
+ # binary Boost releases do so.
+ #
+-# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
++SET(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48"
++ "1.47.0" "1.47" "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0"
++ "1.43" "1.42.0" "1.42")
+ #
+ # ===================================== ============= ========================
+ #
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.1-libform.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.1-libform.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.1-libform.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -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>
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -0,0 +1,12 @@
+diff -ruN cmake-2.8.3.orig/Modules/FindLibArchive.cmake cmake-2.8.3/Modules/FindLibArchive.cmake
+--- cmake-2.8.3.orig/Modules/FindLibArchive.cmake 2010-11-04 02:58:27.000000000 +0700
++++ cmake-2.8.3/Modules/FindLibArchive.cmake 2010-11-05 17:40:53.712001939 +0700
+@@ -50,7 +50,7 @@
+
+ # Handle the QUIETLY and REQUIRED arguments and set LIBARCHIVE_FOUND
+ # to TRUE if all listed variables are TRUE.
+-include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake")
++include("${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake")
+ find_package_handle_standard_args(LibArchive DEFAULT_MSG
+ LibArchive_LIBRARY LibArchive_INCLUDE_DIR
+ )
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -0,0 +1,11 @@
+--- Modules/FindPythonInterp.cmake
++++ Modules/FindPythonInterp.cmake
+@@ -20,7 +20,7 @@
+ # License text for the above reference.)
+
+ FIND_PROGRAM(PYTHON_EXECUTABLE
+- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
++ NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+ PATHS
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -0,0 +1,13 @@
+--- Modules/FindPythonLibs.cmake
++++ Modules/FindPythonLibs.cmake
+@@ -27,7 +27,9 @@
+ # Search for the python framework on Apple.
+ CMAKE_FIND_FRAMEWORKS(Python)
+
+-FOREACH(_CURRENT_VERSION 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_VERSION)
++FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION})
+ STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+ IF(WIN32)
+ FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -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
+ )
+
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-FindJNI.patch
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-FindJNI.patch (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake-FindJNI.patch 2010-11-26 12:52:16 UTC (rev 620)
@@ -0,0 +1,71 @@
+diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake
+--- ./Modules/FindJNI.cmake 2009-02-21 21:36:50.000000000 +0100
++++ ../a/Modules/FindJNI.cmake 2008-11-24 04:44:06.000000000 +0100
+@@ -2,7 +2,7 @@
+ # This module finds if Java is installed and determines where the
+ # include files and libraries are. It also determines what the name of
+ # the library is. This code sets the following variables:
+-#
++#
+ # JNI_INCLUDE_DIRS = the include dirs to use
+ # JNI_LIBRARIES = the libraries to use
+ # JAVA_AWT_LIBRARY = the path to the jawt library
+@@ -51,6 +51,8 @@
+ "${dir}"
+ "${dir}/client"
+ "${dir}/server"
++ "${dir}/j9vm"
++ "${dir}/classic"
+ )
+ ENDFOREACH(dir)
+
+@@ -60,7 +62,7 @@
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+ $ENV{JAVA_HOME}/include
+- /usr/include
++ /usr/include
+ /usr/local/include
+ /usr/lib/java/include
+ /usr/local/lib/java/include
+@@ -126,7 +128,7 @@
+ )
+ ENDIF(JAVA_HAVE_FRAMEWORK)
+ ELSE(APPLE)
+- FIND_LIBRARY(JAVA_AWT_LIBRARY jawt
++ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt
+ PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
+ )
+ FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM
+@@ -134,18 +136,23 @@
+ )
+ ENDIF(APPLE)
+
+-# add in the include path
+-FIND_PATH(JAVA_INCLUDE_PATH jni.h
++# add in the include path
++FIND_PATH(JAVA_INCLUDE_PATH jni.h
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ )
+
+-FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
++FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ ${JAVA_INCLUDE_PATH}/win32
+ ${JAVA_INCLUDE_PATH}/linux
+ ${JAVA_INCLUDE_PATH}/freebsd
+ )
+
++FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h
++ ${JAVA_AWT_INCLUDE_DIRECTORIES}
++ ${JAVA_INCLUDE_PATH}
++)
++
+ FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ ${JAVA_INCLUDE_PATH}
+@@ -169,4 +176,3 @@
+ ${JAVA_INCLUDE_PATH2}
+ ${JAVA_AWT_INCLUDE_PATH}
+ )
+-
Added: gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake.vim
===================================================================
--- gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake.vim (rev 0)
+++ gentoo-portage-overlay/trunk/dev-util/cmake/files/cmake.vim 2010-11-26 12:52:16 UTC (rev 620)
@@ -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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
