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, 03 Nov 2016 22:29:32
Message-Id: 1478212138.2445d455eeffa94ccacde2f163320c7ac245806d.polynomial-c@gentoo
1 commit: 2445d455eeffa94ccacde2f163320c7ac245806d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 3 22:28:58 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 3 22:28:58 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2445d455
7
8 dev-util/cmake: Bump to version 3.6.3
9
10 Package-Manager: portage-2.3.2
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 +
14 dev-util/cmake/cmake-3.6.3.ebuild | 195 ++++++++++++++++++++++++++++++++++++++
15 2 files changed, 196 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 4a576d9..5c8e4ef 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -4,4 +4,5 @@ DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e
22 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
23 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
24 DIST cmake-3.6.2.tar.gz 6920069 SHA256 189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346 SHA512 50b217d3205cc65c2b55ece4ba050b1aa80dfa8a7e22ee0ec16c741cd99a639847d197a2e8448d7710c2a6ea7ba7bbcd6e3f12810f65dcc74bd27bcdb02f844a WHIRLPOOL 86ad3ff5edd071fdf46e3fc1b2d9af7cd420c93e5cb744ef0f490e6ce07c3f156384bdfb6d5246ac2caa6a563138c18e0d9208561715458343d135878223aab6
25 +DIST cmake-3.6.3.tar.gz 6919949 SHA256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48 WHIRLPOOL ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a
26 DIST cmake-3.7.0-rc2.tar.gz 7359639 SHA256 798e7a48f42a383da767c482810afe9ed6e3f91c99cb27719fd0407b3bf1e96d SHA512 059bfe26230fc1806097943e89755c4ac8d00ecb507f3a1eb816caa08d5310526b541c82af2826f94377f3774a818e73ff36b71f1e99c03052c2503443d0f5a1 WHIRLPOOL 7dc9d14528806a6b19dd8ccb3c12be3f49a6afd9ed91dd0a25259c295eb8eaaa5a34f308aa9f76c4b207d725dc58a3df25ec4713a2dfc3dffdb6bad5248d1ab1
27
28 diff --git a/dev-util/cmake/cmake-3.6.3.ebuild b/dev-util/cmake/cmake-3.6.3.ebuild
29 new file mode 100644
30 index 00000000..1e94166
31 --- /dev/null
32 +++ b/dev-util/cmake/cmake-3.6.3.ebuild
33 @@ -0,0 +1,195 @@
34 +# Copyright 1999-2016 Gentoo Foundation
35 +# Distributed under the terms of the GNU General Public License v2
36 +# $Id$
37 +
38 +EAPI=6
39 +
40 +CMAKE_REMOVE_MODULES="no"
41 +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
42 +
43 +MY_P="${P/_/-}"
44 +
45 +DESCRIPTION="Cross platform Make"
46 +HOMEPAGE="http://www.cmake.org/"
47 +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
48 +
49 +LICENSE="CMake"
50 +SLOT="0"
51 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
52 +IUSE="doc emacs system-jsoncpp ncurses qt5"
53 +
54 +RDEPEND="
55 + >=app-arch/libarchive-3.0.0:=
56 + >=dev-libs/expat-2.0.1
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 + "${FILESDIR}"/${PN}-3.6.1-find_library-lib32.patch
96 +)
97 +
98 +cmake_src_bootstrap() {
99 + # Cleanup args to extract only JOBS.
100 + # Because bootstrap does not know anything else.
101 + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
102 + if [ $? -eq 0 ]; then
103 + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
104 + par_arg="--parallel=${par_arg}"
105 + else
106 + par_arg="--parallel=1"
107 + fi
108 +
109 + # disable running of cmake in boostrap command
110 + sed -i \
111 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
112 + bootstrap || die "sed failed"
113 +
114 + # execinfo.h on Solaris isn't quite what it is on Darwin
115 + if [[ ${CHOST} == *-solaris* ]] ; then
116 + sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
117 + fi
118 +
119 + tc-export CC CXX LD
120 +
121 + # bootstrap script isn't exactly /bin/sh compatible
122 + ${CONFIG_SHELL:-sh} ./bootstrap \
123 + --prefix="${T}/cmakestrap/" \
124 + ${par_arg} \
125 + || die "Bootstrap failed"
126 +}
127 +
128 +cmake_src_test() {
129 + # fix OutDir and SelectLibraryConfigurations tests
130 + # these are altered thanks to our eclass
131 + sed -i -e 's:#IGNORE ::g' \
132 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
133 + || die
134 +
135 + pushd "${BUILD_DIR}" > /dev/null
136 +
137 + local ctestargs
138 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
139 +
140 + # Excluded tests:
141 + # BootstrapTest: we actualy bootstrap it every time so why test it.
142 + # BundleUtilities: bundle creation broken
143 + # CTest.updatecvs: which fails to commit as root
144 + # Fortran: requires fortran
145 + # Qt4Deploy, which tries to break sandbox and ignores prefix
146 + # TestUpload, which requires network access
147 + "${BUILD_DIR}"/bin/ctest ${ctestargs} \
148 + -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
149 + || die "Tests failed"
150 +
151 + popd > /dev/null
152 +}
153 +
154 +src_prepare() {
155 + cmake-utils_src_prepare
156 +
157 + # Add gcc libs to the default link paths
158 + sed -i \
159 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
160 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
161 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
162 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
163 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
164 + cmake_src_bootstrap
165 + fi
166 +}
167 +
168 +src_configure() {
169 + local mycmakeargs=(
170 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
171 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
172 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
173 + -DCMAKE_DOC_DIR=/share/doc/${PF}
174 + -DCMAKE_MAN_DIR=/share/man
175 + -DCMAKE_DATA_DIR=/share/${PN}
176 + -DSPHINX_MAN=$(usex doc)
177 + -DSPHINX_HTML=$(usex doc)
178 + -DBUILD_CursesDialog="$(usex ncurses)"
179 + )
180 +
181 + if use qt5 ; then
182 + mycmakeargs+=(
183 + -DBUILD_QtDialog=ON
184 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
185 + )
186 + fi
187 +
188 + cmake-utils_src_configure
189 +}
190 +
191 +src_compile() {
192 + cmake-utils_src_compile
193 + use emacs && elisp-compile Auxiliary/cmake-mode.el
194 +}
195 +
196 +src_test() {
197 + virtx cmake_src_test
198 +}
199 +
200 +src_install() {
201 + cmake-utils_src_install
202 +
203 + if use emacs; then
204 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
205 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
206 + fi
207 +
208 + insinto /usr/share/vim/vimfiles/syntax
209 + doins Auxiliary/cmake-syntax.vim
210 +
211 + insinto /usr/share/vim/vimfiles/indent
212 + doins Auxiliary/cmake-indent.vim
213 +
214 + insinto /usr/share/vim/vimfiles/ftdetect
215 + doins "${FILESDIR}/${PN}.vim"
216 +
217 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
218 +
219 + rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
220 +}
221 +
222 +pkg_postinst() {
223 + use emacs && elisp-site-regen
224 +}
225 +
226 +pkg_postrm() {
227 + use emacs && elisp-site-regen
228 +}