From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rlgr3-0005su-Ti for garchives@archives.gentoo.org; Fri, 13 Jan 2012 13:07:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A6FFE05ED; Fri, 13 Jan 2012 13:07:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F1678E05ED for ; Fri, 13 Jan 2012 13:07:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A0441B4033 for ; Fri, 13 Jan 2012 13:07:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 86DAC80044 for ; Fri, 13 Jan 2012 13:07:28 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.7.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: cf4fc467cf5b48b8e9c226d3a4798900d8fa14b9 Date: Fri, 13 Jan 2012 13:07:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 82e34b7b-5736-40e0-a993-7d8aefd1f32d X-Archives-Hash: b525729a04a68a2c2fab9c0b17d6e6bc commit: cf4fc467cf5b48b8e9c226d3a4798900d8fa14b9 Author: Johannes Huber gentoo org> AuthorDate: Fri Jan 13 12:58:55 2012 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Jan 13 12:58:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dcf4fc467 [dev-util/cmake] Version bump 2.8.7. (Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commi= t) --- dev-util/cmake/cmake-2.8.7.ebuild | 175 +++++++++++++++++++++++++++++++= ++++++ 1 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.7.ebuild b/dev-util/cmake/cmake-2.8= .7.ebuild new file mode 100644 index 0000000..43b68db --- /dev/null +++ b/dev-util/cmake/cmake-2.8.7.ebuild @@ -0,0 +1,175 @@ +# 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=3D4 + +CMAKE_REMOVE_MODULES=3D"no" +inherit elisp-common toolchain-funcs eutils versionator flag-o-matic bas= e cmake-utils virtualx + +MY_P=3D"${PN}-$(replace_version_separator 3 - ${MY_PV})" + +DESCRIPTION=3D"Cross platform Make" +HOMEPAGE=3D"http://www.cmake.org/" +SRC_URI=3D"http://www.cmake.org/files/v$(get_version_component_range 1-2= )/${MY_P}.tar.gz" + +LICENSE=3D"CMake" +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~= sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-inte= rix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solar= is ~x64-solaris ~x86-solaris" +SLOT=3D"0" +IUSE=3D"emacs ncurses qt4 vim-syntax" + +DEPEND=3D" + >=3Dapp-arch/libarchive-2.8.0 + >=3Dnet-misc/curl-7.20.0-r1[ssl] + >=3Ddev-libs/expat-2.0.1 + dev-util/pkgconfig + sys-libs/zlib + ncurses? ( sys-libs/ncurses ) + qt4? ( x11-libs/qt-gui:4 ) +" +RDEPEND=3D"${DEPEND} + emacs? ( virtual/emacs ) + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + ) +" + +SITEFILE=3D"50${PN}-gentoo.el" +VIMFILE=3D"${PN}.vim" + +S=3D"${WORKDIR}/${MY_P}" + +CMAKE_BINARY=3D"${S}/Bootstrap.cmk/cmake" + +# Fixme: +# Boost patchset is foobared and should respect eselect / slotting +PATCHES=3D( + "${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.6-FindBoost.patch + "${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch + "${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch +) +cmake_src_bootstrap() { + # Cleanup args to extract only JOBS. + # Because bootstrap does not know anything else. + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=3D?|[[:space:]]*)[[:digit:= ]]+' > /dev/null + if [ $? -eq 0 ]; then + par_arg=3D$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=3D?|[[:space:= ]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+') + par_arg=3D"--parallel=3D${par_arg}" + else + par_arg=3D"--parallel=3D1" + fi + + tc-export CC CXX LD + + ./bootstrap \ + --prefix=3D"${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=3D"--extra-verbose --output-on-fa= ilure" + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the tes= t + # 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=3D$(java-config -g JAVA_HOME 2> /dev/null) + + local mycmakeargs=3D( + -DCMAKE_USE_SYSTEM_LIBRARIES=3DON + -DCMAKE_INSTALL_PREFIX=3D"${EPREFIX}"/usr + -DCMAKE_DOC_DIR=3D/share/doc/${PF} + -DCMAKE_MAN_DIR=3D/share/man + -DCMAKE_DATA_DIR=3D/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=3D"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 +}