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 Dec 2016 10:41:26
Message-Id: 1480588762.c340d2ae6abe4daef4b8ae662823b743a22388d8.polynomial-c@gentoo
1 commit: c340d2ae6abe4daef4b8ae662823b743a22388d8
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 1 10:39:22 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 1 10:39:22 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c340d2ae
7
8 dev-util/cmake: Bump to version 3.7.1
9
10 Package-Manager: portage-2.3.2
11
12 dev-util/cmake/Manifest | 1 +
13 dev-util/cmake/cmake-3.7.1.ebuild | 196 ++++++++++++++++++++++++++++++++++++++
14 2 files changed, 197 insertions(+)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index 1ceed96..3d3e3be 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -6,3 +6,4 @@ DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7
21 DIST cmake-3.6.2.tar.gz 6920069 SHA256 189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346 SHA512 50b217d3205cc65c2b55ece4ba050b1aa80dfa8a7e22ee0ec16c741cd99a639847d197a2e8448d7710c2a6ea7ba7bbcd6e3f12810f65dcc74bd27bcdb02f844a WHIRLPOOL 86ad3ff5edd071fdf46e3fc1b2d9af7cd420c93e5cb744ef0f490e6ce07c3f156384bdfb6d5246ac2caa6a563138c18e0d9208561715458343d135878223aab6
22 DIST cmake-3.6.3.tar.gz 6919949 SHA256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48 WHIRLPOOL ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a
23 DIST cmake-3.7.0.tar.gz 7359368 SHA256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 SHA512 badeb81ea5b2a765d0ae222d6c7612eba570f46b3645ac8a22e1cf5ea52648239c707e80d51c1d31f8e5b15167e37e6b4d9f6308280560b11feddc3d2fa745cd WHIRLPOOL 38bf6f2861544024282e6d1fc97824c32ebb824256ebc2513ad4b4698f66803354de75d1692a63515b2b0f587cadc52d3c9e6a1b367360b561f34f1452495566
24 +DIST cmake-3.7.1.tar.gz 7361172 SHA256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 SHA512 0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629 WHIRLPOOL 8b632b4a3f44a7b56952926ad43db45ecd9f26f434816fe29a52c89542edfc2dfea72f4ec814d4faaf990ee535ad80e6238ba2e6d9ffa2ff94cfccd665b1d930
25
26 diff --git a/dev-util/cmake/cmake-3.7.1.ebuild b/dev-util/cmake/cmake-3.7.1.ebuild
27 new file mode 100644
28 index 00000000..ab23f3b
29 --- /dev/null
30 +++ b/dev-util/cmake/cmake-3.7.1.ebuild
31 @@ -0,0 +1,196 @@
32 +# Copyright 1999-2016 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +# $Id$
35 +
36 +EAPI=6
37 +
38 +CMAKE_REMOVE_MODULES="no"
39 +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
40 +
41 +MY_P="${P/_/-}"
42 +
43 +DESCRIPTION="Cross platform Make"
44 +HOMEPAGE="http://www.cmake.org/"
45 +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
46 +
47 +LICENSE="CMake"
48 +SLOT="0"
49 +[[ "${PV}" = *_rc* ]] || \
50 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
51 +IUSE="doc emacs system-jsoncpp ncurses qt5"
52 +
53 +RDEPEND="
54 + >=app-arch/libarchive-3.0.0:=
55 + >=dev-libs/expat-2.0.1
56 + >=dev-libs/libuv-1.0.0:=
57 + >=net-misc/curl-7.21.5[ssl]
58 + sys-libs/zlib
59 + virtual/pkgconfig
60 + emacs? ( virtual/emacs )
61 + ncurses? ( sys-libs/ncurses:0= )
62 + qt5? (
63 + dev-qt/qtcore:5
64 + dev-qt/qtgui:5
65 + dev-qt/qtwidgets:5
66 + )
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.0.0-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 + local mycmakeargs=(
169 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
170 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
171 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
172 + -DCMAKE_DOC_DIR=/share/doc/${PF}
173 + -DCMAKE_MAN_DIR=/share/man
174 + -DCMAKE_DATA_DIR=/share/${PN}
175 + -DSPHINX_MAN=$(usex doc)
176 + -DSPHINX_HTML=$(usex doc)
177 + -DBUILD_CursesDialog="$(usex ncurses)"
178 + )
179 +
180 + if use qt5 ; then
181 + mycmakeargs+=(
182 + -DBUILD_QtDialog=ON
183 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
184 + )
185 + fi
186 +
187 + cmake-utils_src_configure
188 +}
189 +
190 +src_compile() {
191 + cmake-utils_src_compile
192 + use emacs && elisp-compile Auxiliary/cmake-mode.el
193 +}
194 +
195 +src_test() {
196 + virtx cmake_src_test
197 +}
198 +
199 +src_install() {
200 + cmake-utils_src_install
201 +
202 + if use emacs; then
203 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
204 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
205 + fi
206 +
207 + insinto /usr/share/vim/vimfiles/syntax
208 + doins Auxiliary/vim/syntax/cmake.vim
209 +
210 + insinto /usr/share/vim/vimfiles/indent
211 + doins Auxiliary/vim/indent/cmake.vim
212 +
213 + insinto /usr/share/vim/vimfiles/ftdetect
214 + doins "${FILESDIR}/${PN}.vim"
215 +
216 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
217 +
218 + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
219 +}
220 +
221 +pkg_postinst() {
222 + use emacs && elisp-site-regen
223 +}
224 +
225 +pkg_postrm() {
226 + use emacs && elisp-site-regen
227 +}