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, 06 Feb 2020 16:45:16
Message-Id: 1581007507.8e0c4f6340c6bcbca08022f1b8755c610c772cf6.polynomial-c@gentoo
1 commit: 8e0c4f6340c6bcbca08022f1b8755c610c772cf6
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 6 15:25:52 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 6 16:45:07 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0c4f63
7
8 dev-util/cmake: Removed old
9
10 Package-Manager: Portage-2.3.87, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 -
14 dev-util/cmake/cmake-3.16.2-r1.ebuild | 217 ----------------------------------
15 2 files changed, 218 deletions(-)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 172c0c7534f..ae9f9882e38 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -1,5 +1,4 @@
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.2.tar.gz 9109837 BLAKE2B a574325eb1f4c59a5745e3fe1def5ac53c36d4ce8dd74e051d8f4fbf41dab1d0134cf04541c1757df178def1eb65bd0536f1db132f5f9ca894870da1daf5901d SHA512 b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76
25 DIST cmake-3.16.3.tar.gz 9111826 BLAKE2B 578c070457074a611504c0113b12bdfc8831c7e2cd523dfb038279404712456032646b107ca4d7d8dbff227e4f326ab053d90e3925a22a68a37d5c4e0d818bb2 SHA512 ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672
26 DIST cmake-3.16.4.tar.gz 9113021 BLAKE2B 5aa34cadec4ed09e4d0c46f6983b88cf81ea719c47a0848a21be36911b223d9e609bdc7f5b52086762ab83e4230a3ec9e38d9c9e3c9c6f508aa2118e769e3783 SHA512 4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
27
28 diff --git a/dev-util/cmake/cmake-3.16.2-r1.ebuild b/dev-util/cmake/cmake-3.16.2-r1.ebuild
29 deleted file mode 100644
30 index f2216b9a5c2..00000000000
31 --- a/dev-util/cmake/cmake-3.16.2-r1.ebuild
32 +++ /dev/null
33 @@ -1,217 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -CMAKE_MAKEFILE_GENERATOR="emake"
40 -CMAKE_REMOVE_MODULES_LIST=( none )
41 -inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
42 - toolchain-funcs virtualx xdg cmake
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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
54 -IUSE="doc emacs ncurses qt5 test"
55 -RESTRICT="!test? ( test )"
56 -
57 -RDEPEND="
58 - app-crypt/rhash
59 - >=app-arch/libarchive-3.0.0:=
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 -"
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 - # Next patch requires new work from prefix people
91 - #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
92 -
93 - # handle gentoo packaging in find modules
94 - "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
95 - "${FILESDIR}"/${PN}-3.14.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 - # upstream fixes (can usually be removed with a version bump)
103 -)
104 -
105 -cmake_src_bootstrap() {
106 - # disable running of cmake in boostrap command
107 - sed -i \
108 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
109 - bootstrap || die "sed failed"
110 -
111 - # execinfo.h on Solaris isn't quite what it is on Darwin
112 - if [[ ${CHOST} == *-solaris* ]] ; then
113 - sed -i -e 's/execinfo\.h/blablabla.h/' \
114 - Source/kwsys/CMakeLists.txt || die
115 - fi
116 -
117 - tc-export CC CXX LD
118 -
119 - # bootstrap script isn't exactly /bin/sh compatible
120 - ${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 actualy bootstrap it every time so why test it.
140 - # BundleUtilities: bundle creation broken
141 - # CMakeOnly.AllFindModules: pthread issues
142 - # CTest.updatecvs: which 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 - # TestUpload, which requires network access
150 - "${BUILD_DIR}"/bin/ctest \
151 - -j "$(makeopts_jobs)" \
152 - --test-load "$(makeopts_loadavg)" \
153 - ${ctestargs} \
154 - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|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 - # disable Xcode hooks, bug #652134
164 - if [[ ${CHOST} == *-darwin* ]] ; then
165 - sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
166 - Source/cmGlobalXCodeGenerator.cxx || die
167 - fi
168 -
169 - # Add gcc libs to the default link paths
170 - sed -i \
171 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
172 - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
173 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
174 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
175 - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
176 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
177 - cmake_src_bootstrap
178 - fi
179 -}
180 -
181 -src_configure() {
182 - # Fix linking on Solaris
183 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
184 -
185 - local mycmakeargs=(
186 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
187 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
188 - -DCMAKE_DOC_DIR=/share/doc/${PF}
189 - -DCMAKE_MAN_DIR=/share/man
190 - -DCMAKE_DATA_DIR=/share/${PN}
191 - -DSPHINX_MAN=$(usex doc)
192 - -DSPHINX_HTML=$(usex doc)
193 - -DBUILD_CursesDialog="$(usex ncurses)"
194 - -DBUILD_TESTING=$(usex test)
195 - )
196 -
197 - if use qt5 ; then
198 - mycmakeargs+=(
199 - -DBUILD_QtDialog=ON
200 - $(cmake_use_find_package qt5 Qt5Widgets)
201 - )
202 - fi
203 -
204 - cmake_src_configure
205 -}
206 -
207 -src_compile() {
208 - cmake_src_compile
209 - use emacs && elisp-compile Auxiliary/cmake-mode.el
210 -}
211 -
212 -src_test() {
213 - virtx cmake_src_test
214 -}
215 -
216 -src_install() {
217 - cmake_src_install
218 -
219 - if use emacs; then
220 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
221 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
222 - fi
223 -
224 - insinto /usr/share/vim/vimfiles/syntax
225 - doins Auxiliary/vim/syntax/cmake.vim
226 -
227 - insinto /usr/share/vim/vimfiles/indent
228 - doins Auxiliary/vim/indent/cmake.vim
229 -
230 - insinto /usr/share/vim/vimfiles/ftdetect
231 - doins "${FILESDIR}/${PN}.vim"
232 -
233 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
234 -
235 - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
236 -}
237 -
238 -pkg_preinst() {
239 - use qt5 && xdg_pkg_preinst
240 -}
241 -
242 -pkg_postinst() {
243 - use emacs && elisp-site-regen
244 - use qt5 && xdg_pkg_postinst
245 -}
246 -
247 -pkg_postrm() {
248 - use emacs && elisp-site-regen
249 - use qt5 && xdg_pkg_postrm
250 -}