Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/
Date: Fri, 22 May 2020 14:09:52
Message-Id: 1590156567.45e749f262041fcdfe339865e44d4595e2965049.asturm@gentoo
1 commit: 45e749f262041fcdfe339865e44d4595e2965049
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 22 11:41:55 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri May 22 14:09:27 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e749f2
7
8 dev-util/cmake: Drop 3.14.6
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 -
14 dev-util/cmake/cmake-3.14.6.ebuild | 226 -------------------------------------
15 2 files changed, 227 deletions(-)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index b4299f9ee45..5d0807b7869 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -1,4 +1,3 @@
22 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
23 -DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
24 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
25 DIST cmake-3.17.2.tar.gz 9469251 BLAKE2B 85818c6346ee600a0185687809b666a3186831d590680bba8a41d6d52cd3852ce84fdac240100a7b91f06897a779e1e44b67d9a8da4e806347c9a4a46dab354d SHA512 4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2
26
27 diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
28 deleted file mode 100644
29 index f3f66749b58..00000000000
30 --- a/dev-util/cmake/cmake-3.14.6.ebuild
31 +++ /dev/null
32 @@ -1,226 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -CMAKE_MAKEFILE_GENERATOR="emake"
39 -CMAKE_REMOVE_MODULES_LIST=( none )
40 -inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
41 -
42 -MY_P="${P/_/-}"
43 -
44 -DESCRIPTION="Cross platform Make"
45 -HOMEPAGE="https://cmake.org/"
46 -SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
47 -
48 -LICENSE="CMake"
49 -SLOT="0"
50 -[[ "${PV}" = *_rc* ]] || \
51 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
52 -IUSE="doc emacs system-jsoncpp ncurses qt5 test"
53 -RESTRICT="!test? ( test )"
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? ( >=app-editors/emacs-23.1:* )
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 -BDEPEND="
74 - doc? (
75 - dev-python/requests
76 - dev-python/sphinx
77 - )
78 -"
79 -
80 -S="${WORKDIR}/${MY_P}"
81 -
82 -SITEFILE="50${PN}-gentoo.el"
83 -
84 -PATCHES=(
85 - # prefix
86 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
87 - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
88 - # Next patch requires new work from prefix people
89 - #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
90 -
91 - # handle gentoo packaging in find modules
92 - "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
93 - "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
94 - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
95 -
96 - # respect python eclasses
97 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
98 - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
99 -
100 - # upstream fixes (can usually be removed with a version bump)
101 -)
102 -
103 -cmake_src_bootstrap() {
104 - # Cleanup args to extract only JOBS.
105 - # Because bootstrap does not know anything else.
106 - grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
107 - if [[ $? -eq 0 ]] ; then
108 - par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
109 - par_arg="--parallel=${par_arg}"
110 - else
111 - par_arg="--parallel=1"
112 - fi
113 -
114 - # disable running of cmake in boostrap command
115 - sed -i \
116 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
117 - bootstrap || die "sed failed"
118 -
119 - # execinfo.h on Solaris isn't quite what it is on Darwin
120 - if [[ ${CHOST} == *-solaris* ]] ; then
121 - sed -i -e 's/execinfo\.h/blablabla.h/' \
122 - Source/kwsys/CMakeLists.txt || die
123 - fi
124 -
125 - tc-export CC CXX LD
126 -
127 - # bootstrap script isn't exactly /bin/sh compatible
128 - ${CONFIG_SHELL:-sh} ./bootstrap \
129 - --prefix="${T}/cmakestrap/" \
130 - ${par_arg} \
131 - || die "Bootstrap failed"
132 -}
133 -
134 -cmake_src_test() {
135 - # fix OutDir and SelectLibraryConfigurations tests
136 - # these are altered thanks to our eclass
137 - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
138 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
139 - || die
140 -
141 - pushd "${BUILD_DIR}" > /dev/null
142 -
143 - local ctestargs
144 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
145 -
146 - # Excluded tests:
147 - # BootstrapTest: we actualy bootstrap it every time so why test it.
148 - # BundleUtilities: bundle creation broken
149 - # CMakeOnly.AllFindModules: pthread issues
150 - # CTest.updatecvs: which fails to commit as root
151 - # Fortran: requires fortran
152 - # RunCMake.CompilerLauncher: also requires fortran
153 - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
154 - # debugedit binary is not in the expected location
155 - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
156 - # it can't find a deb package that owns libc
157 - # TestUpload, which requires network access
158 - "${BUILD_DIR}"/bin/ctest \
159 - -j "$(makeopts_jobs)" \
160 - --test-load "$(makeopts_loadavg)" \
161 - ${ctestargs} \
162 - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
163 - || die "Tests failed"
164 -
165 - popd > /dev/null
166 -}
167 -
168 -src_prepare() {
169 - cmake_src_prepare
170 -
171 - # disable Xcode hooks, bug #652134
172 - if [[ ${CHOST} == *-darwin* ]] ; then
173 - sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
174 - Source/cmGlobalXCodeGenerator.cxx || die
175 - fi
176 -
177 - # Add gcc libs to the default link paths
178 - sed -i \
179 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
180 - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
181 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
182 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
183 - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
184 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
185 - cmake_src_bootstrap
186 - fi
187 -}
188 -
189 -src_configure() {
190 - # Fix linking on Solaris
191 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
192 -
193 - local mycmakeargs=(
194 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
195 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
196 - -DCMAKE_DOC_DIR=/share/doc/${PF}
197 - -DCMAKE_MAN_DIR=/share/man
198 - -DCMAKE_DATA_DIR=/share/${PN}
199 - -DSPHINX_MAN=$(usex doc)
200 - -DSPHINX_HTML=$(usex doc)
201 - -DBUILD_CursesDialog="$(usex ncurses)"
202 - -DBUILD_TESTING=$(usex test)
203 - )
204 -
205 - if use qt5 ; then
206 - mycmakeargs+=(
207 - -DBUILD_QtDialog=ON
208 - $(cmake_use_find_package qt5 Qt5Widgets)
209 - )
210 - fi
211 -
212 - cmake_src_configure
213 -}
214 -
215 -src_compile() {
216 - cmake_src_compile
217 - use emacs && elisp-compile Auxiliary/cmake-mode.el
218 -}
219 -
220 -src_test() {
221 - virtx cmake_src_test
222 -}
223 -
224 -src_install() {
225 - cmake_src_install
226 -
227 - if use emacs; then
228 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
229 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
230 - fi
231 -
232 - insinto /usr/share/vim/vimfiles/syntax
233 - doins Auxiliary/vim/syntax/cmake.vim
234 -
235 - insinto /usr/share/vim/vimfiles/indent
236 - doins Auxiliary/vim/indent/cmake.vim
237 -
238 - insinto /usr/share/vim/vimfiles/ftdetect
239 - doins "${FILESDIR}/${PN}.vim"
240 -
241 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
242 -
243 - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
244 -}
245 -
246 -pkg_preinst() {
247 - use qt5 && xdg_pkg_preinst
248 -}
249 -
250 -pkg_postinst() {
251 - use emacs && elisp-site-regen
252 - use qt5 && xdg_pkg_postinst
253 -}
254 -
255 -pkg_postrm() {
256 - use emacs && elisp-site-regen
257 - use qt5 && xdg_pkg_postrm
258 -}