dev-util/cmake: Bump to versions 3.9.6 and 3.10.0_rc5. Removed old.
authorLars Wendler <polynomial-c@gentoo.org>
Mon, 13 Nov 2017 09:40:02 +0000 (10:40 +0100)
committerLars Wendler <polynomial-c@gentoo.org>
Mon, 13 Nov 2017 10:23:09 +0000 (11:23 +0100)
Package-Manager: Portage-2.3.13, Repoman-2.3.4

dev-util/cmake/Manifest
dev-util/cmake/cmake-3.10.0_rc5.ebuild [moved from dev-util/cmake/cmake-3.10.0_rc4.ebuild with 100% similarity]
dev-util/cmake/cmake-3.9.6.ebuild [new file with mode: 0644]

index ecf810a65584def17dcecd00fcac81d7f7922ec4..6d432335db6164a10f9707f4a61b4a9517076428 100644 (file)
@@ -1,5 +1,6 @@
-DIST cmake-3.10.0-rc4.tar.gz 7822506 SHA256 4805df35a6313bd8bbf13d93f6fe9fcd16f54514564ec126d3ed7a359b637619 SHA512 2f584450044a4a2c660c51de075310dff92e51f5e6818c4a853242cb71e73b3e30e00f56e81d6ca75f45a45b09ac38a1523193ec068113e790b8fa30f8e3b1de WHIRLPOOL cdc2434d7a0b1611ce22e2da3ed835dc889a2361f5ce745f0e2edb5e7c45c0409a24ccc187582cb24c15f78133f808218c84ae5667be52fa8917ff18051153fa
+DIST cmake-3.10.0-rc5.tar.gz 7822951 SHA256 7c4322f778d0ac67413de0a3217c1638675d4fceab6564c9b448d617d41aedf6 SHA512 4c94282ac9b135098d741ba66ef91f197839b774784ed17d809fca5a390ee75485eef6d1ef9e37d60f7a41d70ca504d1e01f50175abbfadf6d56d60a2ab1e34b WHIRLPOOL eda59114fd6626d514b90b66c4493da51d5be879f6adb25dce80371b307aba75ffa8c34cb2afa4fd7f7b99a3921ee55feeee645ed0ead8a8587bd054018a4a82
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f WHIRLPOOL 8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
 DIST cmake-3.9.4.tar.gz 7705052 SHA256 b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512 d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5 WHIRLPOOL c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f
 DIST cmake-3.9.5.tar.gz 7705155 SHA256 6220c1683b4e6bb8f38688fa3ffb17a7cf39f36317c2ddfdc3f12f09d086c166 SHA512 71a0848a0c7048c210fe16fbd2b0c2870bd4c2140098225e94fac13a53059f4ae610139115ab8c153989886baa087d506b9ffbc7b91ddc157b0c85e3223828a0 WHIRLPOOL 6d318cf0150d52788a39e33b391e8fc90beeddd3b06087e13e6a317b15c9ee8697648d9b5d35c22330da0ea108fd3855bbfcafd64f434cea51ba5e3ffeb44265
+DIST cmake-3.9.6.tar.gz 7705400 SHA256 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c WHIRLPOOL cfde199ff94de9b080211ad8b474d204a9aee39fd705e05745513ab9e8846bff446227004957a081f741cc03fa1f46c3f2fd6800f332305547cd9c0047281909
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
new file mode 100644 (file)
index 0000000..48cd86d
--- /dev/null
@@ -0,0 +1,214 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs server system-jsoncpp ncurses qt5"
+
+RDEPEND="
+       app-crypt/rhash
+       >=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= )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtwidgets:5
+       )
+       server? ( >=dev-libs/libuv-1.0.0:= )
+       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"
+
+PATCHES=(
+       # prefix
+       "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+       "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+       "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+       # handle gentoo packaging in find modules
+       "${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
+       "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+       "${FILESDIR}"/${PN}-3.8.0_rc2-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.9.0_rc2-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
+
+       # disable running of cmake in boostrap command
+       sed -i \
+               -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+               bootstrap || die "sed failed"
+
+       # 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
+       #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+       #        debugedit binary is not in the expected location
+       #    TestUpload, which requires network access
+       "${BUILD_DIR}"/bin/ctest ${ctestargs} \
+               -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
+               || die "Tests failed"
+
+       popd > /dev/null
+}
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       # 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"
+       if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+               CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+               cmake_src_bootstrap
+       fi
+}
+
+src_configure() {
+       # Fix linking on Solaris
+       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+       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)"
+               -DCMake_ENABLE_SERVER_MODE="$(usex server)"
+               -DCMAKE_USE_LIBUV="$(usex server)"
+       )
+
+       if 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/vim/syntax/cmake.vim
+
+       insinto /usr/share/vim/vimfiles/indent
+       doins Auxiliary/vim/indent/cmake.vim
+
+       insinto /usr/share/vim/vimfiles/ftdetect
+       doins "${FILESDIR}/${PN}.vim"
+
+       dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+       rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+       if use qt5; then
+               gnome2_icon_cache_update
+               xdg_desktop_database_update
+               xdg_mimeinfo_database_update
+       fi
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+       if use qt5; then
+               gnome2_icon_cache_update
+               xdg_desktop_database_update
+               xdg_mimeinfo_database_update
+       fi
+}