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: Thu, 01 Jun 2017 09:20:13
Message-Id: 1496308805.62a901c54f8af27762050ec6d7e02c6fc8b50a06.polynomial-c@gentoo
1 commit: 62a901c54f8af27762050ec6d7e02c6fc8b50a06
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 1 09:19:40 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 1 09:20:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a901c5
7
8 dev-util/cmake: Removed old.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-util/cmake/Manifest | 1 -
13 dev-util/cmake/cmake-3.8.0-r1.ebuild | 201 -----------------------------------
14 2 files changed, 202 deletions(-)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index d228f1fdcdd..c769d18a29f 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -1,5 +1,4 @@
21 DIST cmake-3.7.2-x32.patch.xz 7204 SHA256 d04cc6dc7ffbb8e16426e85f50e3f3c3037fb42a0e746d0604a412a00d31444e SHA512 36140132ecbe05d07b167e2895c2909ed545371af0962cb8246beb61a400fad14f56394c90cc2319e4581d5e97116069bebe466b87451a9a83f04095ce9b0510 WHIRLPOOL 07f49188fc6d7f6eb005f8e82526c33401b7ee8ff7839c4620280774650f9be9af9aafefb6a1f9ff2648316123aa1232b53924ef9dda3ce2268f01560d53606a
22 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
23 -DIST cmake-3.8.0.tar.gz 7503379 SHA256 cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 SHA512 a261088073ab41c41b461d155bead82b580225c8a4d32884715fba5eeb892acb2f73ae0484e823d7c33c9e29f331ec34ca223987f05e3ceb9a2f9b7defef17bf WHIRLPOOL d3a38fd5079effd6d9da3e21939a39019ee332768925f311bd799047c57f83918ee204a51abbe2f422c4200577b8c15e483fa8059be7863eb13196cc443d7e39
24 DIST cmake-3.8.1.tar.gz 7503955 SHA256 ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228 SHA512 2164f502900a803928f2df3168fb5094de05392fd62d30c55d08de89bdd4ba7323255e724cbca260202edf1691bd5c6be63c585f75ff9d36bd0d35b816c2fde0 WHIRLPOOL 6ef8f4bcd5186e6efb3aa95a6f09ab686ee21adbe049d74c75e6c2a60ecf2d61328a06b14e4a15eb421bd495dfee128c30a50c299c8681640e1deff546e9309c
25 DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f WHIRLPOOL 8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
26
27 diff --git a/dev-util/cmake/cmake-3.8.0-r1.ebuild b/dev-util/cmake/cmake-3.8.0-r1.ebuild
28 deleted file mode 100644
29 index 98921d9a61a..00000000000
30 --- a/dev-util/cmake/cmake-3.8.0-r1.ebuild
31 +++ /dev/null
32 @@ -1,201 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -CMAKE_REMOVE_MODULES="no"
39 -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic
40 -
41 -MY_P="${P/_/-}"
42 -
43 -DESCRIPTION="Cross platform Make"
44 -HOMEPAGE="http://www.cmake.org/"
45 -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
46 -
47 -LICENSE="CMake"
48 -SLOT="0"
49 -[[ "${PV}" = *_rc* ]] || \
50 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~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"
51 -IUSE="doc emacs server system-jsoncpp ncurses qt5"
52 -
53 -RDEPEND="
54 - app-crypt/rhash
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 - qt5? (
63 - dev-qt/qtcore:5
64 - dev-qt/qtgui:5
65 - dev-qt/qtwidgets:5
66 - )
67 - server? ( >=dev-libs/libuv-1.0.0:= )
68 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
69 -"
70 -DEPEND="${RDEPEND}
71 - doc? ( dev-python/sphinx )
72 -"
73 -
74 -S="${WORKDIR}/${MY_P}"
75 -
76 -SITEFILE="50${PN}-gentoo.el"
77 -
78 -PATCHES=(
79 - # prefix
80 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
81 - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
82 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
83 -
84 - # handle gentoo packaging in find modules
85 - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
86 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
87 - "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
88 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
89 - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
90 -
91 - # respect python eclasses
92 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
93 - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
94 -
95 - # upstream fixes (can usually be removed with a version bump)
96 -)
97 -
98 -cmake_src_bootstrap() {
99 - # Cleanup args to extract only JOBS.
100 - # Because bootstrap does not know anything else.
101 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
102 - if [ $? -eq 0 ]; then
103 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
104 - par_arg="--parallel=${par_arg}"
105 - else
106 - par_arg="--parallel=1"
107 - fi
108 -
109 - # disable running of cmake in boostrap command
110 - sed -i \
111 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
112 - bootstrap || die "sed failed"
113 -
114 - # execinfo.h on Solaris isn't quite what it is on Darwin
115 - if [[ ${CHOST} == *-solaris* ]] ; then
116 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
117 - fi
118 -
119 - tc-export CC CXX LD
120 -
121 - # bootstrap script isn't exactly /bin/sh compatible
122 - ${CONFIG_SHELL:-sh} ./bootstrap \
123 - --prefix="${T}/cmakestrap/" \
124 - ${par_arg} \
125 - || die "Bootstrap failed"
126 -}
127 -
128 -cmake_src_test() {
129 - # fix OutDir and SelectLibraryConfigurations tests
130 - # these are altered thanks to our eclass
131 - sed -i -e 's:#IGNORE ::g' \
132 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
133 - || die
134 -
135 - pushd "${BUILD_DIR}" > /dev/null
136 -
137 - local ctestargs
138 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
139 -
140 - # Excluded tests:
141 - # BootstrapTest: we actualy bootstrap it every time so why test it.
142 - # BundleUtilities: bundle creation broken
143 - # CTest.updatecvs: which fails to commit as root
144 - # Fortran: requires fortran
145 - # Qt4Deploy, which tries to break sandbox and ignores prefix
146 - # TestUpload, which requires network access
147 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
148 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
149 - || die "Tests failed"
150 -
151 - popd > /dev/null
152 -}
153 -
154 -src_prepare() {
155 - cmake-utils_src_prepare
156 -
157 - # Add gcc libs to the default link paths
158 - sed -i \
159 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
160 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
161 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
162 - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
163 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
164 - cmake_src_bootstrap
165 - fi
166 -}
167 -
168 -src_configure() {
169 - # Fix linking on Solaris
170 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
171 -
172 - local mycmakeargs=(
173 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
174 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
175 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
176 - -DCMAKE_DOC_DIR=/share/doc/${PF}
177 - -DCMAKE_MAN_DIR=/share/man
178 - -DCMAKE_DATA_DIR=/share/${PN}
179 - -DSPHINX_MAN=$(usex doc)
180 - -DSPHINX_HTML=$(usex doc)
181 - -DBUILD_CursesDialog="$(usex ncurses)"
182 - -DCMake_ENABLE_SERVER_MODE="$(usex server)"
183 - -DCMAKE_USE_LIBUV="$(usex server)"
184 - )
185 -
186 - if 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/vim/syntax/cmake.vim
215 -
216 - insinto /usr/share/vim/vimfiles/indent
217 - doins Auxiliary/vim/indent/cmake.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 -r "${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 -}