johu 15/01/16 20:35:46 Modified: ChangeLog Added: cmake-3.1.0.ebuild Log: Version bump by Eugene Shalygin <eugene.shaly...@gmail.com>, bug #535928. Builds again with doc use flag, bug #535768. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Revision Changes Path 1.301 dev-util/cmake/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.301&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.301&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.300&r2=1.301 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- ChangeLog 26 Sep 2014 21:07:08 -0000 1.300 +++ ChangeLog 16 Jan 2015 20:35:46 -0000 1.301 @@ -1,6 +1,14 @@ # ChangeLog for dev-util/cmake -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.300 2014/09/26 21:07:08 mattst88 Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.301 2015/01/16 20:35:46 johu Exp $ + +*cmake-3.1.0 (16 Jan 2015) + + 16 Jan 2015; Johannes Huber <j...@gentoo.org> +cmake-3.1.0.ebuild, + +files/cmake-3.1.0-FindPythonInterp.patch, + +files/cmake-3.1.0-darwin-isysroot.patch: + Version bump by Eugene Shalygin <eugene.shaly...@gmail.com>, bug #535928. + Builds again with doc use flag, bug #535768. 26 Sep 2014; Matt Turner <matts...@gentoo.org> cmake-2.8.12.2-r1.ebuild: alpha stable, bug 517016. 1.1 dev-util/cmake/cmake-3.1.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.1.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/cmake-3.1.0.ebuild?rev=1.1&content-type=text/plain Index: cmake-3.1.0.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.1.0.ebuild,v 1.1 2015/01/16 20:35:46 johu Exp $ EAPI=5 CMAKE_REMOVE_MODULES="no" inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx DESCRIPTION="Cross platform Make" HOMEPAGE="http://www.cmake.org/"; SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${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 ncurses qt4 qt5" REQUIRED_USE="?? ( qt4 qt5 )" RDEPEND=" >=app-arch/libarchive-2.8.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 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) " DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) " SITEFILE="50${PN}-gentoo.el" CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" PATCHES=( "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch "${FILESDIR}"/${PN}-2.8.10-libform.patch "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch "${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.0-prefix-dirs.patch "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.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. # CTest.updatecvs, which fails to commit as root # Qt4Deploy, which tries to break sandbox and ignores prefix # TestUpload, which requires network access "${BUILD_DIR}"/bin/ctest ${ctestargs} \ -E "(BootstrapTest|CTest.UpdateCVS|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_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 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() { 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 }
