Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/
Date: Fri, 23 Sep 2022 02:09:29
Message-Id: 1663898933.72a673cfdf000f3b9013eb8f661221a2e54fd465.sam@gentoo
1 commit: 72a673cfdf000f3b9013eb8f661221a2e54fd465
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 23 02:04:29 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 23 02:08:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72a673cf
7
8 dev-util/cmake: drop 3.24.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-util/cmake/Manifest | 4 -
13 dev-util/cmake/cmake-3.24.1.ebuild | 293 -------------------------------------
14 2 files changed, 297 deletions(-)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index eeb6d5a25a23..c78232995d72 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -1,10 +1,6 @@
21 DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f
22 DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9
23 DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
24 -DIST cmake-3.24.1-SHA-256.txt 1646 BLAKE2B 0b72b78803e6b6e8055f68895203bcf8e4dfd0fdac43113bcece89d022ae38428c8363e12182f23954ae529a3e98d64c16770ad53f597a6d4100a72053ce10f5 SHA512 6302a8f3370f94415af6a2a1852b15f56fb58a67f895b3d99c6f2a084dd99437a94cf48bccdebed5b96e20aa9f52daff87e1037f1c62aff21b7a138f051375cc
25 -DIST cmake-3.24.1-SHA-256.txt.asc 833 BLAKE2B 2e77922c732e654b40a40043b85ec4794886107cc09765d0a80ea05efad08711046bafd5ae341fb16904129cc7af75e6f4d2d1103e767a9147cca6a6a975b1fd SHA512 b04a73cc483d51d5eafab7153b53e366220db2bad4b1d78fea9aec82e667434b8a27ae522be96b5f6a38e43c84aa3475f86c55c088a6149b03ec98c682b3cc4a
26 -DIST cmake-3.24.1-docs.tar.xz 491808 BLAKE2B 5bafdcb5b705581fbb63e9733d37ca10b8fa1803ea471afb723e26421989cb3b204952640438db11425e3bb536267bbb3e0bb6e618bee2cd4662517201aa1196 SHA512 8181dd4cbf066d42af620ee265cbd6eac0d2edf744706ec63909ac819458c1dd3f118129f54255e1f27a61af6a0ae4d72a2dc066ca5fd3e747962b9a8b3f9bee
27 -DIST cmake-3.24.1.tar.gz 10392868 BLAKE2B 628e2610c01af8e03eb7a201ae56a6e909c63314a993d2066f363d6181cfd2d0a0e5c09e9f74ad5ae3d226e15c2b04be250dc9bf1a273158fa3073bcc05c3a8e SHA512 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289
28 DIST cmake-3.24.2-SHA-256.txt 1646 BLAKE2B 3c48226c96844c5ddd8567637a61eca697425021735d5dc8613a1fd7a68887f6707b6030c1e4476af5e4bdb4830cc4ff3d8708f4bdf557ba94508086e0447030 SHA512 f7500d8c9a500c9ad2679a68d6343cbbbae1483014ab2cd48a056e1e9591b6edd0d712e9ff5441e19c05284696e6c52ebdc3cf1efc61432f2764da7703816b49
29 DIST cmake-3.24.2-SHA-256.txt.asc 833 BLAKE2B fe6a3caa3db7b6be186e49ee5d86706f2cda9a45858bc964be5407f577195d0af74c10e66ea30faa0a35280f1c9f927732f9cc7fcb9dae8e521882955b6ef617 SHA512 a0fa1a002f2f23e8b3b8fb2689905ac618ca423b96f904bee172d6a62e6fb0c0a46394ce57474be9c9810e1d09abf3b192f595cb0e92d5c62d11b60f0c572b82
30 DIST cmake-3.24.2-docs.tar.xz 492188 BLAKE2B 64e0d69ce8e739e6622b0cfde8956cb2bf67f9bf412b8d98afa1657bd30d8a2a1cf874e6422c78c222199616aac85d472ef398c83da29d5d64516384e9ed69aa SHA512 d0ef81dfe37ac2a225fe795fd3e6780e3b8fd5caa472a14ff8d036917172efd13126897c7a2a78d8269aa20e4f35c7b9be7bed14ecbfb24df332c332a4ff16c4
31
32 diff --git a/dev-util/cmake/cmake-3.24.1.ebuild b/dev-util/cmake/cmake-3.24.1.ebuild
33 deleted file mode 100644
34 index 9491df325a39..000000000000
35 --- a/dev-util/cmake/cmake-3.24.1.ebuild
36 +++ /dev/null
37 @@ -1,293 +0,0 @@
38 -# Copyright 1999-2022 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=8
42 -
43 -# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
44 -# Set to 1 if prebuilt, 0 if not
45 -# (the construct below is to allow overriding from env for script)
46 -: ${CMAKE_DOCS_PREBUILT:=1}
47 -
48 -CMAKE_DOCS_PREBUILT_DEV=sam
49 -CMAKE_DOCS_VERSION=$(ver_cut 1-3)
50 -# Default to generating docs (inc. man pages) if no prebuilt; overridden later
51 -# See bug #784815
52 -CMAKE_DOCS_USEFLAG="+doc"
53 -
54 -# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
55 -# ... but seems fine as of 3.22.3?
56 -# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
57 -CMAKE_MAKEFILE_GENERATOR="emake"
58 -CMAKE_REMOVE_MODULES_LIST=( none )
59 -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
60 - toolchain-funcs virtualx xdg-utils
61 -
62 -MY_P="${P/_/-}"
63 -
64 -DESCRIPTION="Cross platform Make"
65 -HOMEPAGE="https://cmake.org/"
66 -if [[ ${PV} == 9999 ]] ; then
67 - CMAKE_DOCS_PREBUILT=0
68 -
69 - EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
70 - inherit git-r3
71 -else
72 - SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
73 -
74 - if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
75 - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
76 - fi
77 -
78 - if [[ ${PV} != *_rc* ]] ; then
79 - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
80 - inherit verify-sig
81 -
82 - SRC_URI+=" verify-sig? (
83 - https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
84 - https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
85 - )"
86 -
87 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
88 -
89 - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
90 - fi
91 -fi
92 -
93 -[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
94 -
95 -S="${WORKDIR}/${MY_P}"
96 -
97 -LICENSE="CMake"
98 -SLOT="0"
99 -IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
100 -RESTRICT="!test? ( test )"
101 -
102 -RDEPEND="
103 - >=app-arch/libarchive-3.3.3:=
104 - app-crypt/rhash
105 - >=dev-libs/expat-2.0.1
106 - >=dev-libs/jsoncpp-1.9.2-r2:0=
107 - >=dev-libs/libuv-1.10.0:=
108 - >=net-misc/curl-7.21.5[ssl]
109 - sys-libs/zlib
110 - virtual/pkgconfig
111 - emacs? ( >=app-editors/emacs-23.1:* )
112 - ncurses? ( sys-libs/ncurses:0= )
113 - qt5? (
114 - dev-qt/qtcore:5
115 - dev-qt/qtgui:5
116 - dev-qt/qtwidgets:5
117 - )
118 -"
119 -DEPEND="${RDEPEND}"
120 -BDEPEND+="
121 - doc? (
122 - dev-python/requests
123 - dev-python/sphinx
124 - )
125 - test? ( app-arch/libarchive[zstd] )
126 -"
127 -
128 -SITEFILE="50${PN}-gentoo.el"
129 -
130 -PATCHES=(
131 - # Prefix
132 - "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
133 - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
134 - "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
135 -
136 - # Handle gentoo packaging in find modules
137 - "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
138 - # Next patch needs to be reworked
139 - #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
140 - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
141 -
142 - # Respect python eclasses
143 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
144 - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
145 -
146 - "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
147 -
148 - # upstream fixes (can usually be removed with a version bump)
149 -)
150 -
151 -cmake_src_bootstrap() {
152 - # disable running of cmake in bootstrap command
153 - sed -i \
154 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
155 - bootstrap || die "sed failed"
156 -
157 - # execinfo.h on Solaris isn't quite what it is on Darwin
158 - if [[ ${CHOST} == *-solaris* ]] ; then
159 - sed -i -e 's/execinfo\.h/blablabla.h/' \
160 - Source/kwsys/CMakeLists.txt || die
161 - fi
162 -
163 - # bootstrap script isn't exactly /bin/sh compatible
164 - tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
165 - --prefix="${T}/cmakestrap/" \
166 - --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
167 - || die "Bootstrap failed"
168 -}
169 -
170 -src_unpack() {
171 - if [[ ${PV} == 9999 ]] ; then
172 - git-r3_src_unpack
173 - elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
174 - default
175 - else
176 - cd "${DISTDIR}" || die
177 -
178 - # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
179 - verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
180 - verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
181 -
182 - cd "${WORKDIR}" || die
183 -
184 - default
185 - fi
186 -}
187 -
188 -src_prepare() {
189 - cmake_src_prepare
190 -
191 - if [[ ${CHOST} == *-darwin* ]] ; then
192 - # Disable Xcode hooks, bug #652134
193 - sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
194 - Source/CMakeLists.txt || die
195 - sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
196 - -e '/cmGlobalXCodeGenerator.h/d' \
197 - Source/cmake.cxx || die
198 -
199 - # Disable isysroot usage with GCC, we've properly instructed
200 - # where things are via GCC configuration and ldwrapper
201 - sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
202 - Modules/Platform/Apple-GNU-*.cmake || die
203 - # Disable isysroot usage with clang as well
204 - sed -i -e '/_SYSROOT_FLAG/d' \
205 - Modules/Platform/Apple-Clang.cmake || die
206 - # Don't set a POSIX standard, system headers don't like that, #757426
207 - sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
208 - Source/cmLoadCommandCommand.cxx \
209 - Source/cmStandardLexer.h \
210 - Source/cmSystemTools.cxx \
211 - Source/cmTimestamp.cxx
212 - sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
213 - Source/cmStandardLexer.h
214 - fi
215 -
216 - # Add gcc libs to the default link paths
217 - sed -i \
218 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
219 - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
220 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
221 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
222 -
223 - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
224 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
225 - cmake_src_bootstrap
226 - fi
227 -}
228 -
229 -src_configure() {
230 - # Fix linking on Solaris
231 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
232 -
233 - # ODR warnings, bug #858335
234 - # https://gitlab.kitware.com/cmake/cmake/-/issues/20740
235 - filter-lto
236 -
237 - local mycmakeargs=(
238 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
239 - -DCMAKE_DOC_DIR=/share/doc/${PF}
240 - -DCMAKE_MAN_DIR=/share/man
241 - -DCMAKE_DATA_DIR=/share/${PN}
242 - -DSPHINX_MAN=$(usex doc)
243 - -DSPHINX_HTML=$(usex doc)
244 - -DBUILD_CursesDialog="$(usex ncurses)"
245 - -DBUILD_TESTING=$(usex test)
246 - )
247 - use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
248 -
249 - cmake_src_configure
250 -}
251 -
252 -src_compile() {
253 - cmake_src_compile
254 - use emacs && elisp-compile Auxiliary/cmake-mode.el
255 -}
256 -
257 -src_test() {
258 - # Fix OutDir and SelectLibraryConfigurations tests
259 - # these are altered thanks to our eclass
260 - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
261 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
262 - || die
263 -
264 - pushd "${BUILD_DIR}" > /dev/null || die
265 -
266 - # Excluded tests:
267 - # BootstrapTest: we actualy bootstrap it every time so why test it.
268 - # BundleUtilities: bundle creation broken
269 - # CMakeOnly.AllFindModules: pthread issues
270 - # CTest.updatecvs: which fails to commit as root
271 - # Fortran: requires fortran
272 - # RunCMake.CompilerLauncher: also requires fortran
273 - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
274 - # debugedit binary is not in the expected location
275 - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
276 - # it can't find a deb package that owns libc
277 - # TestUpload, which requires network access
278 - # RunCMake.CMP0125, known failure reported upstream (bug #829414)
279 - local myctestargs=(
280 - --output-on-failure
281 - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
282 - )
283 -
284 - virtx cmake_src_test
285 -}
286 -
287 -src_install() {
288 - cmake_src_install
289 -
290 - # If USE=doc, there'll be newly generated docs which we install instead.
291 - if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
292 - doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
293 - fi
294 -
295 - if use emacs; then
296 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
297 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
298 - fi
299 -
300 - insinto /usr/share/vim/vimfiles/syntax
301 - doins Auxiliary/vim/syntax/cmake.vim
302 -
303 - insinto /usr/share/vim/vimfiles/indent
304 - doins Auxiliary/vim/indent/cmake.vim
305 -
306 - insinto /usr/share/vim/vimfiles/ftdetect
307 - doins "${FILESDIR}/${PN}.vim"
308 -
309 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
310 -}
311 -
312 -pkg_postinst() {
313 - use emacs && elisp-site-regen
314 -
315 - if use qt5; then
316 - xdg_icon_cache_update
317 - xdg_desktop_database_update
318 - xdg_mimeinfo_database_update
319 - fi
320 -}
321 -
322 -pkg_postrm() {
323 - use emacs && elisp-site-regen
324 -
325 - if use qt5; then
326 - xdg_icon_cache_update
327 - xdg_desktop_database_update
328 - xdg_mimeinfo_database_update
329 - fi
330 -}