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