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, 05 Sep 2019 06:37:39
Message-Id: 1567665449.fc045f1ee0634262da59227c65554763cd4f6016.polynomial-c@gentoo
1 commit: fc045f1ee0634262da59227c65554763cd4f6016
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 5 06:37:15 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 5 06:37:29 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc045f1e
7
8 dev-util/cmake: Removed old
9
10 Package-Manager: Portage-2.3.75, 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.1.ebuild | 226 -------------------------------------
15 2 files changed, 227 deletions(-)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index db14c7af94b..e59bfa93670 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.15.1.tar.gz 9268592 BLAKE2B 3b0dbca9203b1029922d06df9abc3bbfa6f7b8320e43b11b468cd7e129171e2bb1b645fc07bf2d46c9b3c08642f1a11741240d0029f96ac3b2d7a8bb44d398da SHA512 6900a84c7764034331fb6f00801841a7a3e667ac39813c35ceb3db983b33a5bf6addbbc8539c39a0c0be9e10204c79d6236886a9d50ce901a56275b53619ec73
25 DIST cmake-3.15.2.tar.gz 9269449 BLAKE2B 539a1dede60741f5159fef72f6a7fdd7dd4fd457fab73d33f01b042adee7b5179b2b620ece0556f1612745f911ffe6cd714efb18a4663ac67ed6a20e09feb233 SHA512 154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc
26 DIST cmake-3.15.3.tar.gz 9270184 BLAKE2B bdca3d45d603d9f40584e54102fedd736dae9eadb3ccaaf9bdb2e071da57eff5201dab390ba651772fb5f78fdd7683a86ac721a8b8273936782559a95be0167d SHA512 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
27
28 diff --git a/dev-util/cmake/cmake-3.15.1.ebuild b/dev-util/cmake/cmake-3.15.1.ebuild
29 deleted file mode 100644
30 index 06184a6bfe5..00000000000
31 --- a/dev-util/cmake/cmake-3.15.1.ebuild
32 +++ /dev/null
33 @@ -1,226 +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="no"
41 -inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
42 -
43 -MY_P="${P/_/-}"
44 -
45 -DESCRIPTION="Cross platform Make"
46 -HOMEPAGE="https://cmake.org/"
47 -SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
48 -
49 -LICENSE="CMake"
50 -SLOT="0"
51 -[[ "${PV}" = *_rc* ]] || \
52 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
53 -IUSE="doc emacs system-jsoncpp ncurses qt5 test"
54 -
55 -RDEPEND="
56 - app-crypt/rhash
57 - >=app-arch/libarchive-3.0.0:=
58 - >=dev-libs/expat-2.0.1
59 - >=dev-libs/libuv-1.10.0:=
60 - >=net-misc/curl-7.21.5[ssl]
61 - sys-libs/zlib
62 - virtual/pkgconfig
63 - emacs? ( virtual/emacs )
64 - ncurses? ( sys-libs/ncurses:0= )
65 - qt5? (
66 - dev-qt/qtcore:5
67 - dev-qt/qtgui:5
68 - dev-qt/qtwidgets:5
69 - )
70 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
71 -"
72 -DEPEND="${RDEPEND}"
73 -BDEPEND="
74 - doc? (
75 - dev-python/requests
76 - dev-python/sphinx
77 - )
78 -"
79 -
80 -S="${WORKDIR}/${MY_P}"
81 -
82 -SITEFILE="50${PN}-gentoo.el"
83 -
84 -PATCHES=(
85 - # prefix
86 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
87 - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
88 - # Next patch requires new work from prefix people
89 - #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
90 -
91 - # handle gentoo packaging in find modules
92 - "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
93 - "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
94 - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
95 -
96 - # respect python eclasses
97 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
98 - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
99 -
100 - # upstream fixes (can usually be removed with a version bump)
101 -)
102 -
103 -cmake_src_bootstrap() {
104 - # Cleanup args to extract only JOBS.
105 - # Because bootstrap does not know anything else.
106 - grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
107 - if [[ $? -eq 0 ]] ; then
108 - par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
109 - par_arg="--parallel=${par_arg}"
110 - else
111 - par_arg="--parallel=1"
112 - fi
113 -
114 - # disable running of cmake in boostrap command
115 - sed -i \
116 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
117 - bootstrap || die "sed failed"
118 -
119 - # execinfo.h on Solaris isn't quite what it is on Darwin
120 - if [[ ${CHOST} == *-solaris* ]] ; then
121 - sed -i -e 's/execinfo\.h/blablabla.h/' \
122 - Source/kwsys/CMakeLists.txt || die
123 - fi
124 -
125 - tc-export CC CXX LD
126 -
127 - # bootstrap script isn't exactly /bin/sh compatible
128 - ${CONFIG_SHELL:-sh} ./bootstrap \
129 - --prefix="${T}/cmakestrap/" \
130 - ${par_arg} \
131 - || die "Bootstrap failed"
132 -}
133 -
134 -cmake_src_test() {
135 - # fix OutDir and SelectLibraryConfigurations tests
136 - # these are altered thanks to our eclass
137 - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
138 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
139 - || die
140 -
141 - pushd "${BUILD_DIR}" > /dev/null
142 -
143 - local ctestargs
144 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
145 -
146 - # Excluded tests:
147 - # BootstrapTest: we actualy bootstrap it every time so why test it.
148 - # BundleUtilities: bundle creation broken
149 - # CMakeOnly.AllFindModules: pthread issues
150 - # CTest.updatecvs: which fails to commit as root
151 - # Fortran: requires fortran
152 - # RunCMake.CompilerLauncher: also requires fortran
153 - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
154 - # debugedit binary is not in the expected location
155 - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
156 - # it can't find a deb package that owns libc
157 - # TestUpload, which requires network access
158 - "${BUILD_DIR}"/bin/ctest \
159 - -j "$(makeopts_jobs)" \
160 - --test-load "$(makeopts_loadavg)" \
161 - ${ctestargs} \
162 - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
163 - || die "Tests failed"
164 -
165 - popd > /dev/null
166 -}
167 -
168 -src_prepare() {
169 - cmake-utils_src_prepare
170 -
171 - # disable Xcode hooks, bug #652134
172 - if [[ ${CHOST} == *-darwin* ]] ; then
173 - sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
174 - Source/cmGlobalXCodeGenerator.cxx || die
175 - fi
176 -
177 - # Add gcc libs to the default link paths
178 - sed -i \
179 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
180 - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
181 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
182 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
183 - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
184 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
185 - cmake_src_bootstrap
186 - fi
187 -}
188 -
189 -src_configure() {
190 - # Fix linking on Solaris
191 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
192 -
193 - local mycmakeargs=(
194 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
195 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
196 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
197 - -DCMAKE_DOC_DIR=/share/doc/${PF}
198 - -DCMAKE_MAN_DIR=/share/man
199 - -DCMAKE_DATA_DIR=/share/${PN}
200 - -DSPHINX_MAN=$(usex doc)
201 - -DSPHINX_HTML=$(usex doc)
202 - -DBUILD_CursesDialog="$(usex ncurses)"
203 - -DBUILD_TESTING=$(usex test)
204 - )
205 -
206 - if use qt5 ; then
207 - mycmakeargs+=(
208 - -DBUILD_QtDialog=ON
209 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
210 - )
211 - fi
212 -
213 - cmake-utils_src_configure
214 -}
215 -
216 -src_compile() {
217 - cmake-utils_src_compile
218 - use emacs && elisp-compile Auxiliary/cmake-mode.el
219 -}
220 -
221 -src_test() {
222 - virtx cmake_src_test
223 -}
224 -
225 -src_install() {
226 - cmake-utils_src_install
227 -
228 - if use emacs; then
229 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
230 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
231 - fi
232 -
233 - insinto /usr/share/vim/vimfiles/syntax
234 - doins Auxiliary/vim/syntax/cmake.vim
235 -
236 - insinto /usr/share/vim/vimfiles/indent
237 - doins Auxiliary/vim/indent/cmake.vim
238 -
239 - insinto /usr/share/vim/vimfiles/ftdetect
240 - doins "${FILESDIR}/${PN}.vim"
241 -
242 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
243 -
244 - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
245 -}
246 -
247 -pkg_preinst() {
248 - use qt5 && xdg_pkg_preinst
249 -}
250 -
251 -pkg_postinst() {
252 - use emacs && elisp-site-regen
253 - use qt5 && xdg_pkg_postinst
254 -}
255 -
256 -pkg_postrm() {
257 - use emacs && elisp-site-regen
258 - use qt5 && xdg_pkg_postrm
259 -}