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 Mar 2019 10:26:33
Message-Id: 1553941582.d36c6ab1d3c3fbd6411aa63fee65ec366b68018a.polynomial-c@gentoo
1 commit: d36c6ab1d3c3fbd6411aa63fee65ec366b68018a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 30 09:38:21 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 30 10:26:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36c6ab1
7
8 dev-util/cmake: Bump to version 3.14.1
9
10 Package-Manager: Portage-2.3.62, 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.14.1.ebuild | 229 +++++++++++++++++++++++++++++++++++++
15 2 files changed, 230 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 1fdf6e0ec29..29ccb6090e5 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.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
24 DIST cmake-3.14.0.tar.gz 8846626 BLAKE2B 1bedae3909880c71bba6cc91459a58daf98287ba76c527669d227f0540283f3902d99fca2f6db2d0bde271ee274f7ce6612da2bcead611a00319996e382b0674 SHA512 a3b47f2b8d3436860e8cc06a8c0288124289560853d24f68dfbb49a2ff3f861ee385463376ad1dafa6d4a618c06d2e9049b20fcac1d2c147b29bb93479a8d400
25 +DIST cmake-3.14.1.tar.gz 8849712 BLAKE2B a4f917507a7ba354889606f17b9ce2c37e69d80a4ee86e75f23e214c9db11bd7947f8abc879a23c7fe76bdda32ab49360eb53f00eb1c4c4e74a8f80a7221d41d SHA512 2f0c0fb1559f71c5c2bf1a77f6fb2ecdaf078e47b5ab8ce997c6877f5d165619bc7a101b1566a8a40f8883ffef6ee690f93f2652855825019ec153aa4543ffb5
26 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
27
28 diff --git a/dev-util/cmake/cmake-3.14.1.ebuild b/dev-util/cmake/cmake-3.14.1.ebuild
29 new file mode 100644
30 index 00000000000..ce96349c214
31 --- /dev/null
32 +++ b/dev-util/cmake/cmake-3.14.1.ebuild
33 @@ -0,0 +1,229 @@
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.14.0_rc3-prefix-dirs.patch
87 + # Next patch requires new work from prefix people
88 + #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
89 +
90 + # handle gentoo packaging in find modules
91 + "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
92 + "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
93 + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
94 +
95 + # respect python eclasses
96 + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
97 + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
98 +
99 + # boost (#660980)
100 + "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
101 +
102 + # upstream fixes (can usually be removed with a version bump)
103 +)
104 +
105 +cmake_src_bootstrap() {
106 + # Cleanup args to extract only JOBS.
107 + # Because bootstrap does not know anything else.
108 + grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
109 + if [[ $? -eq 0 ]] ; then
110 + par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
111 + par_arg="--parallel=${par_arg}"
112 + else
113 + par_arg="--parallel=1"
114 + fi
115 +
116 + # disable running of cmake in boostrap command
117 + sed -i \
118 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
119 + bootstrap || die "sed failed"
120 +
121 + # execinfo.h on Solaris isn't quite what it is on Darwin
122 + if [[ ${CHOST} == *-solaris* ]] ; then
123 + sed -i -e 's/execinfo\.h/blablabla.h/' \
124 + Source/kwsys/CMakeLists.txt || die
125 + fi
126 +
127 + tc-export CC CXX LD
128 +
129 + # bootstrap script isn't exactly /bin/sh compatible
130 + ${CONFIG_SHELL:-sh} ./bootstrap \
131 + --prefix="${T}/cmakestrap/" \
132 + ${par_arg} \
133 + || die "Bootstrap failed"
134 +}
135 +
136 +cmake_src_test() {
137 + # fix OutDir and SelectLibraryConfigurations tests
138 + # these are altered thanks to our eclass
139 + sed -i -e 's:#IGNORE ::g' \
140 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
141 + || die
142 +
143 + pushd "${BUILD_DIR}" > /dev/null
144 +
145 + local ctestargs
146 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
147 +
148 + # Excluded tests:
149 + # BootstrapTest: we actualy bootstrap it every time so why test it.
150 + # BundleUtilities: bundle creation broken
151 + # CMakeOnly.AllFindModules: pthread issues
152 + # CTest.updatecvs: which fails to commit as root
153 + # Fortran: requires fortran
154 + # RunCMake.CompilerLauncher: also requires fortran
155 + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
156 + # debugedit binary is not in the expected location
157 + # TestUpload, which requires network access
158 + "${BUILD_DIR}"/bin/ctest \
159 + -j "$(makeopts_jobs)" \
160 + --test-load "$(makeopts_loadavg)" \
161 + ${ctestargs} \
162 + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
163 + || die "Tests failed"
164 +
165 + popd > /dev/null
166 +}
167 +
168 +src_prepare() {
169 + cmake-utils_src_prepare
170 +
171 + # disable Xcode hooks, bug #652134
172 + if [[ ${CHOST} == *-darwin* ]] ; then
173 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
174 + Source/cmGlobalXCodeGenerator.cxx || die
175 + fi
176 +
177 + # Add gcc libs to the default link paths
178 + sed -i \
179 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
180 + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
181 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
182 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
183 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
184 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
185 + cmake_src_bootstrap
186 + fi
187 +}
188 +
189 +src_configure() {
190 + # Fix linking on Solaris
191 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
192 +
193 + local mycmakeargs=(
194 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
195 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
196 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
197 + -DCMAKE_DOC_DIR=/share/doc/${PF}
198 + -DCMAKE_MAN_DIR=/share/man
199 + -DCMAKE_DATA_DIR=/share/${PN}
200 + -DSPHINX_MAN=$(usex doc)
201 + -DSPHINX_HTML=$(usex doc)
202 + -DBUILD_CursesDialog="$(usex ncurses)"
203 + )
204 +
205 + if use qt5 ; then
206 + mycmakeargs+=(
207 + -DBUILD_QtDialog=ON
208 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
209 + )
210 + fi
211 +
212 + cmake-utils_src_configure
213 +}
214 +
215 +src_compile() {
216 + cmake-utils_src_compile
217 + use emacs && elisp-compile Auxiliary/cmake-mode.el
218 +}
219 +
220 +src_test() {
221 + virtx cmake_src_test
222 +}
223 +
224 +src_install() {
225 + cmake-utils_src_install
226 +
227 + if use emacs; then
228 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
229 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
230 + fi
231 +
232 + insinto /usr/share/vim/vimfiles/syntax
233 + doins Auxiliary/vim/syntax/cmake.vim
234 +
235 + insinto /usr/share/vim/vimfiles/indent
236 + doins Auxiliary/vim/indent/cmake.vim
237 +
238 + insinto /usr/share/vim/vimfiles/ftdetect
239 + doins "${FILESDIR}/${PN}.vim"
240 +
241 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
242 +
243 + rm -r "${ED%/}"/usr/share/cmake/{completions,editors} || die
244 +}
245 +
246 +pkg_postinst() {
247 + use emacs && elisp-site-regen
248 + if use qt5; then
249 + gnome2_icon_cache_update
250 + xdg_desktop_database_update
251 + xdg_mimeinfo_database_update
252 + fi
253 +}
254 +
255 +pkg_postrm() {
256 + use emacs && elisp-site-regen
257 + if use qt5; then
258 + gnome2_icon_cache_update
259 + xdg_desktop_database_update
260 + xdg_mimeinfo_database_update
261 + fi
262 +}