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: Sat, 09 Jul 2016 10:15:49
Message-Id: 1468059336.3ff17bde3ad179b9d016926f29688eda5a2cca49.polynomial-c@gentoo
1 commit: 3ff17bde3ad179b9d016926f29688eda5a2cca49
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 9 10:14:30 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 9 10:15:36 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff17bde
7
8 dev-util/cmake: Bump to version 3.6.0
9
10 Package-Manager: portage-2.3.0
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.0.ebuild | 198 ++++++++++++++++++++++++++++++++++++++
15 2 files changed, 199 insertions(+)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 04c6ce3..1e5a35a 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -6,3 +6,4 @@ DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc10977
22 DIST cmake-3.4.3.tar.gz 6722311 SHA256 b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11 WHIRLPOOL fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad
23 DIST cmake-3.5.1.tar.gz 6863121 SHA256 93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8 SHA512 f78185eb1a2344167888b13ce2a0e8657594bc9c4195c99f5a2be3f953dd2ff630081c2d63b180215851eec8c9565fab8ee1c481ca4c0e6eb9dc27b574d45616 WHIRLPOOL 4a81d3d1bbd202d568f1b649b80e0627a247463c9c5df8a7ca75bb1328c39efe066c87772ea95b7785bde3f1e083fe23d96d4b82318b339d527dbd998db23cea
24 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
25 +DIST cmake-3.6.0.tar.gz 6897636 SHA256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 SHA512 4e519fa30a6fee2fb0ef8df667504dfaba1f965c263fd4f42d17348c45cff33777de9a8c552b13da0bb4b9f1300a142f204a844eac03bdf431e826e8d7ba3505 WHIRLPOOL 4d2842efa7ae6bdfe5d1e0b773f8649a6dec7d23364f89570d442db2f4da033acd0023dd5cf80004a024b5c1ec142db284357a21c993bc84d0a07d8e0fb76c77
26
27 diff --git a/dev-util/cmake/cmake-3.6.0.ebuild b/dev-util/cmake/cmake-3.6.0.ebuild
28 new file mode 100644
29 index 0000000..315190d
30 --- /dev/null
31 +++ b/dev-util/cmake/cmake-3.6.0.ebuild
32 @@ -0,0 +1,198 @@
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 +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"
51 +IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
52 +
53 +RDEPEND="
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 + qt4? (
62 + dev-qt/qtcore:4
63 + dev-qt/qtgui:4
64 + )
65 + qt5? (
66 + dev-qt/qtcore:5
67 + dev-qt/qtgui:5
68 + dev-qt/qtwidgets:5
69 + )
70 + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
71 +"
72 +DEPEND="${RDEPEND}
73 + doc? ( dev-python/sphinx )
74 +"
75 +
76 +S="${WORKDIR}/${MY_P}"
77 +
78 +SITEFILE="50${PN}-gentoo.el"
79 +
80 +CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
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 + # 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 + # disable running of cmake in boostrap command
157 + sed -i \
158 + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
159 + bootstrap || die "sed failed"
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 +
167 + cmake_src_bootstrap
168 +}
169 +
170 +src_configure() {
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 + )
182 +
183 + if use qt4 || use qt5 ; then
184 + mycmakeargs+=(
185 + -DBUILD_QtDialog=ON
186 + $(cmake-utils_use_find_package qt5 Qt5Widgets)
187 + )
188 + fi
189 +
190 + cmake-utils_src_configure
191 +}
192 +
193 +src_compile() {
194 + cmake-utils_src_compile
195 + use emacs && elisp-compile Auxiliary/cmake-mode.el
196 +}
197 +
198 +src_test() {
199 + virtx cmake_src_test
200 +}
201 +
202 +src_install() {
203 + cmake-utils_src_install
204 +
205 + if use emacs; then
206 + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
207 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
208 + fi
209 +
210 + insinto /usr/share/vim/vimfiles/syntax
211 + doins Auxiliary/cmake-syntax.vim
212 +
213 + insinto /usr/share/vim/vimfiles/indent
214 + doins Auxiliary/cmake-indent.vim
215 +
216 + insinto /usr/share/vim/vimfiles/ftdetect
217 + doins "${FILESDIR}/${PN}.vim"
218 +
219 + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
220 +
221 + rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
222 +}
223 +
224 +pkg_postinst() {
225 + use emacs && elisp-site-regen
226 +}
227 +
228 +pkg_postrm() {
229 + use emacs && elisp-site-regen
230 +}