Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/
Date: Sun, 01 Jan 2017 16:32:28
Message-Id: 1483288329.8bcf2d24c9268d6f88f20421b3e8c2044c65f8ea.johu@gentoo
1 commit: 8bcf2d24c9268d6f88f20421b3e8c2044c65f8ea
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 1 15:50:01 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 16:32:09 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bcf2d24
7
8 dev-util/cmake: Remove 3.2.2
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-util/cmake/Manifest | 1 -
13 dev-util/cmake/cmake-3.2.2.ebuild | 187 --------------------------------------
14 2 files changed, 188 deletions(-)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index f2556fd..3abe160 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
22 DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
23 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
24 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
25
26 diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild
27 deleted file mode 100644
28 index 33916d4..00000000
29 --- a/dev-util/cmake/cmake-3.2.2.ebuild
30 +++ /dev/null
31 @@ -1,187 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI=5
37 -
38 -CMAKE_REMOVE_MODULES="no"
39 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
40 -
41 -DESCRIPTION="Cross platform Make"
42 -HOMEPAGE="http://www.cmake.org/"
43 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
44 -
45 -LICENSE="CMake"
46 -SLOT="0"
47 -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"
48 -IUSE="doc emacs system-jsoncpp ncurses qt5"
49 -
50 -RDEPEND="
51 - >=app-arch/libarchive-3.0.0:=
52 - >=dev-libs/expat-2.0.1
53 - >=net-misc/curl-7.20.0-r1[ssl]
54 - sys-libs/zlib
55 - virtual/pkgconfig
56 - emacs? ( virtual/emacs )
57 - ncurses? ( sys-libs/ncurses:0= )
58 - qt5? (
59 - dev-qt/qtcore:5
60 - dev-qt/qtgui:5
61 - dev-qt/qtwidgets:5
62 - )
63 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
64 -"
65 -DEPEND="${RDEPEND}
66 - doc? ( dev-python/sphinx )
67 -"
68 -
69 -SITEFILE="50${PN}-gentoo.el"
70 -
71 -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
72 -
73 -PATCHES=(
74 - # prefix
75 - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
76 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
77 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
78 -
79 - # handle gentoo packaging in find modules
80 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
81 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
82 - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
83 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
84 -
85 - # respect python eclasses
86 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
87 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
88 -)
89 -
90 -cmake_src_bootstrap() {
91 - # Cleanup args to extract only JOBS.
92 - # Because bootstrap does not know anything else.
93 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
94 - if [ $? -eq 0 ]; then
95 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
96 - par_arg="--parallel=${par_arg}"
97 - else
98 - par_arg="--parallel=1"
99 - fi
100 -
101 - # execinfo.h on Solaris isn't quite what it is on Darwin
102 - if [[ ${CHOST} == *-solaris* ]] ; then
103 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
104 - fi
105 -
106 - tc-export CC CXX LD
107 -
108 - # bootstrap script isn't exactly /bin/sh compatible
109 - ${CONFIG_SHELL:-sh} ./bootstrap \
110 - --prefix="${T}/cmakestrap/" \
111 - ${par_arg} \
112 - || die "Bootstrap failed"
113 -}
114 -
115 -cmake_src_test() {
116 - # fix OutDir and SelectLibraryConfigurations tests
117 - # these are altered thanks to our eclass
118 - sed -i -e 's:#IGNORE ::g' \
119 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
120 - || die
121 -
122 - pushd "${BUILD_DIR}" > /dev/null
123 -
124 - local ctestargs
125 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
126 -
127 - # Excluded tests:
128 - # BootstrapTest: we actualy bootstrap it every time so why test it.
129 - # BundleUtilities: bundle creation broken
130 - # CTest.updatecvs: which fails to commit as root
131 - # Fortran: requires fortran
132 - # Qt4Deploy, which tries to break sandbox and ignores prefix
133 - # TestUpload, which requires network access
134 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
135 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
136 - || die "Tests failed"
137 -
138 - popd > /dev/null
139 -}
140 -
141 -src_prepare() {
142 - cmake-utils_src_prepare
143 -
144 - # disable running of cmake in boostrap command
145 - sed -i \
146 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
147 - bootstrap || die "sed failed"
148 -
149 - # Add gcc libs to the default link paths
150 - sed -i \
151 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
152 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
153 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
154 -
155 - cmake_src_bootstrap
156 -}
157 -
158 -src_configure() {
159 - local mycmakeargs=(
160 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
161 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
162 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
163 - -DCMAKE_DOC_DIR=/share/doc/${PF}
164 - -DCMAKE_MAN_DIR=/share/man
165 - -DCMAKE_DATA_DIR=/share/${PN}
166 - -DSPHINX_MAN=$(usex doc)
167 - -DSPHINX_HTML=$(usex doc)
168 - $(cmake-utils_use_build ncurses CursesDialog)
169 - )
170 -
171 - if use qt5 ; then
172 - mycmakeargs+=(
173 - -DBUILD_QtDialog=ON
174 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
175 - )
176 - fi
177 -
178 - cmake-utils_src_configure
179 -}
180 -
181 -src_compile() {
182 - cmake-utils_src_compile
183 - use emacs && elisp-compile Auxiliary/cmake-mode.el
184 -}
185 -
186 -src_test() {
187 - VIRTUALX_COMMAND="cmake_src_test" virtualmake
188 -}
189 -
190 -src_install() {
191 - cmake-utils_src_install
192 -
193 - if use emacs; then
194 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
195 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
196 - fi
197 -
198 - insinto /usr/share/vim/vimfiles/syntax
199 - doins Auxiliary/cmake-syntax.vim
200 -
201 - insinto /usr/share/vim/vimfiles/indent
202 - doins Auxiliary/cmake-indent.vim
203 -
204 - insinto /usr/share/vim/vimfiles/ftdetect
205 - doins "${FILESDIR}/${PN}.vim"
206 -
207 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
208 -
209 - rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
210 -}
211 -
212 -pkg_postinst() {
213 - use emacs && elisp-site-regen
214 -}
215 -
216 -pkg_postrm() {
217 - use emacs && elisp-site-regen
218 -}