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: Sun, 27 Feb 2022 23:57:33
Message-Id: 1646006242.95f1bd1ecf96652ec86a59a6813a0a509d5f74c6.asturm@gentoo
1 commit: 95f1bd1ecf96652ec86a59a6813a0a509d5f74c6
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 27 23:57:22 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 27 23:57:22 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f1bd1e
7
8 dev-util/cmake: Drop 3.20.5
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 -
14 dev-util/cmake/cmake-3.20.5.ebuild | 232 -------------------------------------
15 2 files changed, 233 deletions(-)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index cf695f225f19..fa3b5c645599 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -1,4 +1,3 @@
22 -DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
23 DIST cmake-3.21.4.tar.gz 9630991 BLAKE2B ca6b6c50d984cc6713f3e88e1a6438c360d80c34927e60a20cc006ba47df2b91a290f1578d556f58d2d40711848a9b9caf36f65a043df892b81c1d48e3edb0d8 SHA512 0262a666f6da106576c26215580c40b54497bcdac400e847e1799716c31c71068293e719416338132a7da6122826c08ff50ac23dfed2711ab42631e96303f544
24 DIST cmake-3.22.2.tar.gz 9779456 BLAKE2B 5f1c76344fe2d6fba012b0d745dc990ec1ed4bf32c99beac1e538f4b83c1d695aee757d2780e635b67c0a185935a6a70b344a733259e3a91d01c4b83e94e2730 SHA512 86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f
25 DIST cmake-3.23.0-rc1.tar.gz 9974071 BLAKE2B d4f3c6003ac36fb899a13a75c1ba8b25ecf233e939bcf88c4a63ae89837a5d3260e3c3458bea30cc59f64bf26742a15f2b6a27a3f98fc6339f137e0d1fa37a1b SHA512 c476ec038f5f2241765d7fd2f9afb5a0ff5969901b12cba43cf4b7ad507535c968833022ce1f293e3fab692e04b664809b5d66edc7d76e76a843c9634b3d86c6
26
27 diff --git a/dev-util/cmake/cmake-3.20.5.ebuild b/dev-util/cmake/cmake-3.20.5.ebuild
28 deleted file mode 100644
29 index 466c27ca2e7b..000000000000
30 --- a/dev-util/cmake/cmake-3.20.5.ebuild
31 +++ /dev/null
32 @@ -1,232 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
39 -CMAKE_REMOVE_MODULES_LIST=( none )
40 -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
41 - toolchain-funcs virtualx xdg-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
53 -IUSE="doc emacs ncurses qt5 test"
54 -RESTRICT="!test? ( test )"
55 -
56 -RDEPEND="
57 - >=app-arch/libarchive-3.3.3:=
58 - app-crypt/rhash
59 - >=dev-libs/expat-2.0.1
60 - >=dev-libs/jsoncpp-1.9.2-r2:0=
61 - >=dev-libs/libuv-1.10.0:=
62 - >=net-misc/curl-7.21.5[ssl]
63 - sys-libs/zlib
64 - virtual/pkgconfig
65 - emacs? ( >=app-editors/emacs-23.1:* )
66 - ncurses? ( sys-libs/ncurses:0= )
67 - qt5? (
68 - dev-qt/qtcore:5
69 - dev-qt/qtgui:5
70 - dev-qt/qtwidgets:5
71 - )
72 -"
73 -DEPEND="${RDEPEND}"
74 -BDEPEND="
75 - doc? (
76 - dev-python/requests
77 - dev-python/sphinx
78 - )
79 - test? ( app-arch/libarchive[zstd] )
80 -"
81 -
82 -S="${WORKDIR}/${MY_P}"
83 -
84 -SITEFILE="50${PN}-gentoo.el"
85 -
86 -PATCHES=(
87 - # prefix
88 - "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
89 - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
90 - "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
91 -
92 - # handle gentoo packaging in find modules
93 - "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
94 - # Next patch needs to be reworked
95 - #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
96 - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
97 -
98 - # respect python eclasses
99 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
100 - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
101 -
102 - "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
103 -
104 - # upstream fixes (can usually be removed with a version bump)
105 -)
106 -
107 -cmake_src_bootstrap() {
108 - # disable running of cmake in bootstrap command
109 - sed -i \
110 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
111 - bootstrap || die "sed failed"
112 -
113 - # execinfo.h on Solaris isn't quite what it is on Darwin
114 - if [[ ${CHOST} == *-solaris* ]] ; then
115 - sed -i -e 's/execinfo\.h/blablabla.h/' \
116 - Source/kwsys/CMakeLists.txt || die
117 - fi
118 -
119 - # bootstrap script isn't exactly /bin/sh compatible
120 - tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
121 - --prefix="${T}/cmakestrap/" \
122 - --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
123 - || die "Bootstrap failed"
124 -}
125 -
126 -cmake_src_test() {
127 - # fix OutDir and SelectLibraryConfigurations tests
128 - # these are altered thanks to our eclass
129 - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
130 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
131 - || die
132 -
133 - pushd "${BUILD_DIR}" > /dev/null
134 -
135 - local ctestargs
136 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
137 -
138 - # Excluded tests:
139 - # BootstrapTest: we actually bootstrap it every time so why test it.
140 - # BundleUtilities: bundle creation broken
141 - # CMakeOnly.AllFindModules: pthread issues
142 - # CTest.updatecvs: fails to commit as root
143 - # Fortran: requires fortran
144 - # RunCMake.CompilerLauncher: also requires fortran
145 - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
146 - # debugedit binary is not in the expected location
147 - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
148 - # it can't find a deb package that owns libc
149 - # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
150 - # TestUpload: requires network access
151 - "${BUILD_DIR}"/bin/ctest \
152 - -j "$(makeopts_jobs)" \
153 - --test-load "$(makeopts_loadavg)" \
154 - ${ctestargs} \
155 - -E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
156 - || die "Tests failed"
157 -
158 - popd > /dev/null
159 -}
160 -
161 -src_prepare() {
162 - cmake_src_prepare
163 -
164 - if [[ ${CHOST} == *-darwin* ]] ; then
165 - # disable Xcode hooks, bug #652134
166 - sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
167 - Source/CMakeLists.txt || die
168 - sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
169 - -e '/cmGlobalXCodeGenerator.h/d' \
170 - Source/cmake.cxx || die
171 - # disable isysroot usage with GCC, we've properly instructed
172 - # where things are via GCC configuration and ldwrapper
173 - sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
174 - Modules/Platform/Apple-GNU-*.cmake || die
175 - # disable isysroot usage with clang as well
176 - sed -i -e '/_SYSROOT_FLAG/d' \
177 - Modules/Platform/Apple-Clang.cmake || die
178 - # don't set a POSIX standard, system headers don't like that, #757426
179 - sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
180 - Source/cmLoadCommandCommand.cxx \
181 - Source/cmStandardLexer.h \
182 - Source/cmSystemTools.cxx \
183 - Source/cmTimestamp.cxx
184 - sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
185 - Source/cmStandardLexer.h
186 - fi
187 -
188 - # Add gcc libs to the default link paths
189 - sed -i \
190 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
191 - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
192 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
193 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
194 - if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
195 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
196 - cmake_src_bootstrap
197 - fi
198 -}
199 -
200 -src_configure() {
201 - # Fix linking on Solaris
202 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
203 -
204 - local mycmakeargs=(
205 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
206 - -DCMAKE_DOC_DIR=/share/doc/${PF}
207 - -DCMAKE_MAN_DIR=/share/man
208 - -DCMAKE_DATA_DIR=/share/${PN}
209 - -DSPHINX_MAN=$(usex doc)
210 - -DSPHINX_HTML=$(usex doc)
211 - -DBUILD_CursesDialog="$(usex ncurses)"
212 - -DBUILD_TESTING=$(usex test)
213 - )
214 - use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
215 -
216 - cmake_src_configure
217 -}
218 -
219 -src_compile() {
220 - cmake_src_compile
221 - use emacs && elisp-compile Auxiliary/cmake-mode.el
222 -}
223 -
224 -src_test() {
225 - virtx cmake_src_test
226 -}
227 -
228 -src_install() {
229 - cmake_src_install
230 -
231 - if use emacs; then
232 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
233 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
234 - fi
235 -
236 - insinto /usr/share/vim/vimfiles/syntax
237 - doins Auxiliary/vim/syntax/cmake.vim
238 -
239 - insinto /usr/share/vim/vimfiles/indent
240 - doins Auxiliary/vim/indent/cmake.vim
241 -
242 - insinto /usr/share/vim/vimfiles/ftdetect
243 - doins "${FILESDIR}/${PN}.vim"
244 -
245 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
246 -}
247 -
248 -pkg_postinst() {
249 - use emacs && elisp-site-regen
250 - if use qt5; then
251 - xdg_icon_cache_update
252 - xdg_desktop_database_update
253 - xdg_mimeinfo_database_update
254 - fi
255 -}
256 -
257 -pkg_postrm() {
258 - use emacs && elisp-site-regen
259 - if use qt5; then
260 - xdg_icon_cache_update
261 - xdg_desktop_database_update
262 - xdg_mimeinfo_database_update
263 - fi
264 -}