commit:     c250ad2e0fda4d2b765f8e95305fecba38562775
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 10:40:09 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 10:40:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c250ad2e

dev-util/cmake: Bump to version 3.6.1

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-util/cmake/Manifest           |   1 +
 dev-util/cmake/cmake-3.6.1.ebuild | 198 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 36997d8..c98de30 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -4,3 +4,4 @@ DIST 
cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e
 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.0.tar.gz 6897636 SHA256 
fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 SHA512 
4e519fa30a6fee2fb0ef8df667504dfaba1f965c263fd4f42d17348c45cff33777de9a8c552b13da0bb4b9f1300a142f204a844eac03bdf431e826e8d7ba3505
 WHIRLPOOL 
4d2842efa7ae6bdfe5d1e0b773f8649a6dec7d23364f89570d442db2f4da033acd0023dd5cf80004a024b5c1ec142db284357a21c993bc84d0a07d8e0fb76c77
+DIST cmake-3.6.1.tar.gz 6895262 SHA256 
28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58aaef11 SHA512 
69f20df70c58f7a09da7511a92a1e4492d89fecf30b11744aaf29a129f62384ff57ed7ed2d9dbb8b102abdc72d5722e744583161cb0ae71a01423473f36c8b1d
 WHIRLPOOL 
82853de51dff610a769700f1063aecb83b7cb02308e7c05e0726b8a068cb3adbe764f717b8649709d629b28dcd38f38b2b53bc4bc0ba13657aeb7969dd7d758b

diff --git a/dev-util/cmake/cmake-3.6.1.ebuild 
b/dev-util/cmake/cmake-3.6.1.ebuild
new file mode 100644
index 0000000..315190d
--- /dev/null
+++ b/dev-util/cmake/cmake-3.6.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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"
+
+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 qt4 qt5"
+
+RDEPEND="
+       >=app-arch/libarchive-3.0.0:=
+       >=dev-libs/expat-2.0.1
+       >=net-misc/curl-7.21.5[ssl]
+       sys-libs/zlib
+       virtual/pkgconfig
+       emacs? ( virtual/emacs )
+       ncurses? ( sys-libs/ncurses:0= )
+       qt4? (
+               dev-qt/qtcore:4
+               dev-qt/qtgui:4
+       )
+       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}-3.4.0_rc1-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
+       "${FILESDIR}"/${PN}-3.5.2-FindQt4.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)
+)
+
+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)
+               -DBUILD_CursesDialog="$(usex ncurses)"
+       )
+
+       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 Auxiliary/cmake-mode.el
+}
+
+src_test() {
+       virtx cmake_src_test
+}
+
+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 "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}

Reply via email to