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