commit:     1e6cc58cebb9398f183cbe1d139074f74906ef8e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 08:31:21 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 08:31:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6cc58c

dev-util/cmake: Bump to version 3.17.1

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-util/cmake/Manifest            |   1 +
 dev-util/cmake/cmake-3.17.1.ebuild | 216 +++++++++++++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d35dd20e5d8..ee55bc52ea8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,3 +2,4 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 
765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 
257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99
 SHA512 
8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 
5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876
 SHA512 
204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 DIST cmake-3.17.0.tar.gz 9466484 BLAKE2B 
63dc59a9551d6afcf009403bcc68f3bb87065f962c39f443d9a73c7babbb2e49b4237d00072d2ff4f91a6cd4c9d5ac05cd9b97acd0404c852fe03133b538f2ea
 SHA512 
f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a
+DIST cmake-3.17.1.tar.gz 9467298 BLAKE2B 
16982bf8236568430b0b68608c4eb062e4d550a914bca59113e6f288f069681361ab88b695b91a4e62600042c542db658b209b0744e68966bb36ad18ae37a9ff
 SHA512 
457f4f43a32cc8d966939158f2cc09768b93733426aeb9b6da71313ec060f958399d098af363c3c7f18752998347e05073a399de736e5ca0804ec2bba2cee7ac

diff --git a/dev-util/cmake/cmake-3.17.1.ebuild 
b/dev-util/cmake/cmake-3.17.1.ebuild
new file mode 100644
index 00000000000..a6e3aed2b30
--- /dev/null
+++ b/dev-util/cmake/cmake-3.17.1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
+       toolchain-funcs virtualx xdg cmake
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/";
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       app-crypt/rhash
+       >=app-arch/libarchive-3.0.0:=
+       >=dev-libs/expat-2.0.1
+       >=dev-libs/jsoncpp-1.9.2-r2:0=
+       >=dev-libs/libuv-1.10.0:=
+       >=net-misc/curl-7.21.5[ssl]
+       sys-libs/zlib
+       virtual/pkgconfig
+       emacs? ( >=app-editors/emacs-23.1:* )
+       ncurses? ( sys-libs/ncurses:0= )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtwidgets:5
+       )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       doc? (
+               dev-python/requests
+               dev-python/sphinx
+       )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+       # prefix
+       "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+       "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+       # Next patch requires new work from prefix people
+       #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+       # handle gentoo packaging in find modules
+       "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+       "${FILESDIR}"/${PN}-3.17.0_rc1-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() {
+       # 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/" \
+               --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+               || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+       # fix OutDir and SelectLibraryConfigurations tests
+       # these are altered thanks to our eclass
+       sed -i -e 's:^#_cmake_modify_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
+       #    CMakeOnly.AllFindModules: pthread issues
+       #    CTest.updatecvs: which fails to commit as root
+       #    Fortran: requires fortran
+       #    RunCMake.CompilerLauncher: also requires fortran
+       #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+       #        debugedit binary is not in the expected location
+       #    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+       #        it can't find a deb package that owns libc
+       #    TestUpload, which requires network access
+       "${BUILD_DIR}"/bin/ctest \
+               -j "$(makeopts_jobs)" \
+               --test-load "$(makeopts_loadavg)" \
+               ${ctestargs} \
+               -E 
"(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)"
 \
+               || die "Tests failed"
+
+       popd > /dev/null
+}
+
+src_prepare() {
+       cmake_src_prepare
+
+       # disable Xcode hooks, bug #652134
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+                       Source/cmGlobalXCodeGenerator.cxx || die
+       fi
+
+       # Add gcc libs to the default link paths
+       sed -i \
+               -e 
"s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+               -e "$(usex prefix-guest "s|@GENTOO_HOST@||" 
"/@GENTOO_HOST@/d")" \
+               -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_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)"
+               -DBUILD_TESTING=$(usex test)
+       )
+
+       if use qt5 ; then
+               mycmakeargs+=(
+                       -DBUILD_QtDialog=ON
+                       $(cmake_use_find_package qt5 Qt5Widgets)
+               )
+       fi
+
+       cmake_src_configure
+}
+
+src_compile() {
+       cmake_src_compile
+       use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+       virtx cmake_src_test
+}
+
+src_install() {
+       cmake_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_preinst() {
+       use qt5 && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+       use qt5 && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+       use qt5 && xdg_pkg_postrm
+}

Reply via email to