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: Sun, 02 Jun 2019 00:52:12
Message-Id: 1559436721.7ccf42a3e25dfa0a0dc6511b215dc407307734ce.polynomial-c@gentoo
1 commit: 7ccf42a3e25dfa0a0dc6511b215dc407307734ce
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 2 00:50:41 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 00:52:01 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccf42a3
7
8 dev-util/cmake: Bump to version 3.14.5
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.13
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.5.ebuild | 224 +++++++++++++++++++++++++++++++++++++
15 2 files changed, 225 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 387166de9f8..44cf237f9af 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -3,4 +3,5 @@ DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22
22 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
23 DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
24 DIST cmake-3.14.4.tar.gz 8853821 BLAKE2B 8005387dbb9a0d2ceffda324d81e38710b51d9e1befa40322441722038a9a5bf04127edec1feb4ab9a75779e4cbac6eb0f8bd3e0d08b7d2427e88df095851d46 SHA512 1011ba6cc54680699e97a5e25c4be6055c04f47847225f87f91ada0b2ace2d6f709a3fa49a37fd5c2276118bf29f5ce9d6e24473bff6f3c90f25e92083a5c412
25 +DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa SHA512 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
26 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
27
28 diff --git a/dev-util/cmake/cmake-3.14.5.ebuild b/dev-util/cmake/cmake-3.14.5.ebuild
29 new file mode 100644
30 index 00000000000..0ec739545d3
31 --- /dev/null
32 +++ b/dev-util/cmake/cmake-3.14.5.ebuild
33 @@ -0,0 +1,224 @@
34 +# Copyright 1999-2019 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="no"
41 +inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg 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 test"
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 +BDEPEND="
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 + # upstream fixes (can usually be removed with a version bump)
101 +)
102 +
103 +cmake_src_bootstrap() {
104 + # Cleanup args to extract only JOBS.
105 + # Because bootstrap does not know anything else.
106 + grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
107 + if [[ $? -eq 0 ]] ; then
108 + par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
109 + par_arg="--parallel=${par_arg}"
110 + else
111 + par_arg="--parallel=1"
112 + fi
113 +
114 + # disable running of cmake in boostrap command
115 + sed -i \
116 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
117 + bootstrap || die "sed failed"
118 +
119 + # execinfo.h on Solaris isn't quite what it is on Darwin
120 + if [[ ${CHOST} == *-solaris* ]] ; then
121 + sed -i -e 's/execinfo\.h/blablabla.h/' \
122 + Source/kwsys/CMakeLists.txt || die
123 + fi
124 +
125 + tc-export CC CXX LD
126 +
127 + # bootstrap script isn't exactly /bin/sh compatible
128 + ${CONFIG_SHELL:-sh} ./bootstrap \
129 + --prefix="${T}/cmakestrap/" \
130 + ${par_arg} \
131 + || die "Bootstrap failed"
132 +}
133 +
134 +cmake_src_test() {
135 + # fix OutDir and SelectLibraryConfigurations tests
136 + # these are altered thanks to our eclass
137 + sed -i -e 's:#IGNORE ::g' \
138 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
139 + || die
140 +
141 + pushd "${BUILD_DIR}" > /dev/null
142 +
143 + local ctestargs
144 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
145 +
146 + # Excluded tests:
147 + # BootstrapTest: we actualy bootstrap it every time so why test it.
148 + # BundleUtilities: bundle creation broken
149 + # CMakeOnly.AllFindModules: pthread issues
150 + # CTest.updatecvs: which fails to commit as root
151 + # Fortran: requires fortran
152 + # RunCMake.CompilerLauncher: also requires fortran
153 + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
154 + # debugedit binary is not in the expected location
155 + # TestUpload, which requires network access
156 + "${BUILD_DIR}"/bin/ctest \
157 + -j "$(makeopts_jobs)" \
158 + --test-load "$(makeopts_loadavg)" \
159 + ${ctestargs} \
160 + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
161 + || die "Tests failed"
162 +
163 + popd > /dev/null
164 +}
165 +
166 +src_prepare() {
167 + cmake-utils_src_prepare
168 +
169 + # disable Xcode hooks, bug #652134
170 + if [[ ${CHOST} == *-darwin* ]] ; then
171 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
172 + Source/cmGlobalXCodeGenerator.cxx || die
173 + fi
174 +
175 + # Add gcc libs to the default link paths
176 + sed -i \
177 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
178 + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
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 + -DBUILD_TESTING=$(usex test)
202 + )
203 +
204 + if use qt5 ; then
205 + mycmakeargs+=(
206 + -DBUILD_QtDialog=ON
207 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
208 + )
209 + fi
210 +
211 + cmake-utils_src_configure
212 +}
213 +
214 +src_compile() {
215 + cmake-utils_src_compile
216 + use emacs && elisp-compile Auxiliary/cmake-mode.el
217 +}
218 +
219 +src_test() {
220 + virtx cmake_src_test
221 +}
222 +
223 +src_install() {
224 + cmake-utils_src_install
225 +
226 + if use emacs; then
227 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
228 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
229 + fi
230 +
231 + insinto /usr/share/vim/vimfiles/syntax
232 + doins Auxiliary/vim/syntax/cmake.vim
233 +
234 + insinto /usr/share/vim/vimfiles/indent
235 + doins Auxiliary/vim/indent/cmake.vim
236 +
237 + insinto /usr/share/vim/vimfiles/ftdetect
238 + doins "${FILESDIR}/${PN}.vim"
239 +
240 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
241 +
242 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
243 +}
244 +
245 +pkg_preinst() {
246 + use qt5 && xdg_pkg_preinst
247 +}
248 +
249 +pkg_postinst() {
250 + use emacs && elisp-site-regen
251 + use qt5 && xdg_pkg_postinst
252 +}
253 +
254 +pkg_postrm() {
255 + use emacs && elisp-site-regen
256 + use qt5 && xdg_pkg_postrm
257 +}