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:48
Message-Id: 1468059339.c71325e21ac0b037d91a464bbd8435b770dd78ed.polynomial-c@gentoo
1 commit: c71325e21ac0b037d91a464bbd8435b770dd78ed
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 9 10:15:22 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 9 10:15:39 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c71325e2
7
8 dev-util/cmake: Removed old.
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.5.1.ebuild | 198 --------------------------------------
15 dev-util/cmake/cmake-3.5.2.ebuild | 198 --------------------------------------
16 3 files changed, 397 deletions(-)
17
18 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
19 index 1e5a35a..7206d93 100644
20 --- a/dev-util/cmake/Manifest
21 +++ b/dev-util/cmake/Manifest
22 @@ -4,6 +4,5 @@ DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e
23 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
24 DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
25 DIST cmake-3.4.3.tar.gz 6722311 SHA256 b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11 WHIRLPOOL fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad
26 -DIST cmake-3.5.1.tar.gz 6863121 SHA256 93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8 SHA512 f78185eb1a2344167888b13ce2a0e8657594bc9c4195c99f5a2be3f953dd2ff630081c2d63b180215851eec8c9565fab8ee1c481ca4c0e6eb9dc27b574d45616 WHIRLPOOL 4a81d3d1bbd202d568f1b649b80e0627a247463c9c5df8a7ca75bb1328c39efe066c87772ea95b7785bde3f1e083fe23d96d4b82318b339d527dbd998db23cea
27 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
28 DIST cmake-3.6.0.tar.gz 6897636 SHA256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 SHA512 4e519fa30a6fee2fb0ef8df667504dfaba1f965c263fd4f42d17348c45cff33777de9a8c552b13da0bb4b9f1300a142f204a844eac03bdf431e826e8d7ba3505 WHIRLPOOL 4d2842efa7ae6bdfe5d1e0b773f8649a6dec7d23364f89570d442db2f4da033acd0023dd5cf80004a024b5c1ec142db284357a21c993bc84d0a07d8e0fb76c77
29
30 diff --git a/dev-util/cmake/cmake-3.5.1.ebuild b/dev-util/cmake/cmake-3.5.1.ebuild
31 deleted file mode 100644
32 index f185478..0000000
33 --- a/dev-util/cmake/cmake-3.5.1.ebuild
34 +++ /dev/null
35 @@ -1,198 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Id$
39 -
40 -EAPI=6
41 -
42 -CMAKE_REMOVE_MODULES="no"
43 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
44 -
45 -MY_P="${P/_/-}"
46 -
47 -DESCRIPTION="Cross platform Make"
48 -HOMEPAGE="http://www.cmake.org/"
49 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
50 -
51 -LICENSE="CMake"
52 -SLOT="0"
53 -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"
54 -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
55 -
56 -RDEPEND="
57 - >=app-arch/libarchive-3.0.0:=
58 - >=dev-libs/expat-2.0.1
59 - >=net-misc/curl-7.21.5[ssl]
60 - sys-libs/zlib
61 - virtual/pkgconfig
62 - emacs? ( virtual/emacs )
63 - ncurses? ( sys-libs/ncurses:0= )
64 - qt4? (
65 - dev-qt/qtcore:4
66 - dev-qt/qtgui:4
67 - )
68 - qt5? (
69 - dev-qt/qtcore:5
70 - dev-qt/qtgui:5
71 - dev-qt/qtwidgets:5
72 - )
73 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
74 -"
75 -DEPEND="${RDEPEND}
76 - doc? ( dev-python/sphinx )
77 -"
78 -
79 -S="${WORKDIR}/${MY_P}"
80 -
81 -SITEFILE="50${PN}-gentoo.el"
82 -
83 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
84 -
85 -PATCHES=(
86 - # prefix
87 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
88 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
89 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
90 -
91 - # handle gentoo packaging in find modules
92 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
93 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
94 - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
95 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
96 - "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
97 -
98 - # respect python eclasses
99 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
100 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
101 -
102 - # upstream fixes (can usually be removed with a version bump)
103 -)
104 -
105 -cmake_src_bootstrap() {
106 - # Cleanup args to extract only JOBS.
107 - # Because bootstrap does not know anything else.
108 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
109 - if [ $? -eq 0 ]; then
110 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
111 - par_arg="--parallel=${par_arg}"
112 - else
113 - par_arg="--parallel=1"
114 - fi
115 -
116 - # execinfo.h on Solaris isn't quite what it is on Darwin
117 - if [[ ${CHOST} == *-solaris* ]] ; then
118 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
119 - fi
120 -
121 - tc-export CC CXX LD
122 -
123 - # bootstrap script isn't exactly /bin/sh compatible
124 - ${CONFIG_SHELL:-sh} ./bootstrap \
125 - --prefix="${T}/cmakestrap/" \
126 - ${par_arg} \
127 - || die "Bootstrap failed"
128 -}
129 -
130 -cmake_src_test() {
131 - # fix OutDir and SelectLibraryConfigurations tests
132 - # these are altered thanks to our eclass
133 - sed -i -e 's:#IGNORE ::g' \
134 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
135 - || die
136 -
137 - pushd "${BUILD_DIR}" > /dev/null
138 -
139 - local ctestargs
140 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
141 -
142 - # Excluded tests:
143 - # BootstrapTest: we actualy bootstrap it every time so why test it.
144 - # BundleUtilities: bundle creation broken
145 - # CTest.updatecvs: which fails to commit as root
146 - # Fortran: requires fortran
147 - # Qt4Deploy, which tries to break sandbox and ignores prefix
148 - # TestUpload, which requires network access
149 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
150 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
151 - || die "Tests failed"
152 -
153 - popd > /dev/null
154 -}
155 -
156 -src_prepare() {
157 - cmake-utils_src_prepare
158 -
159 - # disable running of cmake in boostrap command
160 - sed -i \
161 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
162 - bootstrap || die "sed failed"
163 -
164 - # Add gcc libs to the default link paths
165 - sed -i \
166 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
167 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
168 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
169 -
170 - cmake_src_bootstrap
171 -}
172 -
173 -src_configure() {
174 - local mycmakeargs=(
175 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
176 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
177 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
178 - -DCMAKE_DOC_DIR=/share/doc/${PF}
179 - -DCMAKE_MAN_DIR=/share/man
180 - -DCMAKE_DATA_DIR=/share/${PN}
181 - -DSPHINX_MAN=$(usex doc)
182 - -DSPHINX_HTML=$(usex doc)
183 - -DBUILD_CursesDialog="$(usex ncurses)"
184 - )
185 -
186 - if use qt4 || use qt5 ; then
187 - mycmakeargs+=(
188 - -DBUILD_QtDialog=ON
189 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
190 - )
191 - fi
192 -
193 - cmake-utils_src_configure
194 -}
195 -
196 -src_compile() {
197 - cmake-utils_src_compile
198 - use emacs && elisp-compile Auxiliary/cmake-mode.el
199 -}
200 -
201 -src_test() {
202 - virtx cmake_src_test
203 -}
204 -
205 -src_install() {
206 - cmake-utils_src_install
207 -
208 - if use emacs; then
209 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
210 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
211 - fi
212 -
213 - insinto /usr/share/vim/vimfiles/syntax
214 - doins Auxiliary/cmake-syntax.vim
215 -
216 - insinto /usr/share/vim/vimfiles/indent
217 - doins Auxiliary/cmake-indent.vim
218 -
219 - insinto /usr/share/vim/vimfiles/ftdetect
220 - doins "${FILESDIR}/${PN}.vim"
221 -
222 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
223 -
224 - rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
225 -}
226 -
227 -pkg_postinst() {
228 - use emacs && elisp-site-regen
229 -}
230 -
231 -pkg_postrm() {
232 - use emacs && elisp-site-regen
233 -}
234
235 diff --git a/dev-util/cmake/cmake-3.5.2.ebuild b/dev-util/cmake/cmake-3.5.2.ebuild
236 deleted file mode 100644
237 index f185478..0000000
238 --- a/dev-util/cmake/cmake-3.5.2.ebuild
239 +++ /dev/null
240 @@ -1,198 +0,0 @@
241 -# Copyright 1999-2016 Gentoo Foundation
242 -# Distributed under the terms of the GNU General Public License v2
243 -# $Id$
244 -
245 -EAPI=6
246 -
247 -CMAKE_REMOVE_MODULES="no"
248 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
249 -
250 -MY_P="${P/_/-}"
251 -
252 -DESCRIPTION="Cross platform Make"
253 -HOMEPAGE="http://www.cmake.org/"
254 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
255 -
256 -LICENSE="CMake"
257 -SLOT="0"
258 -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"
259 -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
260 -
261 -RDEPEND="
262 - >=app-arch/libarchive-3.0.0:=
263 - >=dev-libs/expat-2.0.1
264 - >=net-misc/curl-7.21.5[ssl]
265 - sys-libs/zlib
266 - virtual/pkgconfig
267 - emacs? ( virtual/emacs )
268 - ncurses? ( sys-libs/ncurses:0= )
269 - qt4? (
270 - dev-qt/qtcore:4
271 - dev-qt/qtgui:4
272 - )
273 - qt5? (
274 - dev-qt/qtcore:5
275 - dev-qt/qtgui:5
276 - dev-qt/qtwidgets:5
277 - )
278 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
279 -"
280 -DEPEND="${RDEPEND}
281 - doc? ( dev-python/sphinx )
282 -"
283 -
284 -S="${WORKDIR}/${MY_P}"
285 -
286 -SITEFILE="50${PN}-gentoo.el"
287 -
288 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
289 -
290 -PATCHES=(
291 - # prefix
292 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
293 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
294 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
295 -
296 - # handle gentoo packaging in find modules
297 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
298 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
299 - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
300 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
301 - "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
302 -
303 - # respect python eclasses
304 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
305 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
306 -
307 - # upstream fixes (can usually be removed with a version bump)
308 -)
309 -
310 -cmake_src_bootstrap() {
311 - # Cleanup args to extract only JOBS.
312 - # Because bootstrap does not know anything else.
313 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
314 - if [ $? -eq 0 ]; then
315 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
316 - par_arg="--parallel=${par_arg}"
317 - else
318 - par_arg="--parallel=1"
319 - fi
320 -
321 - # execinfo.h on Solaris isn't quite what it is on Darwin
322 - if [[ ${CHOST} == *-solaris* ]] ; then
323 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
324 - fi
325 -
326 - tc-export CC CXX LD
327 -
328 - # bootstrap script isn't exactly /bin/sh compatible
329 - ${CONFIG_SHELL:-sh} ./bootstrap \
330 - --prefix="${T}/cmakestrap/" \
331 - ${par_arg} \
332 - || die "Bootstrap failed"
333 -}
334 -
335 -cmake_src_test() {
336 - # fix OutDir and SelectLibraryConfigurations tests
337 - # these are altered thanks to our eclass
338 - sed -i -e 's:#IGNORE ::g' \
339 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
340 - || die
341 -
342 - pushd "${BUILD_DIR}" > /dev/null
343 -
344 - local ctestargs
345 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
346 -
347 - # Excluded tests:
348 - # BootstrapTest: we actualy bootstrap it every time so why test it.
349 - # BundleUtilities: bundle creation broken
350 - # CTest.updatecvs: which fails to commit as root
351 - # Fortran: requires fortran
352 - # Qt4Deploy, which tries to break sandbox and ignores prefix
353 - # TestUpload, which requires network access
354 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
355 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
356 - || die "Tests failed"
357 -
358 - popd > /dev/null
359 -}
360 -
361 -src_prepare() {
362 - cmake-utils_src_prepare
363 -
364 - # disable running of cmake in boostrap command
365 - sed -i \
366 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
367 - bootstrap || die "sed failed"
368 -
369 - # Add gcc libs to the default link paths
370 - sed -i \
371 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
372 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
373 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
374 -
375 - cmake_src_bootstrap
376 -}
377 -
378 -src_configure() {
379 - local mycmakeargs=(
380 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
381 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
382 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
383 - -DCMAKE_DOC_DIR=/share/doc/${PF}
384 - -DCMAKE_MAN_DIR=/share/man
385 - -DCMAKE_DATA_DIR=/share/${PN}
386 - -DSPHINX_MAN=$(usex doc)
387 - -DSPHINX_HTML=$(usex doc)
388 - -DBUILD_CursesDialog="$(usex ncurses)"
389 - )
390 -
391 - if use qt4 || use qt5 ; then
392 - mycmakeargs+=(
393 - -DBUILD_QtDialog=ON
394 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
395 - )
396 - fi
397 -
398 - cmake-utils_src_configure
399 -}
400 -
401 -src_compile() {
402 - cmake-utils_src_compile
403 - use emacs && elisp-compile Auxiliary/cmake-mode.el
404 -}
405 -
406 -src_test() {
407 - virtx cmake_src_test
408 -}
409 -
410 -src_install() {
411 - cmake-utils_src_install
412 -
413 - if use emacs; then
414 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
415 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
416 - fi
417 -
418 - insinto /usr/share/vim/vimfiles/syntax
419 - doins Auxiliary/cmake-syntax.vim
420 -
421 - insinto /usr/share/vim/vimfiles/indent
422 - doins Auxiliary/cmake-indent.vim
423 -
424 - insinto /usr/share/vim/vimfiles/ftdetect
425 - doins "${FILESDIR}/${PN}.vim"
426 -
427 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
428 -
429 - rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
430 -}
431 -
432 -pkg_postinst() {
433 - use emacs && elisp-site-regen
434 -}
435 -
436 -pkg_postrm() {
437 - use emacs && elisp-site-regen
438 -}