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: Mon, 10 Sep 2018 14:03:07
Message-Id: 1536588174.576c98c0dceb4dec24589cd0e40686589f2c71ea.polynomial-c@gentoo
1 commit: 576c98c0dceb4dec24589cd0e40686589f2c71ea
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 10 14:02:29 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 10 14:02:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=576c98c0
7
8 dev-util/cmake: Removed old.
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 dev-util/cmake/Manifest | 1 -
13 dev-util/cmake/cmake-3.12.0.ebuild | 220 -------------------------------------
14 2 files changed, 221 deletions(-)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index 78f0ec3a329..7cbfdc7da45 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -1,6 +1,5 @@
21 DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
22 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
23 -DIST cmake-3.12.0.tar.gz 8089372 BLAKE2B 73c36b65ce3a3e7377d4c7dc7ec6c9050adefab75a0c0f245d7b1f774951779a213de13fb8589f209bd9b74b912b3f6533fff7b16990a85ec0159ed6a1460a2b SHA512 e1d5764023d6c8dd4e8d087614e0329a097f1bc587c08c7d22ce7600867bcd7f6750d513458c7c4042570a9526060b89778243e6ea6137efb1727e409ca031ab
24 DIST cmake-3.12.1.tar.gz 8090272 BLAKE2B 081935b05bca26a0e4d515da9e76b62781d7bdbe00dc37c170b4905e5d3b1cffcb81d7a4ae1d1226034ffae927dc678a718e684a286cefae7278e988db284507 SHA512 7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692
25 DIST cmake-3.12.2.tar.gz 8388114 BLAKE2B 2bb28991527287da62d5416dfde3a9ff072534d52b124d1f73a555d7defb16f05300c78e4c258ba2d09d11cef285fe799c3d132cd1bd4e573aea67cb86beb2af SHA512 a2f44b2d77d9a3aa62273dbdeb94ad336c7430f41a31f48b4b395d170577b2b296d598ed9d1d548df95758b3fbf3ced193e1398fd701bc99792580798ec2a99d
26 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
27
28 diff --git a/dev-util/cmake/cmake-3.12.0.ebuild b/dev-util/cmake/cmake-3.12.0.ebuild
29 deleted file mode 100644
30 index b39aafffcc5..00000000000
31 --- a/dev-util/cmake/cmake-3.12.0.ebuild
32 +++ /dev/null
33 @@ -1,220 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -CMAKE_MAKEFILE_GENERATOR="emake"
40 -CMAKE_REMOVE_MODULES="no"
41 -inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
42 -
43 -MY_P="${P/_/-}"
44 -
45 -DESCRIPTION="Cross platform Make"
46 -HOMEPAGE="https://cmake.org/"
47 -SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
48 -
49 -LICENSE="CMake"
50 -SLOT="0"
51 -[[ "${PV}" = *_rc* ]] || \
52 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
53 -IUSE="doc emacs system-jsoncpp ncurses qt5"
54 -
55 -RDEPEND="
56 - app-crypt/rhash
57 - >=app-arch/libarchive-3.0.0:=
58 - >=dev-libs/expat-2.0.1
59 - >=dev-libs/libuv-1.10.0:=
60 - >=net-misc/curl-7.21.5[ssl]
61 - sys-libs/zlib
62 - virtual/pkgconfig
63 - emacs? ( virtual/emacs )
64 - ncurses? ( sys-libs/ncurses:0= )
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 -PATCHES=(
81 - # prefix
82 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
83 - "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
84 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
85 -
86 - # handle gentoo packaging in find modules
87 - "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.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.9.0_rc2-FindPythonInterp.patch
94 -
95 - # boost (#660980)
96 - "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
97 -
98 - # upstream fixes (can usually be removed with a version bump)
99 -)
100 -
101 -cmake_src_bootstrap() {
102 - # Cleanup args to extract only JOBS.
103 - # Because bootstrap does not know anything else.
104 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
105 - if [ $? -eq 0 ]; then
106 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
107 - par_arg="--parallel=${par_arg}"
108 - else
109 - par_arg="--parallel=1"
110 - fi
111 -
112 - # disable running of cmake in boostrap command
113 - sed -i \
114 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
115 - bootstrap || die "sed failed"
116 -
117 - # execinfo.h on Solaris isn't quite what it is on Darwin
118 - if [[ ${CHOST} == *-solaris* ]] ; then
119 - sed -i -e 's/execinfo\.h/blablabla.h/' \
120 - Source/kwsys/CMakeLists.txt || die
121 - fi
122 -
123 - tc-export CC CXX LD
124 -
125 - # bootstrap script isn't exactly /bin/sh compatible
126 - ${CONFIG_SHELL:-sh} ./bootstrap \
127 - --prefix="${T}/cmakestrap/" \
128 - ${par_arg} \
129 - || die "Bootstrap failed"
130 -}
131 -
132 -cmake_src_test() {
133 - # fix OutDir and SelectLibraryConfigurations tests
134 - # these are altered thanks to our eclass
135 - sed -i -e 's:#IGNORE ::g' \
136 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
137 - || die
138 -
139 - pushd "${BUILD_DIR}" > /dev/null
140 -
141 - local ctestargs
142 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
143 -
144 - # Excluded tests:
145 - # BootstrapTest: we actualy bootstrap it every time so why test it.
146 - # BundleUtilities: bundle creation broken
147 - # CTest.updatecvs: which fails to commit as root
148 - # Fortran: requires fortran
149 - # Qt4Deploy, which tries to break sandbox and ignores prefix
150 - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
151 - # debugedit binary is not in the expected location
152 - # TestUpload, which requires network access
153 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
154 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
155 - || die "Tests failed"
156 -
157 - popd > /dev/null
158 -}
159 -
160 -src_prepare() {
161 - cmake-utils_src_prepare
162 -
163 - # disable Xcode hooks, bug #652134
164 - if [[ ${CHOST} == *-darwin* ]] ; then
165 - sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
166 - Source/cmGlobalXCodeGenerator.cxx || die
167 - fi
168 -
169 - # Add gcc libs to the default link paths
170 - sed -i \
171 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
172 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
173 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
174 - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
175 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
176 - cmake_src_bootstrap
177 - fi
178 -}
179 -
180 -src_configure() {
181 - # Fix linking on Solaris
182 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
183 -
184 - local mycmakeargs=(
185 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
186 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
187 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
188 - -DCMAKE_DOC_DIR=/share/doc/${PF}
189 - -DCMAKE_MAN_DIR=/share/man
190 - -DCMAKE_DATA_DIR=/share/${PN}
191 - -DSPHINX_MAN=$(usex doc)
192 - -DSPHINX_HTML=$(usex doc)
193 - -DBUILD_CursesDialog="$(usex ncurses)"
194 - )
195 -
196 - if use qt5 ; then
197 - mycmakeargs+=(
198 - -DBUILD_QtDialog=ON
199 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
200 - )
201 - fi
202 -
203 - cmake-utils_src_configure
204 -}
205 -
206 -src_compile() {
207 - cmake-utils_src_compile
208 - use emacs && elisp-compile Auxiliary/cmake-mode.el
209 -}
210 -
211 -src_test() {
212 - virtx cmake_src_test
213 -}
214 -
215 -src_install() {
216 - cmake-utils_src_install
217 -
218 - if use emacs; then
219 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
220 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
221 - fi
222 -
223 - insinto /usr/share/vim/vimfiles/syntax
224 - doins Auxiliary/vim/syntax/cmake.vim
225 -
226 - insinto /usr/share/vim/vimfiles/indent
227 - doins Auxiliary/vim/indent/cmake.vim
228 -
229 - insinto /usr/share/vim/vimfiles/ftdetect
230 - doins "${FILESDIR}/${PN}.vim"
231 -
232 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
233 -
234 - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
235 -}
236 -
237 -pkg_postinst() {
238 - use emacs && elisp-site-regen
239 - if use qt5; then
240 - gnome2_icon_cache_update
241 - xdg_desktop_database_update
242 - xdg_mimeinfo_database_update
243 - fi
244 -}
245 -
246 -pkg_postrm() {
247 - use emacs && elisp-site-regen
248 - if use qt5; then
249 - gnome2_icon_cache_update
250 - xdg_desktop_database_update
251 - xdg_mimeinfo_database_update
252 - fi
253 -}