1 |
commit: 359f04ac6d228e77f725a04ec3a1706ee94e7e7e |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 1 15:51:05 2017 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 1 16:32:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359f04ac |
7 |
|
8 |
dev-util/cmake: Remove 3.3.1 (r1) |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-util/cmake/Manifest | 2 - |
13 |
dev-util/cmake/cmake-3.3.1-r1.ebuild | 195 --------------------- |
14 |
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 --- |
15 |
3 files changed, 220 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
18 |
index 3abe160..4db2d57 100644 |
19 |
--- a/dev-util/cmake/Manifest |
20 |
+++ b/dev-util/cmake/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
-DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f |
23 |
-DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b |
24 |
DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84 |
25 |
DIST cmake-3.6.3.tar.gz 6919949 SHA256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48 WHIRLPOOL ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a |
26 |
DIST cmake-3.7.1.tar.gz 7361172 SHA256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 SHA512 0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629 WHIRLPOOL 8b632b4a3f44a7b56952926ad43db45ecd9f26f434816fe29a52c89542edfc2dfea72f4ec814d4faaf990ee535ad80e6238ba2e6d9ffa2ff94cfccd665b1d930 |
27 |
|
28 |
diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index e3aeb00..00000000 |
31 |
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,195 +0,0 @@ |
34 |
-# Copyright 1999-2016 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
- |
38 |
-EAPI=5 |
39 |
- |
40 |
-CMAKE_REMOVE_MODULES="no" |
41 |
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
42 |
- |
43 |
-MY_P="${P/_/-}" |
44 |
- |
45 |
-DESCRIPTION="Cross platform Make" |
46 |
-HOMEPAGE="http://www.cmake.org/" |
47 |
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz |
48 |
- http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" |
49 |
- |
50 |
-LICENSE="CMake" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
53 |
-IUSE="doc emacs system-jsoncpp ncurses qt5" |
54 |
- |
55 |
-RDEPEND=" |
56 |
- >=app-arch/libarchive-3.0.0:= |
57 |
- >=dev-libs/expat-2.0.1 |
58 |
- >=net-misc/curl-7.20.0-r1[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 |
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
79 |
- |
80 |
-PATCHES=( |
81 |
- # prefix |
82 |
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch |
83 |
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch |
84 |
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch |
85 |
- |
86 |
- # handle gentoo packaging in find modules |
87 |
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch |
88 |
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch |
89 |
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch |
90 |
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch |
91 |
- |
92 |
- # respect python eclasses |
93 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
94 |
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch |
95 |
- |
96 |
- # upstream fixes (can usually be removed with a version bump) |
97 |
- "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch |
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 |
- # execinfo.h on Solaris isn't quite what it is on Darwin |
112 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
113 |
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
114 |
- fi |
115 |
- |
116 |
- tc-export CC CXX LD |
117 |
- |
118 |
- # bootstrap script isn't exactly /bin/sh compatible |
119 |
- ${CONFIG_SHELL:-sh} ./bootstrap \ |
120 |
- --prefix="${T}/cmakestrap/" \ |
121 |
- ${par_arg} \ |
122 |
- || die "Bootstrap failed" |
123 |
-} |
124 |
- |
125 |
-cmake_src_test() { |
126 |
- # fix OutDir and SelectLibraryConfigurations tests |
127 |
- # these are altered thanks to our eclass |
128 |
- sed -i -e 's:#IGNORE ::g' \ |
129 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
130 |
- || die |
131 |
- |
132 |
- pushd "${BUILD_DIR}" > /dev/null |
133 |
- |
134 |
- local ctestargs |
135 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
136 |
- |
137 |
- # Excluded tests: |
138 |
- # BootstrapTest: we actualy bootstrap it every time so why test it. |
139 |
- # BundleUtilities: bundle creation broken |
140 |
- # CTest.updatecvs: which fails to commit as root |
141 |
- # Fortran: requires fortran |
142 |
- # Qt4Deploy, which tries to break sandbox and ignores prefix |
143 |
- # TestUpload, which requires network access |
144 |
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
145 |
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ |
146 |
- || die "Tests failed" |
147 |
- |
148 |
- popd > /dev/null |
149 |
-} |
150 |
- |
151 |
-src_prepare() { |
152 |
- cmake-utils_src_prepare |
153 |
- |
154 |
- # disable running of cmake in boostrap command |
155 |
- sed -i \ |
156 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
157 |
- bootstrap || die "sed failed" |
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 |
- |
165 |
- cmake_src_bootstrap |
166 |
-} |
167 |
- |
168 |
-src_configure() { |
169 |
- local mycmakeargs=( |
170 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
171 |
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) |
172 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
173 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
174 |
- -DCMAKE_MAN_DIR=/share/man |
175 |
- -DCMAKE_DATA_DIR=/share/${PN} |
176 |
- -DSPHINX_MAN=$(usex doc) |
177 |
- -DSPHINX_HTML=$(usex doc) |
178 |
- $(cmake-utils_use_build ncurses CursesDialog) |
179 |
- ) |
180 |
- |
181 |
- if use qt5 ; then |
182 |
- mycmakeargs+=( |
183 |
- -DBUILD_QtDialog=ON |
184 |
- $(cmake-utils_use_find_package qt5 Qt5Widgets) |
185 |
- ) |
186 |
- fi |
187 |
- |
188 |
- cmake-utils_src_configure |
189 |
-} |
190 |
- |
191 |
-src_compile() { |
192 |
- cmake-utils_src_compile |
193 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
194 |
-} |
195 |
- |
196 |
-src_test() { |
197 |
- VIRTUALX_COMMAND="cmake_src_test" virtualmake |
198 |
-} |
199 |
- |
200 |
-src_install() { |
201 |
- cmake-utils_src_install |
202 |
- |
203 |
- if use emacs; then |
204 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
205 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
206 |
- fi |
207 |
- |
208 |
- insinto /usr/share/vim/vimfiles/syntax |
209 |
- doins Auxiliary/cmake-syntax.vim |
210 |
- |
211 |
- insinto /usr/share/vim/vimfiles/indent |
212 |
- doins Auxiliary/cmake-indent.vim |
213 |
- |
214 |
- insinto /usr/share/vim/vimfiles/ftdetect |
215 |
- doins "${FILESDIR}/${PN}.vim" |
216 |
- |
217 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
218 |
- |
219 |
- rm -rf "${D}"/usr/share/cmake/{completions,editors} || die |
220 |
-} |
221 |
- |
222 |
-pkg_postinst() { |
223 |
- use emacs && elisp-site-regen |
224 |
-} |
225 |
- |
226 |
-pkg_postrm() { |
227 |
- use emacs && elisp-site-regen |
228 |
-} |
229 |
|
230 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch |
231 |
deleted file mode 100644 |
232 |
index 9cb4777..00000000 |
233 |
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch |
234 |
+++ /dev/null |
235 |
@@ -1,23 +0,0 @@ |
236 |
-Don't use .so for modules on darwin/macos. Use .bundle instead. |
237 |
-Patch by Heiko Przybyl |
238 |
- |
239 |
---- Modules/Platform/Darwin.cmake |
240 |
-+++ Modules/Platform/Darwin.cmake |
241 |
-@@ -26,7 +26,7 @@ |
242 |
- set(CMAKE_SHARED_LIBRARY_PREFIX "lib") |
243 |
- set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") |
244 |
- set(CMAKE_SHARED_MODULE_PREFIX "lib") |
245 |
--set(CMAKE_SHARED_MODULE_SUFFIX ".so") |
246 |
-+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") |
247 |
- set(CMAKE_MODULE_EXISTS 1) |
248 |
- set(CMAKE_DL_LIBS "") |
249 |
- |
250 |
-@@ -48,7 +48,7 @@ |
251 |
- set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") |
252 |
- set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") |
253 |
- set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") |
254 |
--set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") |
255 |
-+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") |
256 |
- |
257 |
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree |
258 |
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache |