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: Fri, 07 Oct 2016 19:59:43
Message-Id: 1475870316.33d9c65e4b5646634d308a8b403f36d297c515cf.polynomial-c@gentoo
1 commit: 33d9c65e4b5646634d308a8b403f36d297c515cf
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 7 19:57:35 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 7 19:58:36 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d9c65e
7
8 dev-util/cmake: Bump to version 3.7.0_rc1
9
10 Package-Manager: portage-2.3.1
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 +
14 dev-util/cmake/cmake-3.7.0_rc1.ebuild | 200 ++++++++++++++++++++++++++++++++++
15 2 files changed, 201 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 4360d44..53b15a3 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -5,3 +5,4 @@ DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f
22 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
23 DIST cmake-3.6.1.tar.gz 6895262 SHA256 28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58aaef11 SHA512 69f20df70c58f7a09da7511a92a1e4492d89fecf30b11744aaf29a129f62384ff57ed7ed2d9dbb8b102abdc72d5722e744583161cb0ae71a01423473f36c8b1d WHIRLPOOL 82853de51dff610a769700f1063aecb83b7cb02308e7c05e0726b8a068cb3adbe764f717b8649709d629b28dcd38f38b2b53bc4bc0ba13657aeb7969dd7d758b
24 DIST cmake-3.6.2.tar.gz 6920069 SHA256 189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346 SHA512 50b217d3205cc65c2b55ece4ba050b1aa80dfa8a7e22ee0ec16c741cd99a639847d197a2e8448d7710c2a6ea7ba7bbcd6e3f12810f65dcc74bd27bcdb02f844a WHIRLPOOL 86ad3ff5edd071fdf46e3fc1b2d9af7cd420c93e5cb744ef0f490e6ce07c3f156384bdfb6d5246ac2caa6a563138c18e0d9208561715458343d135878223aab6
25 +DIST cmake-3.7.0-rc1.tar.gz 7358171 SHA256 c736e83149493e7f897fa10b2e535012dc58763331980385060904a1795be0c0 SHA512 ba278e20de8e80eb3d034c8c40686d50913bf8f7b6cff0fdbdf039a5da3053e71c93dc4b76670c07f1b01ac397a5d08614cf225cdc190a9139f54c5f50abc13a WHIRLPOOL 3c7e1d0fec781d49e3061bdd4a865c6bf10fa4bdd771b4ef2897d311007ce2a9289d569be6fb8b4b1aa3a9a3417120ce5481548d89e7132170aee56542cd39e9
26
27 diff --git a/dev-util/cmake/cmake-3.7.0_rc1.ebuild b/dev-util/cmake/cmake-3.7.0_rc1.ebuild
28 new file mode 100644
29 index 00000000..1d69907
30 --- /dev/null
31 +++ b/dev-util/cmake/cmake-3.7.0_rc1.ebuild
32 @@ -0,0 +1,200 @@
33 +# Copyright 1999-2016 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +# $Id$
36 +
37 +EAPI=6
38 +
39 +CMAKE_REMOVE_MODULES="no"
40 +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
41 +
42 +MY_P="${P/_/-}"
43 +
44 +DESCRIPTION="Cross platform Make"
45 +HOMEPAGE="http://www.cmake.org/"
46 +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 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 ~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 qt4 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 + qt4? (
63 + dev-qt/qtcore:4
64 + dev-qt/qtgui:4
65 + )
66 + qt5? (
67 + dev-qt/qtcore:5
68 + dev-qt/qtgui:5
69 + dev-qt/qtwidgets:5
70 + )
71 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
72 +"
73 +DEPEND="${RDEPEND}
74 + dev-libs/libuv
75 + doc? ( dev-python/sphinx )
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.0.0-prefix-dirs.patch
86 + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
87 +
88 + # handle gentoo packaging in find modules
89 + "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
90 + "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
91 + "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
92 + "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
93 + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
94 +
95 + # respect python eclasses
96 + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
97 + "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
98 +
99 + # upstream fixes (can usually be removed with a version bump)
100 +)
101 +
102 +cmake_src_bootstrap() {
103 + # Cleanup args to extract only JOBS.
104 + # Because bootstrap does not know anything else.
105 + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
106 + if [ $? -eq 0 ]; then
107 + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
108 + par_arg="--parallel=${par_arg}"
109 + else
110 + par_arg="--parallel=1"
111 + fi
112 +
113 + # disable running of cmake in boostrap command
114 + sed -i \
115 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
116 + bootstrap || die "sed failed"
117 +
118 + # execinfo.h on Solaris isn't quite what it is on Darwin
119 + if [[ ${CHOST} == *-solaris* ]] ; then
120 + sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
121 + fi
122 +
123 + tc-export CC CXX LD
124 +
125 + # bootstrap script isn't exactly /bin/sh compatible
126 + ${CONFIG_SHELL:-sh} ./bootstrap \
127 + --prefix="${T}/cmakestrap/" \
128 + ${par_arg} \
129 + || die "Bootstrap failed"
130 +}
131 +
132 +cmake_src_test() {
133 + # fix OutDir and SelectLibraryConfigurations tests
134 + # these are altered thanks to our eclass
135 + sed -i -e 's:#IGNORE ::g' \
136 + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
137 + || die
138 +
139 + pushd "${BUILD_DIR}" > /dev/null
140 +
141 + local ctestargs
142 + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
143 +
144 + # Excluded tests:
145 + # BootstrapTest: we actualy bootstrap it every time so why test it.
146 + # BundleUtilities: bundle creation broken
147 + # CTest.updatecvs: which fails to commit as root
148 + # Fortran: requires fortran
149 + # Qt4Deploy, which tries to break sandbox and ignores prefix
150 + # TestUpload, which requires network access
151 + "${BUILD_DIR}"/bin/ctest ${ctestargs} \
152 + -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
153 + || die "Tests failed"
154 +
155 + popd > /dev/null
156 +}
157 +
158 +src_prepare() {
159 + cmake-utils_src_prepare
160 +
161 + # Add gcc libs to the default link paths
162 + sed -i \
163 + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
164 + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
165 + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
166 + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
167 + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
168 + cmake_src_bootstrap
169 + fi
170 +}
171 +
172 +src_configure() {
173 + local mycmakeargs=(
174 + -DCMAKE_USE_SYSTEM_LIBRARIES=ON
175 + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
176 + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
177 + -DCMAKE_DOC_DIR=/share/doc/${PF}
178 + -DCMAKE_MAN_DIR=/share/man
179 + -DCMAKE_DATA_DIR=/share/${PN}
180 + -DSPHINX_MAN=$(usex doc)
181 + -DSPHINX_HTML=$(usex doc)
182 + -DBUILD_CursesDialog="$(usex ncurses)"
183 + )
184 +
185 + if use qt4 || 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 -rf "${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 +}