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: Thu, 05 Mar 2020 08:53:29
Message-Id: 1583398398.62efe9f2c6ca27b67f501b25d10559882a2e6eda.polynomial-c@gentoo
1 commit: 62efe9f2c6ca27b67f501b25d10559882a2e6eda
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 5 08:53:18 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 5 08:53:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62efe9f2
7
8 dev-util/cmake: Bump to version 3.16.5
9
10 Package-Manager: Portage-2.3.92, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 +
14 dev-util/cmake/cmake-3.16.5.ebuild | 216 +++++++++++++++++++++++++++++++++++++
15 2 files changed, 217 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 62a255a3062..d04cd650114 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -1,4 +1,5 @@
22 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
23 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
24 DIST cmake-3.16.4.tar.gz 9113021 BLAKE2B 5aa34cadec4ed09e4d0c46f6983b88cf81ea719c47a0848a21be36911b223d9e609bdc7f5b52086762ab83e4230a3ec9e38d9c9e3c9c6f508aa2118e769e3783 SHA512 4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
25 +DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
26 DIST cmake-3.17.0-rc2.tar.gz 9461449 BLAKE2B 46213fb52ea2b40921d788dba1efa53d6fec2e463510dfdaebaca041121ffc418ce32a37f5851d12865b830c936e2ceab92fe2274e73ff3a107ff6a585d16f27 SHA512 c91040930a22c0b773ba3edaae6614fdae371214ed3eb44f124521a3201c5fdd0b67b170c46fc9d7b00fe053dbf2a7b7e9d984fde5ecf355eb18a2b5d38f8bb4
27
28 diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.16.5.ebuild
29 new file mode 100644
30 index 00000000000..5b1f3688d59
31 --- /dev/null
32 +++ b/dev-util/cmake/cmake-3.16.5.ebuild
33 @@ -0,0 +1,216 @@
34 +# Copyright 1999-2020 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +
39 +CMAKE_MAKEFILE_GENERATOR="emake"
40 +CMAKE_REMOVE_MODULES_LIST=( none )
41 +inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
42 + toolchain-funcs virtualx xdg cmake
43 +
44 +MY_P="${P/_/-}"
45 +
46 +DESCRIPTION="Cross platform Make"
47 +HOMEPAGE="https://cmake.org/"
48 +SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
49 +
50 +LICENSE="CMake"
51 +SLOT="0"
52 +[[ "${PV}" = *_rc* ]] || \
53 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
54 +IUSE="doc emacs ncurses qt5 test"
55 +RESTRICT="!test? ( test )"
56 +
57 +RDEPEND="
58 + app-crypt/rhash
59 + >=app-arch/libarchive-3.0.0:=
60 + >=dev-libs/expat-2.0.1
61 + >=dev-libs/jsoncpp-1.9.2-r2:0=
62 + >=dev-libs/libuv-1.10.0:=
63 + >=net-misc/curl-7.21.5[ssl]
64 + sys-libs/zlib
65 + virtual/pkgconfig
66 + emacs? ( >=app-editors/emacs-23.1:* )
67 + ncurses? ( sys-libs/ncurses:0= )
68 + qt5? (
69 + dev-qt/qtcore:5
70 + dev-qt/qtgui:5
71 + dev-qt/qtwidgets:5
72 + )
73 +"
74 +DEPEND="${RDEPEND}"
75 +BDEPEND="
76 + doc? (
77 + dev-python/requests
78 + dev-python/sphinx
79 + )
80 +"
81 +
82 +S="${WORKDIR}/${MY_P}"
83 +
84 +SITEFILE="50${PN}-gentoo.el"
85 +
86 +PATCHES=(
87 + # prefix
88 + "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
89 + "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
90 + # Next patch requires new work from prefix people
91 + #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
92 +
93 + # handle gentoo packaging in find modules
94 + "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
95 + "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
96 + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
97 +
98 + # respect python eclasses
99 + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
100 + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
101 +
102 + # upstream fixes (can usually be removed with a version bump)
103 +)
104 +
105 +cmake_src_bootstrap() {
106 + # disable running of cmake in boostrap command
107 + sed -i \
108 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
109 + bootstrap || die "sed failed"
110 +
111 + # execinfo.h on Solaris isn't quite what it is on Darwin
112 + if [[ ${CHOST} == *-solaris* ]] ; then
113 + sed -i -e 's/execinfo\.h/blablabla.h/' \
114 + Source/kwsys/CMakeLists.txt || die
115 + fi
116 +
117 + tc-export CC CXX LD
118 +
119 + # bootstrap script isn't exactly /bin/sh compatible
120 + ${CONFIG_SHELL:-sh} ./bootstrap \
121 + --prefix="${T}/cmakestrap/" \
122 + --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
123 + || die "Bootstrap failed"
124 +}
125 +
126 +cmake_src_test() {
127 + # fix OutDir and SelectLibraryConfigurations tests
128 + # these are altered thanks to our eclass
129 + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
130 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
131 + || die
132 +
133 + pushd "${BUILD_DIR}" > /dev/null
134 +
135 + local ctestargs
136 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
137 +
138 + # Excluded tests:
139 + # BootstrapTest: we actualy bootstrap it every time so why test it.
140 + # BundleUtilities: bundle creation broken
141 + # CMakeOnly.AllFindModules: pthread issues
142 + # CTest.updatecvs: which fails to commit as root
143 + # Fortran: requires fortran
144 + # RunCMake.CompilerLauncher: also requires fortran
145 + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
146 + # debugedit binary is not in the expected location
147 + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
148 + # it can't find a deb package that owns libc
149 + # TestUpload, which requires network access
150 + "${BUILD_DIR}"/bin/ctest \
151 + -j "$(makeopts_jobs)" \
152 + --test-load "$(makeopts_loadavg)" \
153 + ${ctestargs} \
154 + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
155 + || die "Tests failed"
156 +
157 + popd > /dev/null
158 +}
159 +
160 +src_prepare() {
161 + cmake_src_prepare
162 +
163 + # disable Xcode hooks, bug #652134
164 + if [[ ${CHOST} == *-darwin* ]] ; then
165 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
166 + Source/cmGlobalXCodeGenerator.cxx || die
167 + fi
168 +
169 + # Add gcc libs to the default link paths
170 + sed -i \
171 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
172 + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
173 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
174 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
175 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
176 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
177 + cmake_src_bootstrap
178 + fi
179 +}
180 +
181 +src_configure() {
182 + # Fix linking on Solaris
183 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
184 +
185 + local mycmakeargs=(
186 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
187 + -DCMAKE_DOC_DIR=/share/doc/${PF}
188 + -DCMAKE_MAN_DIR=/share/man
189 + -DCMAKE_DATA_DIR=/share/${PN}
190 + -DSPHINX_MAN=$(usex doc)
191 + -DSPHINX_HTML=$(usex doc)
192 + -DBUILD_CursesDialog="$(usex ncurses)"
193 + -DBUILD_TESTING=$(usex test)
194 + )
195 +
196 + if use qt5 ; then
197 + mycmakeargs+=(
198 + -DBUILD_QtDialog=ON
199 + $(cmake_use_find_package qt5 Qt5Widgets)
200 + )
201 + fi
202 +
203 + cmake_src_configure
204 +}
205 +
206 +src_compile() {
207 + cmake_src_compile
208 + use emacs && elisp-compile Auxiliary/cmake-mode.el
209 +}
210 +
211 +src_test() {
212 + virtx cmake_src_test
213 +}
214 +
215 +src_install() {
216 + cmake_src_install
217 +
218 + if use emacs; then
219 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
220 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
221 + fi
222 +
223 + insinto /usr/share/vim/vimfiles/syntax
224 + doins Auxiliary/vim/syntax/cmake.vim
225 +
226 + insinto /usr/share/vim/vimfiles/indent
227 + doins Auxiliary/vim/indent/cmake.vim
228 +
229 + insinto /usr/share/vim/vimfiles/ftdetect
230 + doins "${FILESDIR}/${PN}.vim"
231 +
232 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
233 +
234 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
235 +}
236 +
237 +pkg_preinst() {
238 + use qt5 && xdg_pkg_preinst
239 +}
240 +
241 +pkg_postinst() {
242 + use emacs && elisp-site-regen
243 + use qt5 && xdg_pkg_postinst
244 +}
245 +
246 +pkg_postrm() {
247 + use emacs && elisp-site-regen
248 + use qt5 && xdg_pkg_postrm
249 +}