diff options
| -rw-r--r-- | dev-util/cmake/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-3.3.1-r1.ebuild | 195 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 |
3 files changed, 0 insertions, 220 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 3abe160689ce..4db2d571dab5 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,5 +1,3 @@ -DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f -DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84 DIST cmake-3.6.3.tar.gz 6919949 SHA256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48 WHIRLPOOL ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a DIST cmake-3.7.1.tar.gz 7361172 SHA256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 SHA512 0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629 WHIRLPOOL 8b632b4a3f44a7b56952926ad43db45ecd9f26f434816fe29a52c89542edfc2dfea72f4ec814d4faaf990ee535ad80e6238ba2e6d9ffa2ff94cfccd665b1d930 diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild deleted file mode 100644 index e3aeb007c432..000000000000 --- a/dev-util/cmake/cmake-3.3.1-r1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -MY_P="${P/_/-}" - -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 - http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" - -LICENSE="CMake" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt5" - -RDEPEND=" - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch - - # upstream fixes (can usually be removed with a version bump) - "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -rf "${D}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch deleted file mode 100644 index 9cb4777cc9ba..000000000000 --- 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 |