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, 31 Oct 2019 01:42:14
Message-Id: 1572486125.6ad4237876b682895e3651d948e1342b80354243.polynomial-c@gentoo
1 commit: 6ad4237876b682895e3651d948e1342b80354243
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 31 01:41:53 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 31 01:42:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad42378
7
8 dev-util/cmake: Removed old
9
10 Package-Manager: Portage-2.3.78, Repoman-2.3.17
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 -
14 dev-util/cmake/cmake-3.15.3.ebuild | 226 -------------------------------------
15 2 files changed, 227 deletions(-)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index 34e599ff675..13c45b0b9ad 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -1,7 +1,6 @@
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.14.7.tar.gz 8861587 BLAKE2B c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09 SHA512 2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4
25 -DIST cmake-3.15.3.tar.gz 9270184 BLAKE2B bdca3d45d603d9f40584e54102fedd736dae9eadb3ccaaf9bdb2e071da57eff5201dab390ba651772fb5f78fdd7683a86ac721a8b8273936782559a95be0167d SHA512 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
26 DIST cmake-3.15.4.tar.gz 9270648 BLAKE2B b1c46ce76a549c78caa5c95be38fdbdcca685b1fade0a1687971d3b1cbb10953ec62b12401f67c389b096c87a6fa895ff339e1646e449472df76660b76e7d1ed SHA512 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650
27 DIST cmake-3.15.5.tar.gz 9271925 BLAKE2B 9e30227600542edb4dc3dbafc1874db718816270d045fafe140037b8eb39e5d066d1ccd5b2f6c817babfa43a0e3ff7c5d58d243b97f616ec504cafc428872b67 SHA512 c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6
28 DIST cmake-3.16.0-rc2.tar.gz 9100272 BLAKE2B facce463a92b32a51676d638aad4dbd84f2184c48e7df478fcc34fbcd9c7e5dbf18223fc11a774ebe588160a9458507c7974a9e9c564e8fddd86b88ea0a60238 SHA512 d457388f4cf0512e3aee12d12d445b160bb6b19888caf0c2fd69ec10bfbcd910790aecb025a1062cfb2b0048c4cac0e2370a76116c75db2a7000aa56af4c81f7
29
30 diff --git a/dev-util/cmake/cmake-3.15.3.ebuild b/dev-util/cmake/cmake-3.15.3.ebuild
31 deleted file mode 100644
32 index 8379ddfb933..00000000000
33 --- a/dev-util/cmake/cmake-3.15.3.ebuild
34 +++ /dev/null
35 @@ -1,226 +0,0 @@
36 -# Copyright 1999-2019 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -CMAKE_MAKEFILE_GENERATOR="emake"
42 -CMAKE_REMOVE_MODULES="no"
43 -inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
55 -IUSE="doc emacs system-jsoncpp ncurses qt5 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/libuv-1.10.0:=
62 - >=net-misc/curl-7.21.5[ssl]
63 - sys-libs/zlib
64 - virtual/pkgconfig
65 - emacs? ( virtual/emacs )
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 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
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.4.0_rc1-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 - # Cleanup args to extract only JOBS.
107 - # Because bootstrap does not know anything else.
108 - grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
109 - if [[ $? -eq 0 ]] ; then
110 - par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
111 - par_arg="--parallel=${par_arg}"
112 - else
113 - par_arg="--parallel=1"
114 - fi
115 -
116 - # disable running of cmake in boostrap command
117 - sed -i \
118 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
119 - bootstrap || die "sed failed"
120 -
121 - # execinfo.h on Solaris isn't quite what it is on Darwin
122 - if [[ ${CHOST} == *-solaris* ]] ; then
123 - sed -i -e 's/execinfo\.h/blablabla.h/' \
124 - Source/kwsys/CMakeLists.txt || die
125 - fi
126 -
127 - tc-export CC CXX LD
128 -
129 - # bootstrap script isn't exactly /bin/sh compatible
130 - ${CONFIG_SHELL:-sh} ./bootstrap \
131 - --prefix="${T}/cmakestrap/" \
132 - ${par_arg} \
133 - || die "Bootstrap failed"
134 -}
135 -
136 -cmake_src_test() {
137 - # fix OutDir and SelectLibraryConfigurations tests
138 - # these are altered thanks to our eclass
139 - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
140 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
141 - || die
142 -
143 - pushd "${BUILD_DIR}" > /dev/null
144 -
145 - local ctestargs
146 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
147 -
148 - # Excluded tests:
149 - # BootstrapTest: we actualy bootstrap it every time so why test it.
150 - # BundleUtilities: bundle creation broken
151 - # CMakeOnly.AllFindModules: pthread issues
152 - # CTest.updatecvs: which fails to commit as root
153 - # Fortran: requires fortran
154 - # RunCMake.CompilerLauncher: also requires fortran
155 - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
156 - # debugedit binary is not in the expected location
157 - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
158 - # it can't find a deb package that owns libc
159 - # TestUpload, which requires network access
160 - "${BUILD_DIR}"/bin/ctest \
161 - -j "$(makeopts_jobs)" \
162 - --test-load "$(makeopts_loadavg)" \
163 - ${ctestargs} \
164 - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
165 - || die "Tests failed"
166 -
167 - popd > /dev/null
168 -}
169 -
170 -src_prepare() {
171 - cmake-utils_src_prepare
172 -
173 - # disable Xcode hooks, bug #652134
174 - if [[ ${CHOST} == *-darwin* ]] ; then
175 - sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
176 - Source/cmGlobalXCodeGenerator.cxx || die
177 - fi
178 -
179 - # Add gcc libs to the default link paths
180 - sed -i \
181 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
182 - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
183 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
184 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
185 - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
186 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
187 - cmake_src_bootstrap
188 - fi
189 -}
190 -
191 -src_configure() {
192 - # Fix linking on Solaris
193 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
194 -
195 - local mycmakeargs=(
196 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
197 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
198 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
199 - -DCMAKE_DOC_DIR=/share/doc/${PF}
200 - -DCMAKE_MAN_DIR=/share/man
201 - -DCMAKE_DATA_DIR=/share/${PN}
202 - -DSPHINX_MAN=$(usex doc)
203 - -DSPHINX_HTML=$(usex doc)
204 - -DBUILD_CursesDialog="$(usex ncurses)"
205 - -DBUILD_TESTING=$(usex test)
206 - )
207 -
208 - if use qt5 ; then
209 - mycmakeargs+=(
210 - -DBUILD_QtDialog=ON
211 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
212 - )
213 - fi
214 -
215 - cmake-utils_src_configure
216 -}
217 -
218 -src_compile() {
219 - cmake-utils_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-utils_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 - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
247 -}
248 -
249 -pkg_preinst() {
250 - use qt5 && xdg_pkg_preinst
251 -}
252 -
253 -pkg_postinst() {
254 - use emacs && elisp-site-regen
255 - use qt5 && xdg_pkg_postinst
256 -}
257 -
258 -pkg_postrm() {
259 - use emacs && elisp-site-regen
260 - use qt5 && xdg_pkg_postrm
261 -}