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