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: Wed, 29 Apr 2020 07:24:23
Message-Id: 1588145055.36b645970857eff975bd76c7c556be9ca67f1dda.polynomial-c@gentoo
1 commit: 36b645970857eff975bd76c7c556be9ca67f1dda
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 29 07:24:05 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 29 07:24:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36b64597
7
8 dev-util/cmake: Removed old
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 -
14 dev-util/cmake/cmake-3.17.0.ebuild | 216 -------------------------------------
15 2 files changed, 217 deletions(-)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 8b4b769ca5b..2affc278ad5 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -1,6 +1,5 @@
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.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
25 -DIST cmake-3.17.0.tar.gz 9466484 BLAKE2B 63dc59a9551d6afcf009403bcc68f3bb87065f962c39f443d9a73c7babbb2e49b4237d00072d2ff4f91a6cd4c9d5ac05cd9b97acd0404c852fe03133b538f2ea SHA512 f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a
26 DIST cmake-3.17.1.tar.gz 9467298 BLAKE2B 16982bf8236568430b0b68608c4eb062e4d550a914bca59113e6f288f069681361ab88b695b91a4e62600042c542db658b209b0744e68966bb36ad18ae37a9ff SHA512 457f4f43a32cc8d966939158f2cc09768b93733426aeb9b6da71313ec060f958399d098af363c3c7f18752998347e05073a399de736e5ca0804ec2bba2cee7ac
27 DIST cmake-3.17.2.tar.gz 9469251 BLAKE2B 85818c6346ee600a0185687809b666a3186831d590680bba8a41d6d52cd3852ce84fdac240100a7b91f06897a779e1e44b67d9a8da4e806347c9a4a46dab354d SHA512 4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2
28
29 diff --git a/dev-util/cmake/cmake-3.17.0.ebuild b/dev-util/cmake/cmake-3.17.0.ebuild
30 deleted file mode 100644
31 index a6e3aed2b30..00000000000
32 --- a/dev-util/cmake/cmake-3.17.0.ebuild
33 +++ /dev/null
34 @@ -1,216 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -CMAKE_MAKEFILE_GENERATOR="emake"
41 -CMAKE_REMOVE_MODULES_LIST=( none )
42 -inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
43 - toolchain-funcs virtualx xdg cmake
44 -
45 -MY_P="${P/_/-}"
46 -
47 -DESCRIPTION="Cross platform Make"
48 -HOMEPAGE="https://cmake.org/"
49 -SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
50 -
51 -LICENSE="CMake"
52 -SLOT="0"
53 -[[ "${PV}" = *_rc* ]] || \
54 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
55 -IUSE="doc emacs ncurses qt5 test"
56 -RESTRICT="!test? ( test )"
57 -
58 -RDEPEND="
59 - app-crypt/rhash
60 - >=app-arch/libarchive-3.0.0:=
61 - >=dev-libs/expat-2.0.1
62 - >=dev-libs/jsoncpp-1.9.2-r2:0=
63 - >=dev-libs/libuv-1.10.0:=
64 - >=net-misc/curl-7.21.5[ssl]
65 - sys-libs/zlib
66 - virtual/pkgconfig
67 - emacs? ( >=app-editors/emacs-23.1:* )
68 - ncurses? ( sys-libs/ncurses:0= )
69 - qt5? (
70 - dev-qt/qtcore:5
71 - dev-qt/qtgui:5
72 - dev-qt/qtwidgets:5
73 - )
74 -"
75 -DEPEND="${RDEPEND}"
76 -BDEPEND="
77 - doc? (
78 - dev-python/requests
79 - dev-python/sphinx
80 - )
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 - # Next patch requires new work from prefix people
92 - #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
93 -
94 - # handle gentoo packaging in find modules
95 - "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
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 - # upstream fixes (can usually be removed with a version bump)
104 -)
105 -
106 -cmake_src_bootstrap() {
107 - # disable running of cmake in boostrap 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 - tc-export CC CXX LD
119 -
120 - # bootstrap script isn't exactly /bin/sh compatible
121 - ${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 actualy bootstrap it every time so why test it.
141 - # BundleUtilities: bundle creation broken
142 - # CMakeOnly.AllFindModules: pthread issues
143 - # CTest.updatecvs: which 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 - # TestUpload, which requires network access
151 - "${BUILD_DIR}"/bin/ctest \
152 - -j "$(makeopts_jobs)" \
153 - --test-load "$(makeopts_loadavg)" \
154 - ${ctestargs} \
155 - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|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 - # disable Xcode hooks, bug #652134
165 - if [[ ${CHOST} == *-darwin* ]] ; then
166 - sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
167 - Source/cmGlobalXCodeGenerator.cxx || die
168 - fi
169 -
170 - # Add gcc libs to the default link paths
171 - sed -i \
172 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
173 - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
174 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
175 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
176 - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
177 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
178 - cmake_src_bootstrap
179 - fi
180 -}
181 -
182 -src_configure() {
183 - # Fix linking on Solaris
184 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
185 -
186 - local mycmakeargs=(
187 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
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 -}