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: Tue, 23 Apr 2019 09:01:59
Message-Id: 1556010108.5bc42facdc93fdc39dc2a4ed49c2da952c427dad.polynomial-c@gentoo
1 commit: 5bc42facdc93fdc39dc2a4ed49c2da952c427dad
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 23 09:01:34 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 23 09:01:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc42fac
7
8 dev-util/cmake: Removed old.
9
10 Package-Manager: Portage-2.3.64, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-util/cmake/Manifest | 1 -
14 dev-util/cmake/cmake-3.14.1.ebuild | 229 -------------------------------------
15 2 files changed, 230 deletions(-)
16
17 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
18 index d3457f673c1..34b847d05f0 100644
19 --- a/dev-util/cmake/Manifest
20 +++ b/dev-util/cmake/Manifest
21 @@ -1,7 +1,6 @@
22 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
23 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
24 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
25 -DIST cmake-3.14.1.tar.gz 8849712 BLAKE2B a4f917507a7ba354889606f17b9ce2c37e69d80a4ee86e75f23e214c9db11bd7947f8abc879a23c7fe76bdda32ab49360eb53f00eb1c4c4e74a8f80a7221d41d SHA512 2f0c0fb1559f71c5c2bf1a77f6fb2ecdaf078e47b5ab8ce997c6877f5d165619bc7a101b1566a8a40f8883ffef6ee690f93f2652855825019ec153aa4543ffb5
26 DIST cmake-3.14.2.tar.gz 8850106 BLAKE2B c0e3a726d51caf8d0b3dd6fdc893c090d42094b49c8be9a6c8bc694457131eeb14c97dce71e11024afd419058f69db52a7c38e0e9a6eb0dab0374366baf198ea SHA512 b47dfa3c825cd520a5a92d8092f39595d2c89992c94b7fc5f7a5cc6d009dc6f9164c31f1801188862e58e943da3f84167571c2253697eace7a819a4ba43bcc42
27 DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
28 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
29
30 diff --git a/dev-util/cmake/cmake-3.14.1.ebuild b/dev-util/cmake/cmake-3.14.1.ebuild
31 deleted file mode 100644
32 index ce96349c214..00000000000
33 --- a/dev-util/cmake/cmake-3.14.1.ebuild
34 +++ /dev/null
35 @@ -1,229 +0,0 @@
36 -# Copyright 1999-2019 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -CMAKE_MAKEFILE_GENERATOR="emake"
42 -CMAKE_REMOVE_MODULES="no"
43 -inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
55 -IUSE="doc emacs system-jsoncpp ncurses qt5"
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 - doc? (
76 - dev-python/requests
77 - dev-python/sphinx
78 - )
79 -"
80 -
81 -S="${WORKDIR}/${MY_P}"
82 -
83 -SITEFILE="50${PN}-gentoo.el"
84 -
85 -PATCHES=(
86 - # prefix
87 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
88 - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
89 - # Next patch requires new work from prefix people
90 - #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
91 -
92 - # handle gentoo packaging in find modules
93 - "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
94 - "${FILESDIR}"/${PN}-3.14.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 - # boost (#660980)
102 - "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
103 -
104 - # upstream fixes (can usually be removed with a version bump)
105 -)
106 -
107 -cmake_src_bootstrap() {
108 - # Cleanup args to extract only JOBS.
109 - # Because bootstrap does not know anything else.
110 - grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
111 - if [[ $? -eq 0 ]] ; then
112 - par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
113 - par_arg="--parallel=${par_arg}"
114 - else
115 - par_arg="--parallel=1"
116 - fi
117 -
118 - # disable running of cmake in boostrap command
119 - sed -i \
120 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
121 - bootstrap || die "sed failed"
122 -
123 - # execinfo.h on Solaris isn't quite what it is on Darwin
124 - if [[ ${CHOST} == *-solaris* ]] ; then
125 - sed -i -e 's/execinfo\.h/blablabla.h/' \
126 - Source/kwsys/CMakeLists.txt || die
127 - fi
128 -
129 - tc-export CC CXX LD
130 -
131 - # bootstrap script isn't exactly /bin/sh compatible
132 - ${CONFIG_SHELL:-sh} ./bootstrap \
133 - --prefix="${T}/cmakestrap/" \
134 - ${par_arg} \
135 - || die "Bootstrap failed"
136 -}
137 -
138 -cmake_src_test() {
139 - # fix OutDir and SelectLibraryConfigurations tests
140 - # these are altered thanks to our eclass
141 - sed -i -e 's:#IGNORE ::g' \
142 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
143 - || die
144 -
145 - pushd "${BUILD_DIR}" > /dev/null
146 -
147 - local ctestargs
148 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
149 -
150 - # Excluded tests:
151 - # BootstrapTest: we actualy bootstrap it every time so why test it.
152 - # BundleUtilities: bundle creation broken
153 - # CMakeOnly.AllFindModules: pthread issues
154 - # CTest.updatecvs: which fails to commit as root
155 - # Fortran: requires fortran
156 - # RunCMake.CompilerLauncher: also requires fortran
157 - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
158 - # debugedit binary is not in the expected location
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|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_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 - )
206 -
207 - if use qt5 ; then
208 - mycmakeargs+=(
209 - -DBUILD_QtDialog=ON
210 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
211 - )
212 - fi
213 -
214 - cmake-utils_src_configure
215 -}
216 -
217 -src_compile() {
218 - cmake-utils_src_compile
219 - use emacs && elisp-compile Auxiliary/cmake-mode.el
220 -}
221 -
222 -src_test() {
223 - virtx cmake_src_test
224 -}
225 -
226 -src_install() {
227 - cmake-utils_src_install
228 -
229 - if use emacs; then
230 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
231 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
232 - fi
233 -
234 - insinto /usr/share/vim/vimfiles/syntax
235 - doins Auxiliary/vim/syntax/cmake.vim
236 -
237 - insinto /usr/share/vim/vimfiles/indent
238 - doins Auxiliary/vim/indent/cmake.vim
239 -
240 - insinto /usr/share/vim/vimfiles/ftdetect
241 - doins "${FILESDIR}/${PN}.vim"
242 -
243 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
244 -
245 - rm -r "${ED%/}"/usr/share/cmake/{completions,editors} || die
246 -}
247 -
248 -pkg_postinst() {
249 - use emacs && elisp-site-regen
250 - if use qt5; then
251 - gnome2_icon_cache_update
252 - xdg_desktop_database_update
253 - xdg_mimeinfo_database_update
254 - fi
255 -}
256 -
257 -pkg_postrm() {
258 - use emacs && elisp-site-regen
259 - if use qt5; then
260 - gnome2_icon_cache_update
261 - xdg_desktop_database_update
262 - xdg_mimeinfo_database_update
263 - fi
264 -}