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: Mon, 10 Sep 2018 14:03:05
Message-Id: 1536588172.19b51c4716f114f99ada37c3c71254a00291e768.polynomial-c@gentoo
1 commit: 19b51c4716f114f99ada37c3c71254a00291e768
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 10 13:56:04 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 10 14:02:52 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b51c47
7
8 dev-util/cmake: Bump to version 3.12.2
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 dev-util/cmake/Manifest | 1 +
13 dev-util/cmake/cmake-3.12.2.ebuild | 223 +++++++++++++++++++++++++++++++++++++
14 2 files changed, 224 insertions(+)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index 300357cb561..78f0ec3a329 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -2,4 +2,5 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b
21 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
22 DIST cmake-3.12.0.tar.gz 8089372 BLAKE2B 73c36b65ce3a3e7377d4c7dc7ec6c9050adefab75a0c0f245d7b1f774951779a213de13fb8589f209bd9b74b912b3f6533fff7b16990a85ec0159ed6a1460a2b SHA512 e1d5764023d6c8dd4e8d087614e0329a097f1bc587c08c7d22ce7600867bcd7f6750d513458c7c4042570a9526060b89778243e6ea6137efb1727e409ca031ab
23 DIST cmake-3.12.1.tar.gz 8090272 BLAKE2B 081935b05bca26a0e4d515da9e76b62781d7bdbe00dc37c170b4905e5d3b1cffcb81d7a4ae1d1226034ffae927dc678a718e684a286cefae7278e988db284507 SHA512 7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692
24 +DIST cmake-3.12.2.tar.gz 8388114 BLAKE2B 2bb28991527287da62d5416dfde3a9ff072534d52b124d1f73a555d7defb16f05300c78e4c258ba2d09d11cef285fe799c3d132cd1bd4e573aea67cb86beb2af SHA512 a2f44b2d77d9a3aa62273dbdeb94ad336c7430f41a31f48b4b395d170577b2b296d598ed9d1d548df95758b3fbf3ced193e1398fd701bc99792580798ec2a99d
25 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
26
27 diff --git a/dev-util/cmake/cmake-3.12.2.ebuild b/dev-util/cmake/cmake-3.12.2.ebuild
28 new file mode 100644
29 index 00000000000..1d280208766
30 --- /dev/null
31 +++ b/dev-util/cmake/cmake-3.12.2.ebuild
32 @@ -0,0 +1,223 @@
33 +# Copyright 1999-2018 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=6
37 +
38 +CMAKE_MAKEFILE_GENERATOR="emake"
39 +CMAKE_REMOVE_MODULES="no"
40 +inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
41 +
42 +MY_P="${P/_/-}"
43 +
44 +DESCRIPTION="Cross platform Make"
45 +HOMEPAGE="https://cmake.org/"
46 +SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
47 +
48 +LICENSE="CMake"
49 +SLOT="0"
50 +[[ "${PV}" = *_rc* ]] || \
51 +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"
52 +IUSE="doc emacs system-jsoncpp ncurses qt5"
53 +
54 +RDEPEND="
55 + app-crypt/rhash
56 + >=app-arch/libarchive-3.0.0:=
57 + >=dev-libs/expat-2.0.1
58 + >=dev-libs/libuv-1.10.0:=
59 + >=net-misc/curl-7.21.5[ssl]
60 + sys-libs/zlib
61 + virtual/pkgconfig
62 + emacs? ( virtual/emacs )
63 + ncurses? ( sys-libs/ncurses:0= )
64 + qt5? (
65 + dev-qt/qtcore:5
66 + dev-qt/qtgui:5
67 + dev-qt/qtwidgets:5
68 + )
69 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
70 +"
71 +DEPEND="${RDEPEND}
72 + doc? (
73 + dev-python/requests
74 + dev-python/sphinx
75 + )
76 +"
77 +
78 +S="${WORKDIR}/${MY_P}"
79 +
80 +SITEFILE="50${PN}-gentoo.el"
81 +
82 +PATCHES=(
83 + # prefix
84 + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
85 + "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
86 + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
87 +
88 + # handle gentoo packaging in find modules
89 + "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
90 + "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
91 + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
92 +
93 + # respect python eclasses
94 + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
95 + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
96 +
97 + # boost (#660980)
98 + "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.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 + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
107 + if [ $? -eq 0 ]; then
108 + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -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 + # CTest.updatecvs: which fails to commit as root
150 + # Fortran: requires fortran
151 + # Qt4Deploy, which tries to break sandbox and ignores prefix
152 + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
153 + # debugedit binary is not in the expected location
154 + # TestUpload, which requires network access
155 + "${BUILD_DIR}"/bin/ctest ${ctestargs} \
156 + -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
157 + || die "Tests failed"
158 +
159 + popd > /dev/null
160 +}
161 +
162 +src_prepare() {
163 + cmake-utils_src_prepare
164 +
165 + # disable Xcode hooks, bug #652134
166 + if [[ ${CHOST} == *-darwin* ]] ; then
167 + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
168 + Source/cmGlobalXCodeGenerator.cxx || die
169 + fi
170 +
171 + # Add gcc libs to the default link paths
172 + sed -i \
173 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
174 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
175 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
176 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
177 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
178 + cmake_src_bootstrap
179 + fi
180 +}
181 +
182 +src_configure() {
183 + # Fix linking on Solaris
184 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
185 +
186 + local mycmakeargs=(
187 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
188 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
189 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
190 + -DCMAKE_DOC_DIR=/share/doc/${PF}
191 + -DCMAKE_MAN_DIR=/share/man
192 + -DCMAKE_DATA_DIR=/share/${PN}
193 + -DSPHINX_MAN=$(usex doc)
194 + -DSPHINX_HTML=$(usex doc)
195 + -DBUILD_CursesDialog="$(usex ncurses)"
196 + )
197 +
198 + if use qt5 ; then
199 + mycmakeargs+=(
200 + -DBUILD_QtDialog=ON
201 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
202 + )
203 + fi
204 +
205 + cmake-utils_src_configure
206 +}
207 +
208 +src_compile() {
209 + cmake-utils_src_compile
210 + use emacs && elisp-compile Auxiliary/cmake-mode.el
211 +}
212 +
213 +src_test() {
214 + virtx cmake_src_test
215 +}
216 +
217 +src_install() {
218 + cmake-utils_src_install
219 +
220 + if use emacs; then
221 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
222 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
223 + fi
224 +
225 + insinto /usr/share/vim/vimfiles/syntax
226 + doins Auxiliary/vim/syntax/cmake.vim
227 +
228 + insinto /usr/share/vim/vimfiles/indent
229 + doins Auxiliary/vim/indent/cmake.vim
230 +
231 + insinto /usr/share/vim/vimfiles/ftdetect
232 + doins "${FILESDIR}/${PN}.vim"
233 +
234 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
235 +
236 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
237 +}
238 +
239 +pkg_postinst() {
240 + use emacs && elisp-site-regen
241 + if use qt5; then
242 + gnome2_icon_cache_update
243 + xdg_desktop_database_update
244 + xdg_mimeinfo_database_update
245 + fi
246 +}
247 +
248 +pkg_postrm() {
249 + use emacs && elisp-site-regen
250 + if use qt5; then
251 + gnome2_icon_cache_update
252 + xdg_desktop_database_update
253 + xdg_mimeinfo_database_update
254 + fi
255 +}