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