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