From: Michael Palimaka Date: Thu, 9 Apr 2015 17:46:18 +0000 (+0000) Subject: Version bump wrt bug #543700. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ce17012d324e2f659fbc18100c791a50f9251c7;p=gentoo.git Version bump wrt bug #543700. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x06B1F38DCA45A1EC! --- diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 1467bccbf8b2..81b7d0c72d3e 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/cmake # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.302 2015/04/09 17:45:50 kensington Exp $ + +*cmake-3.2.1 (09 Apr 2015) + + 09 Apr 2015; Michael Palimaka +cmake-3.2.1.ebuild: + Version bump wrt bug #543700. *cmake-3.1.0 (16 Jan 2015) diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index cd4ee9033c5f..d1f29d728ab5 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -32,27 +32,30 @@ AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7 DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29 DIST cmake-3.0.2.tar.gz 5490501 SHA256 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e SHA512 de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02 WHIRLPOOL 4c2aa1c72edb700689a8a91bfdfe22977e46a87851d66eb0e187e1e35a1a928be12b477fc39455b877d55420bcb149be6430d6835e01e20f61b84d8d83c752d6 DIST cmake-3.1.0.tar.gz 5955836 SHA256 8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9 SHA512 9e3288c793c01e0ce48af91c618dc7638623010dfb440fb293393d407b7882c181c9a0f4e3b0a14645b556007e69264e94488e832a421b5cfa96338e0808b030 WHIRLPOOL 99df3f9052fee303d02ef9f27ee0ce22a1db57c0963dc7177837dea95a114da7b5d2ea8fd7155df1c7c513dbfb469bba2e638fc84fc1f1a9783fa49cd0e1a061 +DIST cmake-3.2.1.tar.gz 6437801 SHA256 759f1cf6b1a26b037726a9acca6da501235c20ad3671df29d43f29052ef1502c SHA512 b405a81503ff92629a74ec0510d55cb12499ee4c44e83896242119550cb6a53c7eb3ebf3caee913c0a89d284f976d2369e978be3f775bacc0e570a89a217042f WHIRLPOOL 406c86ccad5d3d27d08693f29cab6574015e1da31e83ec119e86679f589845425680e2d253aa902afb322741d72753d397d9360f2a1eb7e66da2ae1e8b7b5df7 EBUILD cmake-2.8.12.2-r1.ebuild 5611 SHA256 7c3ca0c73ed4629f4a0bb138a0773f573123579cc9b1d91a78fe7f0bff653309 SHA512 b859f031eb69ec485486030162ee5f9bcec7df12472a17fff554e6fb8a31e618467972a979e5013c384baaa7c1d4e7515bc33c645dcbe5950d756bcee9b14146 WHIRLPOOL aa3d32ddf65ae0386ea4fb58ea258984e51a380b0e3e58b5a7c300dc871c9c2bbd55bdeea1f7f2d4ce0922be2109a8572585bf59f154ca09f3bc72dbcba4a920 EBUILD cmake-2.8.12.2-r2.ebuild 5702 SHA256 e92cff9b67120db42d8b2b408aa42fe3a59354ad8ec8b0498792529e52fcfeb3 SHA512 a255c33e431a4b427b02ab17a648dfadb7b348de85b9b6a036d6b465f8c77da2536d75f8542581b1e01fae42bff301c128e5f88468f268a162ee64e078e8032d WHIRLPOOL fcb0da2025ad4bce2c1c566ae4e11bd8d646d25ab89c25a4cca84fec196cb1c557dfd665b075de3bb8d57306a5513f4f0200e72831772b5ebefb3e3ec22f78fb EBUILD cmake-2.8.12.2.ebuild 5551 SHA256 589273d08366fd0a979406f3f9f46a8b84764472f2b5e8dad64aa1bd2d574776 SHA512 10a02c2ace51ed3c80a6a65cd2032547c8feee32fd7b45c30d0548926cebf605b61232fbfed2420bee0bf86a8fbd48237e2c15758ac83c18c28c6504944d2e73 WHIRLPOOL 359dae6d17a23382a514b5891cb6df1c867f51fb5952482fb0d5bf504e19ae9342be667ad9c17f89f0478bc2bd9f1ec630da0f831769bfd524c3fba3673d2d52 EBUILD cmake-3.0.2.ebuild 5156 SHA256 6c841ac46ae5769e22ac16b6af6b1cf234266d3d640507cf0379619ed2582649 SHA512 05f7cee174b3373ca62bafbaee1461e84418a4065895c69c5462f667a0236bbd2d90f4f5a4eb624dc24335c1481f689f223b6d8f84be633939840781ef0058fc WHIRLPOOL 1504c0f74e9d463a590338c4eeac5430c011a6f390f0121a88efc8b2cf88033133f86c7c6836faf66a943974898e01aedb34561c98f750341265f57cf7e1ca93 EBUILD cmake-3.1.0.ebuild 5099 SHA256 b8af207aee127c21224279e8bdbf9a5cf62760f74d3e192c50719bfad0e5a63b SHA512 5ae290035da81569ac4019e327881fbe42aeca31f25bb62740f3afef8ef1b5308e66fabb5a9f5c4159d5065112131efc606d85e1e456bddfcaa60344c2543956 WHIRLPOOL 0fb06a7127411a0ced9eb316dc602714c21b80dd560c3234ec43e4e8bfd21da77c7fd972737ab07f5713f99efa60862a68ae1dce48bed7dc949dbb22bad6e88b -MISC ChangeLog 48932 SHA256 2761ef864c475fcb3f8fc0449409d7bfd22d54e0ec4655fe040e9c3dde9abaff SHA512 0771a231a614e3b160c4aaaeffc51bab7d9aad311e6df4d0bd84ef9dbb5c366d2eb6b9f0a4399670e90767800ba9c1cbc1dd0d6edd7a42915f7b1cb769b2b15d WHIRLPOOL 40692d31e697e109fe96d1b217169c4f4ae291cd952ab9fee50d688d0be9c09fa9b4f4a6bb233ad50bb4d8e8157ffa590a0a5d8373f4d7411c6e284b126ae263 +EBUILD cmake-3.2.1.ebuild 5183 SHA256 8b174416f8e82cb9f49cf11e7127d008e0ba1e189b114134e3ebf3e97df6cda8 SHA512 b842a14193c94e4d453bfec2f06ecad41bd87e0d66ee3509a1ad44c26c5fe20e2a4f72524d5f20f062aa7001f110448cd1e3d6dbe11e46764ec265948f952620 WHIRLPOOL fdc583d8011282d2dad783b8e4fb6e1c6bac247f4c222744785b5eec7b3f54d16068b6105ea41724e9bce5af4aa8de95516b8ba232e6e225eda3206a0ce6ce42 +MISC ChangeLog 49076 SHA256 38722218660fe03f1808b3cb8d3f5f04526a80c9e572a95464d1ef724ce11f34 SHA512 e12bac997818705b77c4433f405e139fdb416799f79f522351bc78ea44a8928a031ab87f58c32d945e17a6fd03ae4341382b6c863212295d64a0644d0907929d WHIRLPOOL 4eb99d3e5c8c8e20c46678dfcdad5031afb35073b33f771c1f1d3981576b33c7452a62db998b7d0d85120f4fb95f1bc8489bd12ee9a958c3bd8a94026a09f344 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJUuXYnAAoJEGVpnaTzz9K9b2kP/1YTYhFe5lmZoudnXoI58vQ7 -k9m31phNX5l+m3YzstSBWA/M5UBCuYGjHLFPtk/autsN3dZMBuq0KRQRKI9i/ET2 -QuaXCHnKBtKneyeYigyJ6lwtRZcoYDwG6/c96Zd+s7A/jcz25RtNIAT58bmjs1AS -gn0I7DVYnS/iSY4+EaU9EopE1KZpf6ba9sn7kcfBmuLG3QPm1q5deSs/Lz4IXyWO -/dlDtY2kH2qo8IL5M/dsQQBlXf5ApgNF4mP1lw1EVXOiiybsTGFkFV9ImxhokCBG -HhbShHa2x8yYm0XmKxfTvM8OmPm2JQwWkyhT2oZdyc1OQHG3K4s0/t/c9c7BhMHv -LffRX973QkK6aythOJ/ddLT+BEGp42CePERKeTsC/7u/jeq5RR9fywRuhbUWmzrB -v9cxWluXporqGlPAbOSgeHDIeWe4lHZ1yE+dEz6ibSW4pmB9JZd2R+4hWcuU491y -mg5FJU4ME/KWpPYbtarTqOihcLJ27OqSE1iHjx4b77PAUSypMIXNd7HFKhFJsrtP -+NJXl8riYv5Pjt9rBlfZJ01a+l5vDBkBSkFhwuLzXD5Zc1LBrHGjHv1/Ou8zU6ws -C6pbUXfH6ly3MFumSPR5NmB2nnD+N2GCVJuB7kf/ylArSZ4CxCuZQ98/fkuKqVu9 -49c/nQkziee4NfgHvd89 -=PArd +iQJiBAEBCABMBQJVJrreRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh +7B4REACWVECdOAhjzRR2gKHxVjQvZwcyXTnZS+YUANsrMm7JE8tSWSrXKi+mXr9C +7AB7Yqt14kM8QQR6HMw+OGRHgq0KjHvAA0O1javZKADpaIrfWB9ZxYGbAT/vF3U2 +QiKU6TXCB/sgkKmYztGiITZnhO1Vo/afS0lHmGrHbOPtyW1uVq1fOoArMg2pPSxR +Jw85sN01paJ+korm1x/mm6VhT4B2qzAuIMPeA9ZkZ3glbTbCKOt2hwsBhKoL3ydW +z0qbJVdMPEdDNTlmlnea4NJa4lSGfx4n53IzF1xZaVrgs8SN1NDXb3JVih+PzgjP +QmdIQmUGEL1sLXU4loBqHz+zF9BBnOzdxOSmxjlJWUjojSAfaT1KSFfOJPVxDRO+ +8qd8ZrjGsBh2n2UGFntxZ1jW8ZYQQPH0yCxiEoi2nlmJ6wZFFLc3gZ8R5t2ABJuc +yF28oN6r53ROawZQSqjH+IOCh5DKkamolFjS9NG5soL+nPlQ/m2PWr9EzeN9vWEa +JfV2mPs2dkjJ6jllamxiRBIlzFN+gMlwSqxCZlg4TaydxSKP5oZhhmuNt5ePYzUf +2HsItem58y4wuPcH9dI5rcA4zTP4RBkASY7tDR7AsYtYv36GoT5ddB4eVm6DdqUX +xjVm5DNTH1oNV0rJeLGSWvKhMS/opy+AWC5mXGDmJnmxEFzn8w== +=/zk4 -----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-3.2.1.ebuild b/dev-util/cmake/cmake-3.2.1.ebuild new file mode 100644 index 000000000000..f5d5a54265f1 --- /dev/null +++ b/dev-util/cmake/cmake-3.2.1.ebuild @@ -0,0 +1,192 @@ +# 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.2.1.ebuild,v 1.1 2015/04/09 17:45:50 kensington 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="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~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 + >=dev-libs/jsoncpp-0.6.0_rc2 + >=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=( + # 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 +) + +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_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 +}