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