diff options
18 files changed, 0 insertions, 654 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest deleted file mode 100644 index a1358bfb70c..00000000000 --- a/dev-util/cmake/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cmake-2.8.6.tar.gz 5583905 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e SHA512 68e097a95dc4184248ddc4e3f5f3513c2082c576a89ab8bcd45edc0abde5c256f2b0215535787662f49d006de39b46e2251ab989914e4b18176730e10ff9be3e WHIRLPOOL 87dd2500ef2c8fd1f510b918892fccfd024653d1c8b113b5765ae4d2312b98445d94ae5215501c312a54548a1f658902cd8d1beeda91ae123d426a06565f9ebe diff --git a/dev-util/cmake/cmake-2.8.6-r5.ebuild b/dev-util/cmake/cmake-2.8.6-r5.ebuild deleted file mode 100644 index b704c8366b7..00000000000 --- a/dev-util/cmake/cmake-2.8.6-r5.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.6 2012/01/04 16:36:22 ranger Exp $ - -EAPI=4 - -CMAKE_REMOVE_MODULES="no" -inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx - -MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="emacs ncurses qt4 vim-syntax" - -DEPEND=" - >=app-arch/libarchive-2.8.0 - >=net-misc/curl-7.20.0-r1[ssl] - >=dev-libs/expat-2.0.1 - dev-util/pkgconfig - sys-libs/zlib - ncurses? ( sys-libs/ncurses ) - qt4? ( x11-libs/qt-gui:4 ) -" -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" - -SITEFILE="50${PN}-gentoo.el" -VIMFILE="${PN}.vim" - -S="${WORKDIR}/${MY_P}" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -# Fixme: -# Boost patchset is foobared and should respect eselect / slotting -PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch - "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch - "${FILESDIR}"/${PN}-2.8.1-libform.patch - "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch - "${FILESDIR}"/${PN}-2.8.6-FindBoost.patch - "${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch - "${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch - "${FILESDIR}"/${PN}-2.8.6-CodeBlocks.patch - "${FILESDIR}"/${PN}-2.8.6-testsvn17.patch -) -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - tc-export CC CXX LD - - ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir test - # this is altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die - - pushd "${CMAKE_BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test - # as it was never intended to be used this way. - "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E BootstrapTest SimpleCOnly_sdcc \ - || die "Tests failed" - - popd > /dev/null -} - -pkg_setup() { - einfo "Fixing java access violations ..." - # bug 387227 - addpredict /proc/self/coredump_filter -} - -src_prepare() { - base_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - # make things work with gentoo java setup - # in case java-config cannot be run, the variable just becomes unset - # per bug #315229 - export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - $(cmake-utils_use_build ncurses CursesDialog) - $(cmake-utils_use_build qt4 QtDialog) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Docs/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - if use emacs; then - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins Docs/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Docs/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${VIMFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el deleted file mode 100644 index e4a1a6d47cb..00000000000 --- a/dev-util/cmake/files/50cmake-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) -(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) -(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) diff --git a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch deleted file mode 100644 index 6ee9b709dff..00000000000 --- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch +++ /dev/null @@ -1,23 +0,0 @@ -Don't use .so for modules on darwin/macos. Use .bundle instead. -Patch by Heiko Przybyl - ---- Modules/Platform/Darwin.cmake -+++ Modules/Platform/Darwin.cmake -@@ -23,7 +23,7 @@ - SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") - SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") - SET(CMAKE_SHARED_MODULE_PREFIX "lib") --SET(CMAKE_SHARED_MODULE_SUFFIX ".so") -+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle") - SET(CMAKE_MODULE_EXISTS 1) - SET(CMAKE_DL_LIBS "") - -@@ -45,7 +45,7 @@ - SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") - SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") - SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") --SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") -+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") - - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch deleted file mode 100644 index 02c3011c8f7..00000000000 --- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://public.kitware.com/Bug/view.php?id=7933 - -diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx ---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 -+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 -@@ -38,6 +38,13 @@ - int main() { return 0; } - #endif - -+#ifdef TEST_KWSYS_LFS_SUPPORT -+#define _LARGE_FILES -+#include <iostream> -+int main() { return 0; } -+#endif -+ -+ - #ifdef TEST_KWSYS_IOS_HAVE_STD - #include <iosfwd> - void f(std ::ostream*) {} -diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap ---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 -+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 -@@ -1005,6 +1005,16 @@ - echo "${cmake_cxx_compiler} does not have stl iterator_traits" - fi - -+if cmake_try_run "${cmake_cxx_compiler}" \ -+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ -+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then -+ KWSYS_LFS_AVAILABLE=1 -+ echo "LFS support available" -+else -+ KWSYS_LFS_AVAILABLE=0 -+ echo "LFS support unavailable, disabled" -+fi -+ - if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch deleted file mode 100644 index ceb205ff586..00000000000 --- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch by Heiko Przybyl - ---- Source/cmComputeLinkInformation.cxx -+++ Source/cmComputeLinkInformation.cxx -@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge - for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); - ri != runtimeDirs.end(); ++ri) - { -+ // Do not add duplicates. -+ // I'd like to have that check already in the list generation code -+ // but that would need lots of more changes, even in ExpandListArgument(). -+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) -+ { -+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; -+ continue; -+ } - // Separate from previous path. - rpath += sep; - sep = this->GetRuntimeSep().c_str(); diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch deleted file mode 100644 index 4ef0c7b4b6f..00000000000 --- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch +++ /dev/null @@ -1,20 +0,0 @@ -The install_name of a library can be compared to the ELF soname, setting -it to just the library name (libx.1.dylib) is not sufficient on Mach-O, -as it uses full paths. Most apps have no clue about that, so they don't -do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html - -Provide a sane default that will allow merging most cmake-based -packages. If this location is not correct, Portage's QA checks will -catch that. - ---- Source/cmTarget.cxx -+++ Source/cmTarget.cxx -@@ -974,7 +974,7 @@ - this->Makefile->IsOn("MINGW")); - - // Setup default property values. -- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); -+ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); - this->SetPropertyDefault("INSTALL_RPATH", ""); - this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); - this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); diff --git a/dev-util/cmake/files/cmake-2.8.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch deleted file mode 100644 index 87c724776e5..00000000000 --- a/dev-util/cmake/files/cmake-2.8.1-libform.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt ---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100 -+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200 -@@ -314,9 +314,6 @@ - ELSE (UNIX) - SET(BUILD_CursesDialog 0) - ENDIF (UNIX) -- IF(BUILD_CursesDialog) -- ADD_SUBDIRECTORY(Source/CursesDialog/form) -- ENDIF(BUILD_CursesDialog) - ENDMACRO (CMAKE_BUILD_UTILITIES) - - -diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt ---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100 -+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200 -@@ -25,13 +25,18 @@ - CursesDialog/ccmake - ) - --INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form -- ${CMake_BINARY_DIR}/Source/CursesDialog/form) - INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) - - - ADD_EXECUTABLE(ccmake ${CURSES_SRCS} ) - TARGET_LINK_LIBRARIES(ccmake CMakeLib) --TARGET_LINK_LIBRARIES(ccmake cmForm) -+TARGET_LINK_LIBRARIES(ccmake form) -+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) -+IF(CURSES_EXTRA_LIBRARY) -+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) -+ENDIF(CURSES_EXTRA_LIBRARY) -+ - - INSTALL_TARGETS(/bin ccmake) -+ -+ -diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h ---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100 -+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200 -@@ -15,8 +15,6 @@ - #define _MSE_INT_H - #endif - --#include <cmFormConfigure.h> -- - #if defined(__hpux) - # define _BOOL_DEFINED - # include <sys/time.h> diff --git a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch deleted file mode 100644 index 38bad925c37..00000000000 --- a/dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch +++ /dev/null @@ -1,109 +0,0 @@ -Set some proper paths to make cmake find our tools. -Original patch by Heiko Przybyl - -The ebuild now adds an extra / at the end of $EPREFIX so that it is -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains -correct) - ---- cmake-2.8.3/Modules/Platform/Darwin.cmake -+++ cmake-2.8.3/Modules/Platform/Darwin.cmake -@@ -217,19 +217,23 @@ - - - --# default to searching for frameworks first --SET(CMAKE_FIND_FRAMEWORK FIRST) -+# default to searching for frameworks last -+SET(CMAKE_FIND_FRAMEWORK LAST) - # set up the default search directories for frameworks - SET(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - /Library/Frameworks - /Network/Library/Frameworks - /System/Library/Frameworks) - --# default to searching for application bundles first --SET(CMAKE_FIND_APPBUNDLE FIRST) -+# default to searching for application bundles last -+SET(CMAKE_FIND_APPBUNDLE LAST) - # set up the default search directories for application bundles - SET(CMAKE_SYSTEM_APPBUNDLE_PATH -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - ~/Applications - /Applications - /Developer/Applications) -diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake ---- cmake-2.8.3/Modules/Platform/UnixPaths.cmake -+++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake -@@ -33,6 +33,7 @@ - # search types. - LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ - /usr/local /usr / - - # CMake install location -@@ -44,43 +45,39 @@ - - # List common include file locations not under the common prefixes. - LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - ) - - LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - /lib /usr/lib /usr/lib32 /usr/lib64 - ) - - LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - diff --git a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch deleted file mode 100644 index 45d2b162c5b..00000000000 --- a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake ---- cmake-2.8.3.orig//Modules/FindRuby.cmake 2010-12-25 16:56:42.597163498 +0100 -+++ cmake-2.8.3//Modules/FindRuby.cmake 2010-12-25 16:57:55.207163499 +0100 -@@ -180,7 +180,7 @@ - - - # Determine the list of possible names for the ruby library --SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT}) -+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT}) - - IF(WIN32) - SET( _RUBY_MSVC_RUNTIME "" ) diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch deleted file mode 100644 index 28d2e4f8790..00000000000 --- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake ---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100 -+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100 -@@ -33,6 +33,8 @@ - ${Python_ADDITIONAL_VERSIONS} - 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - -+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" -+ OUTPUT_VARIABLE _Python_VERSIONS) - FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) diff --git a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch deleted file mode 100644 index 8a8fe6f392a..00000000000 --- a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001 -From: Clinton Stimpson <clinton@elemtech.com> -Date: Wed, 5 Oct 2011 10:02:32 -0600 -Subject: [PATCH] Fix XML safety issue with adding preprocessor defines in CodeBlocks project. - ---- - Source/cmExtraCodeBlocksGenerator.cxx | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx -index 7db91c7..9a0b1ea 100644 ---- a/Source/cmExtraCodeBlocksGenerator.cxx -+++ b/Source/cmExtraCodeBlocksGenerator.cxx -@@ -19,6 +19,7 @@ - #include "cmGeneratedFileStream.h" - #include "cmTarget.h" - #include "cmSystemTools.h" -+#include "cmXMLSafe.h" - - #include <cmsys/SystemTools.hxx> - -@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, - for(std::vector<std::string>::const_iterator di = defs.begin(); - di != defs.end(); ++di) - { -- fout <<" <Add option=\"-D" << di->c_str() << "\" />\n"; -+ cmXMLSafe safedef(di->c_str()); -+ fout <<" <Add option=\"-D" << safedef.str() << "\" />\n"; - } - } - --- -1.7.0 - diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch deleted file mode 100644 index 16b6480f577..00000000000 --- a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake ---- cmake-2.8.6.orig/Modules/FindBLAS.cmake 2011-10-04 18:09:24.000000000 +0200 -+++ cmake-2.8.6/Modules/FindBLAS.cmake 2011-11-22 23:04:17.000000000 +0100 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration for blas is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find BLAS library - # This module finds an installed fortran library that implements the BLAS - # linear-algebra interface (see http://www.netlib.org/blas/). -@@ -39,6 +45,14 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(BLAS blas) -+if(NOT BLAS_FOUND) -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") -+ - include(CheckFunctionExists) - include(CheckFortranFunctionExists) - -@@ -622,3 +636,6 @@ - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(NOT BLAS_FOUND) -+ diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch deleted file mode 100644 index d4d4e946c65..00000000000 --- a/dev-util/cmake/files/cmake-2.8.6-FindBoost.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c7a600899bc3ca186ea1049af80bdc50b0d9ac49 Mon Sep 17 00:00:00 2001 -From: Johannes Huber <johu@gentoo.org> -Date: Fri, 13 Jan 2012 09:29:35 +0100 -Subject: [PATCH] Use eselected version in non exact version find operation. - Fixes gentoo bug - https://bugs.gentoo.org/show_bug.cgi?id=335108. - ---- - Modules/FindBoost.cmake | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 9c03b3d..9ccda31 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -73,6 +73,9 @@ - # binary Boost releases do so. - # - # set(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0") -+ -+# Some future versions to be safe -+set(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48") - # - # ===================================== ============= ======================== - # -@@ -658,9 +661,14 @@ else(_boost_IN_CACHE) - _boost_BOOSTIFIED_VERSION ${_boost_VER}) - endif() - -- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}") -- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}") -- -+ # Rely only on eselected sym link version in gentoo -+ # in case of no exact version version search. -+ # See https://bugs.gentoo.org/show_bug.cgi?id=335108 -+ if( Boost_FIND_VERSION_EXACT ) -+ list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}") -+ list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}") -+ endif( Boost_FIND_VERSION_EXACT ) -+ - endforeach(_boost_VER) - - if(Boost_DEBUG) --- -1.7.8.3 - diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch deleted file mode 100644 index 579a07d880a..00000000000 --- a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:38:48.956933106 +0800 -+++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake 2011-10-09 23:39:52.002144646 +0800 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find LAPACK library - # This module finds an installed fortran library that implements the LAPACK - # linear-algebra interface (see http://www.netlib.org/lapack/). -@@ -36,6 +42,14 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(LAPACK lapack) -+if(NOT LAPACK_FOUND) -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") -+ - set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - - get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) -@@ -304,4 +318,6 @@ - endif(NOT LAPACK_FIND_QUIETLY) - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(NOT LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch deleted file mode 100644 index 77467676c84..00000000000 --- a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in -index 97b2a07..edafb4ef 100644 ---- a/Tests/CTestUpdateSVN.cmake.in -+++ b/Tests/CTestUpdateSVN.cmake.in -@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config) - set(SVNCMD ${SVN} --config-dir ${TOP}/config) - set(SVNUSER --username "test author" --non-interactive) - -+# Configure for this svn version. -+execute_process( -+ COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add -+ ) -+if("${help_add}" MATCHES "--depth") -+ set(depth_empty "--depth=empty") -+else() -+ set(depth_empty "") -+endif() -+ - #----------------------------------------------------------------------------- - # Initialize the testing directory. - message("Creating test directory...") -@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added) - if(dirs_added) - run_child( - WORKING_DIRECTORY ${TOP}/user-source -- COMMAND ${SVNCMD} add ${dirs_added} -+ COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added} - ) - endif(dirs_added) - run_child( diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim deleted file mode 100644 index 5cecd7d05b6..00000000000 --- 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 a23f444b67d..00000000000 --- a/dev-util/cmake/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>kde</herd> -</pkgmetadata> |