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: Sat, 02 Feb 2019 10:36:06
Message-Id: 1549103754.1e5aac8b6bc1c7834aeb9e4904a785e6b2db5df2.polynomial-c@gentoo
1 commit: 1e5aac8b6bc1c7834aeb9e4904a785e6b2db5df2
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 2 10:25:06 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 2 10:35:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5aac8b
7
8 dev-util/cmake: Bump to version 3.13.4
9
10 Package-Manager: Portage-2.3.59, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 +
14 dev-util/cmake/cmake-3.13.4.ebuild | 227 +++++++++++++++++++++++++++++++++++++
15 2 files changed, 228 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index dd62a170783..fa10e64c191 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -3,4 +3,5 @@ DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f68592
22 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
23 DIST cmake-3.13.2.tar.gz 8614687 BLAKE2B 2917116870bf6248865502d093e7974da5e22b053fb7eb1fc93581ee8bc6bdc719f7250619ca5657baff9d5e8e796a62964503b32e199a57e5f44ece25331037 SHA512 da095d483326ed379bfc8fa54e95db3426149ab923479a757149a4aed5c90693c0244bc2c9550cf4b64385f5003ee2060fea1698d989ed13bd0198e718c40903
24 DIST cmake-3.13.3.tar.gz 8616403 BLAKE2B 1c0df89a8cbed3fe94e9fb1491d77b9b87b3ce4d4dad6e90cf7bd3a259ab4839f941f4f52fb8d1cd89711a2f022d72a638a6e907f8d047419508aebe5bd8255d SHA512 3033c434b6880d76a1496c9b1a32835307296a68e4c677acbe09cadb6562088dc9b04fb314d28b4611a1f4ea4d5a1e41c94e7ccf135f21c372a0eadc25aba585
25 +DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
26 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
27
28 diff --git a/dev-util/cmake/cmake-3.13.4.ebuild b/dev-util/cmake/cmake-3.13.4.ebuild
29 new file mode 100644
30 index 00000000000..00a140db85d
31 --- /dev/null
32 +++ b/dev-util/cmake/cmake-3.13.4.ebuild
33 @@ -0,0 +1,227 @@
34 +# Copyright 1999-2019 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +CMAKE_MAKEFILE_GENERATOR="emake"
40 +CMAKE_REMOVE_MODULES="no"
41 +inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
42 +
43 +MY_P="${P/_/-}"
44 +
45 +DESCRIPTION="Cross platform Make"
46 +HOMEPAGE="https://cmake.org/"
47 +SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
48 +
49 +LICENSE="CMake"
50 +SLOT="0"
51 +[[ "${PV}" = *_rc* ]] || \
52 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
53 +IUSE="doc emacs system-jsoncpp ncurses qt5"
54 +
55 +RDEPEND="
56 + app-crypt/rhash
57 + >=app-arch/libarchive-3.0.0:=
58 + >=dev-libs/expat-2.0.1
59 + >=dev-libs/libuv-1.10.0:=
60 + >=net-misc/curl-7.21.5[ssl]
61 + sys-libs/zlib
62 + virtual/pkgconfig
63 + emacs? ( virtual/emacs )
64 + ncurses? ( sys-libs/ncurses:0= )
65 + qt5? (
66 + dev-qt/qtcore:5
67 + dev-qt/qtgui:5
68 + dev-qt/qtwidgets:5
69 + )
70 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
71 +"
72 +DEPEND="${RDEPEND}
73 + doc? (
74 + dev-python/requests
75 + dev-python/sphinx
76 + )
77 +"
78 +
79 +S="${WORKDIR}/${MY_P}"
80 +
81 +SITEFILE="50${PN}-gentoo.el"
82 +
83 +PATCHES=(
84 + # prefix
85 + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
86 + "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
87 + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
88 +
89 + # handle gentoo packaging in find modules
90 + "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
91 + "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
92 + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
93 +
94 + # respect python eclasses
95 + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
96 + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
97 +
98 + # boost (#660980)
99 + "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
100 +
101 + # upstream fixes (can usually be removed with a version bump)
102 +)
103 +
104 +cmake_src_bootstrap() {
105 + # Cleanup args to extract only JOBS.
106 + # Because bootstrap does not know anything else.
107 + grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
108 + if [[ $? -eq 0 ]] ; then
109 + par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
110 + par_arg="--parallel=${par_arg}"
111 + else
112 + par_arg="--parallel=1"
113 + fi
114 +
115 + # disable running of cmake in boostrap command
116 + sed -i \
117 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
118 + bootstrap || die "sed failed"
119 +
120 + # execinfo.h on Solaris isn't quite what it is on Darwin
121 + if [[ ${CHOST} == *-solaris* ]] ; then
122 + sed -i -e 's/execinfo\.h/blablabla.h/' \
123 + Source/kwsys/CMakeLists.txt || die
124 + fi
125 +
126 + tc-export CC CXX LD
127 +
128 + # bootstrap script isn't exactly /bin/sh compatible
129 + ${CONFIG_SHELL:-sh} ./bootstrap \
130 + --prefix="${T}/cmakestrap/" \
131 + ${par_arg} \
132 + || die "Bootstrap failed"
133 +}
134 +
135 +cmake_src_test() {
136 + # fix OutDir and SelectLibraryConfigurations tests
137 + # these are altered thanks to our eclass
138 + sed -i -e 's:#IGNORE ::g' \
139 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
140 + || die
141 +
142 + pushd "${BUILD_DIR}" > /dev/null
143 +
144 + local ctestargs
145 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
146 +
147 + # Excluded tests:
148 + # BootstrapTest: we actualy bootstrap it every time so why test it.
149 + # BundleUtilities: bundle creation broken
150 + # CMakeOnly.AllFindModules: pthread issues
151 + # CTest.updatecvs: which fails to commit as root
152 + # Fortran: requires fortran
153 + # RunCMake.CompilerLauncher: also requires fortran
154 + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
155 + # debugedit binary is not in the expected location
156 + # TestUpload, which requires network access
157 + "${BUILD_DIR}"/bin/ctest \
158 + -j "$(makeopts_jobs)" \
159 + --test-load "$(makeopts_loadavg)" \
160 + ${ctestargs} \
161 + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
162 + || die "Tests failed"
163 +
164 + popd > /dev/null
165 +}
166 +
167 +src_prepare() {
168 + cmake-utils_src_prepare
169 +
170 + # disable Xcode hooks, bug #652134
171 + if [[ ${CHOST} == *-darwin* ]] ; then
172 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
173 + Source/cmGlobalXCodeGenerator.cxx || die
174 + fi
175 +
176 + # Add gcc libs to the default link paths
177 + sed -i \
178 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
179 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
180 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
181 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
182 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
183 + cmake_src_bootstrap
184 + fi
185 +}
186 +
187 +src_configure() {
188 + # Fix linking on Solaris
189 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
190 +
191 + local mycmakeargs=(
192 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
193 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
194 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
195 + -DCMAKE_DOC_DIR=/share/doc/${PF}
196 + -DCMAKE_MAN_DIR=/share/man
197 + -DCMAKE_DATA_DIR=/share/${PN}
198 + -DSPHINX_MAN=$(usex doc)
199 + -DSPHINX_HTML=$(usex doc)
200 + -DBUILD_CursesDialog="$(usex ncurses)"
201 + )
202 +
203 + if use qt5 ; then
204 + mycmakeargs+=(
205 + -DBUILD_QtDialog=ON
206 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
207 + )
208 + fi
209 +
210 + cmake-utils_src_configure
211 +}
212 +
213 +src_compile() {
214 + cmake-utils_src_compile
215 + use emacs && elisp-compile Auxiliary/cmake-mode.el
216 +}
217 +
218 +src_test() {
219 + virtx cmake_src_test
220 +}
221 +
222 +src_install() {
223 + cmake-utils_src_install
224 +
225 + if use emacs; then
226 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
227 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
228 + fi
229 +
230 + insinto /usr/share/vim/vimfiles/syntax
231 + doins Auxiliary/vim/syntax/cmake.vim
232 +
233 + insinto /usr/share/vim/vimfiles/indent
234 + doins Auxiliary/vim/indent/cmake.vim
235 +
236 + insinto /usr/share/vim/vimfiles/ftdetect
237 + doins "${FILESDIR}/${PN}.vim"
238 +
239 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
240 +
241 + rm -r "${ED%/}"/usr/share/cmake/{completions,editors} || die
242 +}
243 +
244 +pkg_postinst() {
245 + use emacs && elisp-site-regen
246 + if use qt5; then
247 + gnome2_icon_cache_update
248 + xdg_desktop_database_update
249 + xdg_mimeinfo_database_update
250 + fi
251 +}
252 +
253 +pkg_postrm() {
254 + use emacs && elisp-site-regen
255 + if use qt5; then
256 + gnome2_icon_cache_update
257 + xdg_desktop_database_update
258 + xdg_mimeinfo_database_update
259 + fi
260 +}