From 52489d3205ed800c58b412f36e678d35b16faa2a Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Mon, 11 Jul 2011 16:50:44 +0000 Subject: Version bump to 2.8.5. Recompiled everything using cmake and all tests pass. Fixes bug #374665. Tests needs to state some deps like cvs/git/... Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64 --- dev-util/cmake/ChangeLog | 8 +- dev-util/cmake/Manifest | 10 ++- dev-util/cmake/cmake-2.8.5.ebuild | 161 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 dev-util/cmake/cmake-2.8.5.ebuild (limited to 'dev-util/cmake') diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index f2d517a4c9de..b90040d0ce31 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.168 2011/05/08 11:33:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.169 2011/07/11 16:50:44 scarabeus Exp $ + +*cmake-2.8.5 (11 Jul 2011) + + 11 Jul 2011; Tomáš Chvátal +cmake-2.8.5.ebuild: + Version bump to 2.8.5. Recompiled everything using cmake and all tests pass. + Fixes bug #374665. Tests needs to state some deps like cvs/git/... 08 May 2011; Tomáš Chvátal -files/cmake-2.6.0-interix.patch, -files/cmake-2.6.4-FindBoost.patch, diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 34d37dee58e8..b4d83950b1b4 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -16,13 +16,15 @@ AUX cmake-2.8.4-FindPythonLibs.patch 642 RMD160 b116a8f6d4dfd722943a88b1998bfd19 AUX cmake-2.8.4-FindQt4.patch 10926 RMD160 15da9e13df5a98f9171a263c0c9d23f45707b494 SHA1 a7f1c589b115f6e5f9abfeb589cb07095510b1f4 SHA256 0aaa6b6a8fa4fdf3aea8efeaa831a3443e60a5a453cd7b71207e57980bce5564 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 DIST cmake-2.8.4.tar.gz 5477628 RMD160 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893 SHA1 6c42699bd63fdfcc7743d4906e3208d051d7f19b SHA256 d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc +DIST cmake-2.8.5.tar.gz 5517977 RMD160 e4767dc0ea3e53da3ab14cc6af5d42dd190eda76 SHA1 8dd4c31cbccf1a297829a476a0ef79d1614ca368 SHA256 5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91 EBUILD cmake-2.8.4-r1.ebuild 4482 RMD160 b6f72007be31ac46f161a62f5f441accf570867d SHA1 696b930343d5b7bc86a7fb99d246b84dc4ab071c SHA256 a36a4e018e644811e6c70f4cefaaa0ad1976533be3aa4e780050a16e00a63177 -MISC ChangeLog 26455 RMD160 e666c82a0456327662480d10c04d9e6e73ae4d01 SHA1 2ad98d4c1dc40f448b6c12b2f7ea48e3a0294c93 SHA256 f9c2a48a60632adcfa125705c691eaf735e2eb52a99ff19eabb6c8ce7ceba52a +EBUILD cmake-2.8.5.ebuild 4527 RMD160 159dc6f53796df51beb4437d20a5850d94fd912c SHA1 0aa97d230493c83dd9d75d2a190b886f7969bb62 SHA256 4981debea3c822cf784d853995f02fd526363daae7ccce74290c47db40e150e2 +MISC ChangeLog 26708 RMD160 cc02cc328d2a4a7ca07844d8a76ae0d42f01f683 SHA1 214ff1d6e06801f41868ca0b3ac7e843ab56d2f8 SHA256 02665d4f16a48726a26ce35966384e0c77e465ea55d35dafce4442492d018738 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3Gf40ACgkQHB6c3gNBRYdIUgCgh2LWoLYVMtYeyqr/LFeGFn0a -Z4gAn13nPfL4y8zdAABY0C1A+ByMfcQr -=HgK6 +iEYEARECAAYFAk4bKdYACgkQHB6c3gNBRYfnOQCgtNbPMb96HDYLhDaqCo0u+J5U +1ZIAniT6nz4rqtMNGrFYXIILPUfQkLNc +=Tlg1 -----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.8.5.ebuild b/dev-util/cmake/cmake-2.8.5.ebuild new file mode 100644 index 000000000000..d628d8d26ab8 --- /dev/null +++ b/dev-util/cmake/cmake-2.8.5.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.5.ebuild,v 1.1 2011/07/11 16:50:44 scarabeus Exp $ + +EAPI=4 + +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 + 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.4-FindPythonInterp.patch + "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch + "${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch + "${FILESDIR}"/${PN}-2.8.4-FindBoost.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 + # 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 \ + -E BootstrapTest SimpleCOnly_sdcc \ + || die "Tests failed" + popd > /dev/null +} + +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 +} -- cgit v1.2.3-65-gdbad