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: Thu, 01 Jun 2017 09:20:13
Message-Id: 1496308803.e079736a9fe7b948289aaed44bb1b34512a29cde.polynomial-c@gentoo
1 commit: e079736a9fe7b948289aaed44bb1b34512a29cde
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 1 09:15:07 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 1 09:20:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e079736a
7
8 dev-util/cmake: Bump to version 3.8.2
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-util/cmake/Manifest | 1 +
13 dev-util/cmake/cmake-3.8.2.ebuild | 201 ++++++++++++++++++++++++++++++++++++++
14 2 files changed, 202 insertions(+)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index 4ff1a66568f..d228f1fdcdd 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -2,3 +2,4 @@ DIST cmake-3.7.2-x32.patch.xz 7204 SHA256 d04cc6dc7ffbb8e16426e85f50e3f3c3037fb4
21 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
22 DIST cmake-3.8.0.tar.gz 7503379 SHA256 cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 SHA512 a261088073ab41c41b461d155bead82b580225c8a4d32884715fba5eeb892acb2f73ae0484e823d7c33c9e29f331ec34ca223987f05e3ceb9a2f9b7defef17bf WHIRLPOOL d3a38fd5079effd6d9da3e21939a39019ee332768925f311bd799047c57f83918ee204a51abbe2f422c4200577b8c15e483fa8059be7863eb13196cc443d7e39
23 DIST cmake-3.8.1.tar.gz 7503955 SHA256 ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228 SHA512 2164f502900a803928f2df3168fb5094de05392fd62d30c55d08de89bdd4ba7323255e724cbca260202edf1691bd5c6be63c585f75ff9d36bd0d35b816c2fde0 WHIRLPOOL 6ef8f4bcd5186e6efb3aa95a6f09ab686ee21adbe049d74c75e6c2a60ecf2d61328a06b14e4a15eb421bd495dfee128c30a50c299c8681640e1deff546e9309c
24 +DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f WHIRLPOOL 8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
25
26 diff --git a/dev-util/cmake/cmake-3.8.2.ebuild b/dev-util/cmake/cmake-3.8.2.ebuild
27 new file mode 100644
28 index 00000000000..98921d9a61a
29 --- /dev/null
30 +++ b/dev-util/cmake/cmake-3.8.2.ebuild
31 @@ -0,0 +1,201 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +
37 +CMAKE_REMOVE_MODULES="no"
38 +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic
39 +
40 +MY_P="${P/_/-}"
41 +
42 +DESCRIPTION="Cross platform Make"
43 +HOMEPAGE="http://www.cmake.org/"
44 +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
45 +
46 +LICENSE="CMake"
47 +SLOT="0"
48 +[[ "${PV}" = *_rc* ]] || \
49 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
50 +IUSE="doc emacs server system-jsoncpp ncurses qt5"
51 +
52 +RDEPEND="
53 + app-crypt/rhash
54 + >=app-arch/libarchive-3.0.0:=
55 + >=dev-libs/expat-2.0.1
56 + >=net-misc/curl-7.21.5[ssl]
57 + sys-libs/zlib
58 + virtual/pkgconfig
59 + emacs? ( virtual/emacs )
60 + ncurses? ( sys-libs/ncurses:0= )
61 + qt5? (
62 + dev-qt/qtcore:5
63 + dev-qt/qtgui:5
64 + dev-qt/qtwidgets:5
65 + )
66 + server? ( >=dev-libs/libuv-1.0.0:= )
67 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
68 +"
69 +DEPEND="${RDEPEND}
70 + doc? ( dev-python/sphinx )
71 +"
72 +
73 +S="${WORKDIR}/${MY_P}"
74 +
75 +SITEFILE="50${PN}-gentoo.el"
76 +
77 +PATCHES=(
78 + # prefix
79 + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
80 + "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
81 + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
82 +
83 + # handle gentoo packaging in find modules
84 + "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
85 + "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
86 + "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
87 + "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
88 + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
89 +
90 + # respect python eclasses
91 + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
92 + "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
93 +
94 + # upstream fixes (can usually be removed with a version bump)
95 +)
96 +
97 +cmake_src_bootstrap() {
98 + # Cleanup args to extract only JOBS.
99 + # Because bootstrap does not know anything else.
100 + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
101 + if [ $? -eq 0 ]; then
102 + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
103 + par_arg="--parallel=${par_arg}"
104 + else
105 + par_arg="--parallel=1"
106 + fi
107 +
108 + # disable running of cmake in boostrap command
109 + sed -i \
110 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
111 + bootstrap || die "sed failed"
112 +
113 + # execinfo.h on Solaris isn't quite what it is on Darwin
114 + if [[ ${CHOST} == *-solaris* ]] ; then
115 + sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
116 + fi
117 +
118 + tc-export CC CXX LD
119 +
120 + # bootstrap script isn't exactly /bin/sh compatible
121 + ${CONFIG_SHELL:-sh} ./bootstrap \
122 + --prefix="${T}/cmakestrap/" \
123 + ${par_arg} \
124 + || die "Bootstrap failed"
125 +}
126 +
127 +cmake_src_test() {
128 + # fix OutDir and SelectLibraryConfigurations tests
129 + # these are altered thanks to our eclass
130 + sed -i -e 's:#IGNORE ::g' \
131 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
132 + || die
133 +
134 + pushd "${BUILD_DIR}" > /dev/null
135 +
136 + local ctestargs
137 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
138 +
139 + # Excluded tests:
140 + # BootstrapTest: we actualy bootstrap it every time so why test it.
141 + # BundleUtilities: bundle creation broken
142 + # CTest.updatecvs: which fails to commit as root
143 + # Fortran: requires fortran
144 + # Qt4Deploy, which tries to break sandbox and ignores prefix
145 + # TestUpload, which requires network access
146 + "${BUILD_DIR}"/bin/ctest ${ctestargs} \
147 + -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
148 + || die "Tests failed"
149 +
150 + popd > /dev/null
151 +}
152 +
153 +src_prepare() {
154 + cmake-utils_src_prepare
155 +
156 + # Add gcc libs to the default link paths
157 + sed -i \
158 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
159 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
160 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
161 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
162 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
163 + cmake_src_bootstrap
164 + fi
165 +}
166 +
167 +src_configure() {
168 + # Fix linking on Solaris
169 + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
170 +
171 + local mycmakeargs=(
172 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
173 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
174 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
175 + -DCMAKE_DOC_DIR=/share/doc/${PF}
176 + -DCMAKE_MAN_DIR=/share/man
177 + -DCMAKE_DATA_DIR=/share/${PN}
178 + -DSPHINX_MAN=$(usex doc)
179 + -DSPHINX_HTML=$(usex doc)
180 + -DBUILD_CursesDialog="$(usex ncurses)"
181 + -DCMake_ENABLE_SERVER_MODE="$(usex server)"
182 + -DCMAKE_USE_LIBUV="$(usex server)"
183 + )
184 +
185 + if use qt5 ; then
186 + mycmakeargs+=(
187 + -DBUILD_QtDialog=ON
188 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
189 + )
190 + fi
191 +
192 + cmake-utils_src_configure
193 +}
194 +
195 +src_compile() {
196 + cmake-utils_src_compile
197 + use emacs && elisp-compile Auxiliary/cmake-mode.el
198 +}
199 +
200 +src_test() {
201 + virtx cmake_src_test
202 +}
203 +
204 +src_install() {
205 + cmake-utils_src_install
206 +
207 + if use emacs; then
208 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
209 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
210 + fi
211 +
212 + insinto /usr/share/vim/vimfiles/syntax
213 + doins Auxiliary/vim/syntax/cmake.vim
214 +
215 + insinto /usr/share/vim/vimfiles/indent
216 + doins Auxiliary/vim/indent/cmake.vim
217 +
218 + insinto /usr/share/vim/vimfiles/ftdetect
219 + doins "${FILESDIR}/${PN}.vim"
220 +
221 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
222 +
223 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
224 +}
225 +
226 +pkg_postinst() {
227 + use emacs && elisp-site-regen
228 +}
229 +
230 +pkg_postrm() {
231 + use emacs && elisp-site-regen
232 +}