Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/
Date: Fri, 11 Aug 2017 08:38:44
Message-Id: 1502440714.f750ab769f2478c22d8a78bb41dcb8dd9fdbe55d.polynomial-c@gentoo
1 commit: f750ab769f2478c22d8a78bb41dcb8dd9fdbe55d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 11 08:37:37 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 11 08:38:34 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f750ab76
7
8 dev-util/cmake: Bump to version 3.9.1
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 dev-util/cmake/Manifest | 1 +
13 dev-util/cmake/cmake-3.9.1.ebuild | 204 ++++++++++++++++++++++++++++++++++++++
14 2 files changed, 205 insertions(+)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index 2a9f206d924..e3538edc7aa 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -1,3 +1,4 @@
21 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
22 DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f WHIRLPOOL 8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
23 DIST cmake-3.9.0.tar.gz 7691313 SHA256 167701525183dbb722b9ffe69fb525aa2b81798cf12f5ce1c020c93394dfae0f SHA512 151c5531dec2c9d3170d95c06b9cc92d22285555cb9c074837ff2d0d0bee2ea285726323fa11c59d2290b1a9586492571d34e49709e35481478c403bf1ca9c48 WHIRLPOOL f9ac1b90c10c71bd524a107bdf78706cb388e042da9d552ee1f911817d980d0b8ccac082945f6a6bc394ba6cc0fa7c81552f7d4ed51c2ce0dedacf39dd49eded
24 +DIST cmake-3.9.1.tar.gz 7702497 SHA256 d768ee83d217f91bb597b3ca2ac663da7a8603c97e1f1a5184bc01e0ad2b12bb SHA512 3bdc0f08cac8decd37df8043cf8fb436d08d19444353164bad02feda441bbd5efa636836352227255829ae5360b4ef4c952b3a7635dd61f4e86b01dff44e1ac6 WHIRLPOOL 5177e55df43d87adaaf07c2bcb0a561191df0c675834f936d81b8b34497a27701842209f885b708f30be09f0c77b43d98a0d494f719a63ad7344d51f14cabcec
25
26 diff --git a/dev-util/cmake/cmake-3.9.1.ebuild b/dev-util/cmake/cmake-3.9.1.ebuild
27 new file mode 100644
28 index 00000000000..d3f3f5aeaa6
29 --- /dev/null
30 +++ b/dev-util/cmake/cmake-3.9.1.ebuild
31 @@ -0,0 +1,204 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +
37 +CMAKE_MAKEFILE_GENERATOR="emake"
38 +CMAKE_REMOVE_MODULES="no"
39 +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic
40 +
41 +MY_P="${P/_/-}"
42 +
43 +DESCRIPTION="Cross platform Make"
44 +HOMEPAGE="http://www.cmake.org/"
45 +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
46 +
47 +LICENSE="CMake"
48 +SLOT="0"
49 +[[ "${PV}" = *_rc* ]] || \
50 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
51 +IUSE="doc emacs server system-jsoncpp ncurses qt5"
52 +
53 +RDEPEND="
54 + app-crypt/rhash
55 + >=app-arch/libarchive-3.0.0:=
56 + >=dev-libs/expat-2.0.1
57 + >=net-misc/curl-7.21.5[ssl]
58 + sys-libs/zlib
59 + virtual/pkgconfig
60 + emacs? ( virtual/emacs )
61 + ncurses? ( sys-libs/ncurses:0= )
62 + qt5? (
63 + dev-qt/qtcore:5
64 + dev-qt/qtgui:5
65 + dev-qt/qtwidgets:5
66 + )
67 + server? ( >=dev-libs/libuv-1.0.0:= )
68 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
69 +"
70 +DEPEND="${RDEPEND}
71 + doc? ( dev-python/sphinx )
72 +"
73 +
74 +S="${WORKDIR}/${MY_P}"
75 +
76 +SITEFILE="50${PN}-gentoo.el"
77 +
78 +PATCHES=(
79 + # prefix
80 + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
81 + "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
82 + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
83 +
84 + # handle gentoo packaging in find modules
85 + "${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
86 + "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
87 + "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
88 + "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
89 + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
90 +
91 + # respect python eclasses
92 + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
93 + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
94 +
95 + # upstream fixes (can usually be removed with a version bump)
96 +)
97 +
98 +cmake_src_bootstrap() {
99 + # Cleanup args to extract only JOBS.
100 + # Because bootstrap does not know anything else.
101 + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
102 + if [ $? -eq 0 ]; then
103 + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
104 + par_arg="--parallel=${par_arg}"
105 + else
106 + par_arg="--parallel=1"
107 + fi
108 +
109 + # disable running of cmake in boostrap command
110 + sed -i \
111 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
112 + bootstrap || die "sed failed"
113 +
114 + # execinfo.h on Solaris isn't quite what it is on Darwin
115 + if [[ ${CHOST} == *-solaris* ]] ; then
116 + sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
117 + fi
118 +
119 + tc-export CC CXX LD
120 +
121 + # bootstrap script isn't exactly /bin/sh compatible
122 + ${CONFIG_SHELL:-sh} ./bootstrap \
123 + --prefix="${T}/cmakestrap/" \
124 + ${par_arg} \
125 + || die "Bootstrap failed"
126 +}
127 +
128 +cmake_src_test() {
129 + # fix OutDir and SelectLibraryConfigurations tests
130 + # these are altered thanks to our eclass
131 + sed -i -e 's:#IGNORE ::g' \
132 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
133 + || die
134 +
135 + pushd "${BUILD_DIR}" > /dev/null
136 +
137 + local ctestargs
138 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
139 +
140 + # Excluded tests:
141 + # BootstrapTest: we actualy bootstrap it every time so why test it.
142 + # BundleUtilities: bundle creation broken
143 + # CTest.updatecvs: which fails to commit as root
144 + # Fortran: requires fortran
145 + # Qt4Deploy, which tries to break sandbox and ignores prefix
146 + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
147 + # debugedit binary is not in the expected location
148 + # TestUpload, which requires network access
149 + "${BUILD_DIR}"/bin/ctest ${ctestargs} \
150 + -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
151 + || die "Tests failed"
152 +
153 + popd > /dev/null
154 +}
155 +
156 +src_prepare() {
157 + cmake-utils_src_prepare
158 +
159 + # Add gcc libs to the default link paths
160 + sed -i \
161 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
162 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
163 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
164 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
165 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
166 + cmake_src_bootstrap
167 + fi
168 +}
169 +
170 +src_configure() {
171 + # Fix linking on Solaris
172 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
173 +
174 + local mycmakeargs=(
175 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
176 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
177 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
178 + -DCMAKE_DOC_DIR=/share/doc/${PF}
179 + -DCMAKE_MAN_DIR=/share/man
180 + -DCMAKE_DATA_DIR=/share/${PN}
181 + -DSPHINX_MAN=$(usex doc)
182 + -DSPHINX_HTML=$(usex doc)
183 + -DBUILD_CursesDialog="$(usex ncurses)"
184 + -DCMake_ENABLE_SERVER_MODE="$(usex server)"
185 + -DCMAKE_USE_LIBUV="$(usex server)"
186 + )
187 +
188 + if use qt5 ; then
189 + mycmakeargs+=(
190 + -DBUILD_QtDialog=ON
191 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
192 + )
193 + fi
194 +
195 + cmake-utils_src_configure
196 +}
197 +
198 +src_compile() {
199 + cmake-utils_src_compile
200 + use emacs && elisp-compile Auxiliary/cmake-mode.el
201 +}
202 +
203 +src_test() {
204 + virtx cmake_src_test
205 +}
206 +
207 +src_install() {
208 + cmake-utils_src_install
209 +
210 + if use emacs; then
211 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
212 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
213 + fi
214 +
215 + insinto /usr/share/vim/vimfiles/syntax
216 + doins Auxiliary/vim/syntax/cmake.vim
217 +
218 + insinto /usr/share/vim/vimfiles/indent
219 + doins Auxiliary/vim/indent/cmake.vim
220 +
221 + insinto /usr/share/vim/vimfiles/ftdetect
222 + doins "${FILESDIR}/${PN}.vim"
223 +
224 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
225 +
226 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
227 +}
228 +
229 +pkg_postinst() {
230 + use emacs && elisp-site-regen
231 +}
232 +
233 +pkg_postrm() {
234 + use emacs && elisp-site-regen
235 +}