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: Mon, 19 Feb 2018 13:08:59
Message-Id: 1519045731.a419eadc8bc5dfe3a54f1f29548304df74353312.polynomial-c@gentoo
1 commit: a419eadc8bc5dfe3a54f1f29548304df74353312
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 19 13:08:34 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 19 13:08:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a419eadc
7
8 dev-util/cmake: Removed old.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-util/cmake/Manifest | 1 -
13 dev-util/cmake/cmake-3.10.1.ebuild | 213 -------------------------------------
14 2 files changed, 214 deletions(-)
15
16 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
17 index c5f9a23473b..caa381b5c4d 100644
18 --- a/dev-util/cmake/Manifest
19 +++ b/dev-util/cmake/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST cmake-3.10.1.tar.gz 7824043 BLAKE2B 004149841b128288845c2a3987b38e6d90b3dcc5ccb2002bc2915f9d8f30496ebf43d9a70fa6e26c7b64c0f41d85c753bd1bac8c1b5d7148b1d592dc98de189a SHA512 14e9a7f01747b369cad3c4e4e83bc777c0c98ce69209456f60d086d2471302f66dc1c1d22fd04e11dcb64de4bfc7dacd9aca70ee0e5f006abd1df79ef642eeed
22 DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
23 DIST cmake-3.11.0-rc1.tar.gz 7945667 BLAKE2B d2f36d20105eda2eddadcc0cc93d3de081fa7e41dfe3c9ecbc1d15ef658cd713894abdb300e34f5055ea37848339c0f1bce5952654fdd2525ed7a0405d7fb825 SHA512 0baa40a04184c33a04735e70ff782c76d0453baa00087480640c6e28c1461032b96bd3a3fa07bedc2855eea83349ef50ee2652ec810ad3314b86e80df8df62fb
24 DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1 SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
25
26 diff --git a/dev-util/cmake/cmake-3.10.1.ebuild b/dev-util/cmake/cmake-3.10.1.ebuild
27 deleted file mode 100644
28 index af381f00bde..00000000000
29 --- a/dev-util/cmake/cmake-3.10.1.ebuild
30 +++ /dev/null
31 @@ -1,213 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -CMAKE_MAKEFILE_GENERATOR="emake"
38 -CMAKE_REMOVE_MODULES="no"
39 -inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
40 -
41 -MY_P="${P/_/-}"
42 -
43 -DESCRIPTION="Cross platform Make"
44 -HOMEPAGE="https://cmake.org/"
45 -SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
46 -
47 -LICENSE="CMake"
48 -SLOT="0"
49 -[[ "${PV}" = *_rc* ]] || \
50 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
51 -IUSE="doc emacs server system-jsoncpp ncurses qt5"
52 -
53 -RDEPEND="
54 - app-crypt/rhash
55 - >=app-arch/libarchive-3.0.0:=
56 - >=dev-libs/expat-2.0.1
57 - >=dev-libs/libuv-1.0.0:=
58 - >=net-misc/curl-7.21.5[ssl]
59 - sys-libs/zlib
60 - virtual/pkgconfig
61 - emacs? ( virtual/emacs )
62 - ncurses? ( sys-libs/ncurses:0= )
63 - qt5? (
64 - dev-qt/qtcore:5
65 - dev-qt/qtgui:5
66 - dev-qt/qtwidgets:5
67 - )
68 - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
69 -"
70 -DEPEND="${RDEPEND}
71 - doc? ( dev-python/sphinx )
72 -"
73 -
74 -S="${WORKDIR}/${MY_P}"
75 -
76 -SITEFILE="50${PN}-gentoo.el"
77 -
78 -PATCHES=(
79 - # prefix
80 - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
81 - "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
82 - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
83 -
84 - # handle gentoo packaging in find modules
85 - "${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
86 - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
87 - "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
88 - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
89 - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
90 -
91 - # respect python eclasses
92 - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
93 - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
94 -
95 - # upstream fixes (can usually be removed with a version bump)
96 -)
97 -
98 -cmake_src_bootstrap() {
99 - # Cleanup args to extract only JOBS.
100 - # Because bootstrap does not know anything else.
101 - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
102 - if [ $? -eq 0 ]; then
103 - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
104 - par_arg="--parallel=${par_arg}"
105 - else
106 - par_arg="--parallel=1"
107 - fi
108 -
109 - # disable running of cmake in boostrap command
110 - sed -i \
111 - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
112 - bootstrap || die "sed failed"
113 -
114 - # execinfo.h on Solaris isn't quite what it is on Darwin
115 - if [[ ${CHOST} == *-solaris* ]] ; then
116 - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
117 - fi
118 -
119 - tc-export CC CXX LD
120 -
121 - # bootstrap script isn't exactly /bin/sh compatible
122 - ${CONFIG_SHELL:-sh} ./bootstrap \
123 - --prefix="${T}/cmakestrap/" \
124 - ${par_arg} \
125 - || die "Bootstrap failed"
126 -}
127 -
128 -cmake_src_test() {
129 - # fix OutDir and SelectLibraryConfigurations tests
130 - # these are altered thanks to our eclass
131 - sed -i -e 's:#IGNORE ::g' \
132 - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
133 - || die
134 -
135 - pushd "${BUILD_DIR}" > /dev/null
136 -
137 - local ctestargs
138 - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
139 -
140 - # Excluded tests:
141 - # BootstrapTest: we actualy bootstrap it every time so why test it.
142 - # BundleUtilities: bundle creation broken
143 - # CTest.updatecvs: which fails to commit as root
144 - # Fortran: requires fortran
145 - # Qt4Deploy, which tries to break sandbox and ignores prefix
146 - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
147 - # debugedit binary is not in the expected location
148 - # TestUpload, which requires network access
149 - "${BUILD_DIR}"/bin/ctest ${ctestargs} \
150 - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
151 - || die "Tests failed"
152 -
153 - popd > /dev/null
154 -}
155 -
156 -src_prepare() {
157 - cmake-utils_src_prepare
158 -
159 - # Add gcc libs to the default link paths
160 - sed -i \
161 - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
162 - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
163 - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
164 - if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
165 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
166 - cmake_src_bootstrap
167 - fi
168 -}
169 -
170 -src_configure() {
171 - # Fix linking on Solaris
172 - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
173 -
174 - local mycmakeargs=(
175 - -DCMAKE_USE_SYSTEM_LIBRARIES=ON
176 - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
177 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
178 - -DCMAKE_DOC_DIR=/share/doc/${PF}
179 - -DCMAKE_MAN_DIR=/share/man
180 - -DCMAKE_DATA_DIR=/share/${PN}
181 - -DSPHINX_MAN=$(usex doc)
182 - -DSPHINX_HTML=$(usex doc)
183 - -DBUILD_CursesDialog="$(usex ncurses)"
184 - -DCMake_ENABLE_SERVER_MODE="$(usex server)"
185 - )
186 -
187 - if use qt5 ; then
188 - mycmakeargs+=(
189 - -DBUILD_QtDialog=ON
190 - $(cmake-utils_use_find_package qt5 Qt5Widgets)
191 - )
192 - fi
193 -
194 - cmake-utils_src_configure
195 -}
196 -
197 -src_compile() {
198 - cmake-utils_src_compile
199 - use emacs && elisp-compile Auxiliary/cmake-mode.el
200 -}
201 -
202 -src_test() {
203 - virtx cmake_src_test
204 -}
205 -
206 -src_install() {
207 - cmake-utils_src_install
208 -
209 - if use emacs; then
210 - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
211 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
212 - fi
213 -
214 - insinto /usr/share/vim/vimfiles/syntax
215 - doins Auxiliary/vim/syntax/cmake.vim
216 -
217 - insinto /usr/share/vim/vimfiles/indent
218 - doins Auxiliary/vim/indent/cmake.vim
219 -
220 - insinto /usr/share/vim/vimfiles/ftdetect
221 - doins "${FILESDIR}/${PN}.vim"
222 -
223 - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
224 -
225 - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
226 -}
227 -
228 -pkg_postinst() {
229 - use emacs && elisp-site-regen
230 - if use qt5; then
231 - gnome2_icon_cache_update
232 - xdg_desktop_database_update
233 - xdg_mimeinfo_database_update
234 - fi
235 -}
236 -
237 -pkg_postrm() {
238 - use emacs && elisp-site-regen
239 - if use qt5; then
240 - gnome2_icon_cache_update
241 - xdg_desktop_database_update
242 - xdg_mimeinfo_database_update
243 - fi
244 -}