1 |
commit: e011152254bc7c27f6d5ebcede5dae420644c5fe |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 2 21:12:29 2012 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 2 21:12:29 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e0111522 |
7 |
|
8 |
[dev-util/cmake] Moved to tree. |
9 |
|
10 |
(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
dev-util/cmake/cmake-2.8.8.ebuild | 176 -------------------- |
14 |
dev-util/cmake/files/50cmake-gentoo.el | 4 - |
15 |
.../cmake/files/cmake-2.6.3-darwin-bundle.patch | 23 --- |
16 |
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ----- |
17 |
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 -- |
18 |
.../cmake-2.8.0-darwin-default-install_name.patch | 20 --- |
19 |
dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ------ |
20 |
.../cmake/files/cmake-2.8.4-FindPythonLibs.patch | 12 -- |
21 |
dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch | 45 ----- |
22 |
.../cmake/files/cmake-2.8.7-FindBoost-python.patch | 73 -------- |
23 |
dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch | 44 ----- |
24 |
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 -- |
25 |
.../files/cmake-2.8.8-more-no_host_paths.patch | 110 ------------ |
26 |
dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 ------- |
27 |
dev-util/cmake/files/cmake.vim | 3 - |
28 |
dev-util/cmake/metadata.xml | 5 - |
29 |
16 files changed, 0 insertions(+), 699 deletions(-) |
30 |
|
31 |
diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild |
32 |
deleted file mode 100644 |
33 |
index cab3e53..0000000 |
34 |
--- a/dev-util/cmake/cmake-2.8.8.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,176 +0,0 @@ |
37 |
-# Copyright 1999-2012 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Header: $ |
40 |
- |
41 |
-EAPI=4 |
42 |
- |
43 |
-CMAKE_REMOVE_MODULES="no" |
44 |
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx |
45 |
- |
46 |
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})" |
47 |
- |
48 |
-DESCRIPTION="Cross platform Make" |
49 |
-HOMEPAGE="http://www.cmake.org/" |
50 |
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" |
51 |
- |
52 |
-LICENSE="CMake" |
53 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
54 |
-SLOT="0" |
55 |
-IUSE="emacs ncurses qt4 vim-syntax" |
56 |
- |
57 |
-DEPEND=" |
58 |
- >=app-arch/libarchive-2.8.0 |
59 |
- >=net-misc/curl-7.20.0-r1[ssl] |
60 |
- >=dev-libs/expat-2.0.1 |
61 |
- dev-util/pkgconfig |
62 |
- sys-libs/zlib |
63 |
- ncurses? ( sys-libs/ncurses ) |
64 |
- qt4? ( x11-libs/qt-gui:4 ) |
65 |
-" |
66 |
-RDEPEND="${DEPEND} |
67 |
- emacs? ( virtual/emacs ) |
68 |
- vim-syntax? ( |
69 |
- || ( |
70 |
- app-editors/vim |
71 |
- app-editors/gvim |
72 |
- ) |
73 |
- ) |
74 |
-" |
75 |
- |
76 |
-SITEFILE="50${PN}-gentoo.el" |
77 |
-VIMFILE="${PN}.vim" |
78 |
- |
79 |
-S="${WORKDIR}/${MY_P}" |
80 |
- |
81 |
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
82 |
- |
83 |
-PATCHES=( |
84 |
- "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch |
85 |
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch |
86 |
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch |
87 |
- "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch |
88 |
- "${FILESDIR}"/${PN}-2.8.1-libform.patch |
89 |
- "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch |
90 |
- "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch |
91 |
- "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch |
92 |
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch |
93 |
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch |
94 |
- "${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch |
95 |
- "${FILESDIR}"/${PN}-2.8.8-tests.patch |
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:]]+' | egrep -o '[[:digit:]]+') |
104 |
- par_arg="--parallel=${par_arg}" |
105 |
- else |
106 |
- par_arg="--parallel=1" |
107 |
- fi |
108 |
- |
109 |
- tc-export CC CXX LD |
110 |
- |
111 |
- ./bootstrap \ |
112 |
- --prefix="${T}/cmakestrap/" \ |
113 |
- ${par_arg} \ |
114 |
- || die "Bootstrap failed" |
115 |
-} |
116 |
- |
117 |
-cmake_src_test() { |
118 |
- # fix OutDir test |
119 |
- # this is altered thanks to our eclass |
120 |
- sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die |
121 |
- |
122 |
- pushd "${CMAKE_BUILD_DIR}" > /dev/null |
123 |
- |
124 |
- local ctestargs |
125 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
126 |
- |
127 |
- # Excluded tests: |
128 |
- # BootstrapTest: we actualy bootstrap it every time so why test it. |
129 |
- # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test |
130 |
- # as it was never intended to be used this way. |
131 |
- "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ |
132 |
- -E BootstrapTest SimpleCOnly_sdcc \ |
133 |
- || die "Tests failed" |
134 |
- |
135 |
- popd > /dev/null |
136 |
-} |
137 |
- |
138 |
-pkg_setup() { |
139 |
- einfo "Fixing java access violations ..." |
140 |
- # bug 387227 |
141 |
- addpredict /proc/self/coredump_filter |
142 |
-} |
143 |
- |
144 |
-src_prepare() { |
145 |
- base_src_prepare |
146 |
- |
147 |
- # disable running of cmake in boostrap command |
148 |
- sed -i \ |
149 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
150 |
- bootstrap || die "sed failed" |
151 |
- |
152 |
- # Add gcc libs to the default link paths |
153 |
- sed -i \ |
154 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
155 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
156 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
157 |
- |
158 |
- cmake_src_bootstrap |
159 |
-} |
160 |
- |
161 |
-src_configure() { |
162 |
- # make things work with gentoo java setup |
163 |
- # in case java-config cannot be run, the variable just becomes unset |
164 |
- # per bug #315229 |
165 |
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) |
166 |
- |
167 |
- local mycmakeargs=( |
168 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
169 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
170 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
171 |
- -DCMAKE_MAN_DIR=/share/man |
172 |
- -DCMAKE_DATA_DIR=/share/${PN} |
173 |
- $(cmake-utils_use_build ncurses CursesDialog) |
174 |
- $(cmake-utils_use_build qt4 QtDialog) |
175 |
- ) |
176 |
- cmake-utils_src_configure |
177 |
-} |
178 |
- |
179 |
-src_compile() { |
180 |
- cmake-utils_src_compile |
181 |
- use emacs && elisp-compile Docs/cmake-mode.el |
182 |
-} |
183 |
- |
184 |
-src_test() { |
185 |
- VIRTUALX_COMMAND="cmake_src_test" virtualmake |
186 |
-} |
187 |
- |
188 |
-src_install() { |
189 |
- cmake-utils_src_install |
190 |
- if use emacs; then |
191 |
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc |
192 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
193 |
- fi |
194 |
- if use vim-syntax; then |
195 |
- insinto /usr/share/vim/vimfiles/syntax |
196 |
- doins Docs/cmake-syntax.vim |
197 |
- |
198 |
- insinto /usr/share/vim/vimfiles/indent |
199 |
- doins Docs/cmake-indent.vim |
200 |
- |
201 |
- insinto /usr/share/vim/vimfiles/ftdetect |
202 |
- doins "${FILESDIR}/${VIMFILE}" |
203 |
- fi |
204 |
-} |
205 |
- |
206 |
-pkg_postinst() { |
207 |
- use emacs && elisp-site-regen |
208 |
-} |
209 |
- |
210 |
-pkg_postrm() { |
211 |
- use emacs && elisp-site-regen |
212 |
-} |
213 |
|
214 |
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el |
215 |
deleted file mode 100644 |
216 |
index e4a1a6d..0000000 |
217 |
--- a/dev-util/cmake/files/50cmake-gentoo.el |
218 |
+++ /dev/null |
219 |
@@ -1,4 +0,0 @@ |
220 |
-(add-to-list 'load-path "@SITELISP@") |
221 |
-(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) |
222 |
-(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) |
223 |
-(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) |
224 |
|
225 |
diff --git a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch |
226 |
deleted file mode 100644 |
227 |
index 6ee9b70..0000000 |
228 |
--- a/dev-util/cmake/files/cmake-2.6.3-darwin-bundle.patch |
229 |
+++ /dev/null |
230 |
@@ -1,23 +0,0 @@ |
231 |
-Don't use .so for modules on darwin/macos. Use .bundle instead. |
232 |
-Patch by Heiko Przybyl |
233 |
- |
234 |
---- Modules/Platform/Darwin.cmake |
235 |
-+++ Modules/Platform/Darwin.cmake |
236 |
-@@ -23,7 +23,7 @@ |
237 |
- SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") |
238 |
- SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") |
239 |
- SET(CMAKE_SHARED_MODULE_PREFIX "lib") |
240 |
--SET(CMAKE_SHARED_MODULE_SUFFIX ".so") |
241 |
-+SET(CMAKE_SHARED_MODULE_SUFFIX ".bundle") |
242 |
- SET(CMAKE_MODULE_EXISTS 1) |
243 |
- SET(CMAKE_DL_LIBS "") |
244 |
- |
245 |
-@@ -45,7 +45,7 @@ |
246 |
- SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names") |
247 |
- SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") |
248 |
- SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") |
249 |
--SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") |
250 |
-+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") |
251 |
- |
252 |
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree |
253 |
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache |
254 |
|
255 |
diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch |
256 |
deleted file mode 100644 |
257 |
index 02c3011..0000000 |
258 |
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch |
259 |
+++ /dev/null |
260 |
@@ -1,39 +0,0 @@ |
261 |
-http://public.kitware.com/Bug/view.php?id=7933 |
262 |
- |
263 |
-diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx |
264 |
---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 |
265 |
-+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 |
266 |
-@@ -38,6 +38,13 @@ |
267 |
- int main() { return 0; } |
268 |
- #endif |
269 |
- |
270 |
-+#ifdef TEST_KWSYS_LFS_SUPPORT |
271 |
-+#define _LARGE_FILES |
272 |
-+#include <iostream> |
273 |
-+int main() { return 0; } |
274 |
-+#endif |
275 |
-+ |
276 |
-+ |
277 |
- #ifdef TEST_KWSYS_IOS_HAVE_STD |
278 |
- #include <iosfwd> |
279 |
- void f(std ::ostream*) {} |
280 |
-diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap |
281 |
---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 |
282 |
-+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 |
283 |
-@@ -1005,6 +1005,16 @@ |
284 |
- echo "${cmake_cxx_compiler} does not have stl iterator_traits" |
285 |
- fi |
286 |
- |
287 |
-+if cmake_try_run "${cmake_cxx_compiler}" \ |
288 |
-+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ |
289 |
-+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then |
290 |
-+ KWSYS_LFS_AVAILABLE=1 |
291 |
-+ echo "LFS support available" |
292 |
-+else |
293 |
-+ KWSYS_LFS_AVAILABLE=0 |
294 |
-+ echo "LFS support unavailable, disabled" |
295 |
-+fi |
296 |
-+ |
297 |
- if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then |
298 |
- if cmake_try_run "${cmake_cxx_compiler}" \ |
299 |
- "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ |
300 |
|
301 |
diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch |
302 |
deleted file mode 100644 |
303 |
index ceb205f..0000000 |
304 |
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch |
305 |
+++ /dev/null |
306 |
@@ -1,19 +0,0 @@ |
307 |
-Patch by Heiko Przybyl |
308 |
- |
309 |
---- Source/cmComputeLinkInformation.cxx |
310 |
-+++ Source/cmComputeLinkInformation.cxx |
311 |
-@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge |
312 |
- for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); |
313 |
- ri != runtimeDirs.end(); ++ri) |
314 |
- { |
315 |
-+ // Do not add duplicates. |
316 |
-+ // I'd like to have that check already in the list generation code |
317 |
-+ // but that would need lots of more changes, even in ExpandListArgument(). |
318 |
-+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) |
319 |
-+ { |
320 |
-+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; |
321 |
-+ continue; |
322 |
-+ } |
323 |
- // Separate from previous path. |
324 |
- rpath += sep; |
325 |
- sep = this->GetRuntimeSep().c_str(); |
326 |
|
327 |
diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch |
328 |
deleted file mode 100644 |
329 |
index 4ef0c7b..0000000 |
330 |
--- a/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch |
331 |
+++ /dev/null |
332 |
@@ -1,20 +0,0 @@ |
333 |
-The install_name of a library can be compared to the ELF soname, setting |
334 |
-it to just the library name (libx.1.dylib) is not sufficient on Mach-O, |
335 |
-as it uses full paths. Most apps have no clue about that, so they don't |
336 |
-do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html |
337 |
- |
338 |
-Provide a sane default that will allow merging most cmake-based |
339 |
-packages. If this location is not correct, Portage's QA checks will |
340 |
-catch that. |
341 |
- |
342 |
---- Source/cmTarget.cxx |
343 |
-+++ Source/cmTarget.cxx |
344 |
-@@ -974,7 +974,7 @@ |
345 |
- this->Makefile->IsOn("MINGW")); |
346 |
- |
347 |
- // Setup default property values. |
348 |
-- this->SetPropertyDefault("INSTALL_NAME_DIR", ""); |
349 |
-+ this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib"); |
350 |
- this->SetPropertyDefault("INSTALL_RPATH", ""); |
351 |
- this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF"); |
352 |
- this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF"); |
353 |
|
354 |
diff --git a/dev-util/cmake/files/cmake-2.8.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch |
355 |
deleted file mode 100644 |
356 |
index 87c7247..0000000 |
357 |
--- a/dev-util/cmake/files/cmake-2.8.1-libform.patch |
358 |
+++ /dev/null |
359 |
@@ -1,50 +0,0 @@ |
360 |
-diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt |
361 |
---- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100 |
362 |
-+++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200 |
363 |
-@@ -314,9 +314,6 @@ |
364 |
- ELSE (UNIX) |
365 |
- SET(BUILD_CursesDialog 0) |
366 |
- ENDIF (UNIX) |
367 |
-- IF(BUILD_CursesDialog) |
368 |
-- ADD_SUBDIRECTORY(Source/CursesDialog/form) |
369 |
-- ENDIF(BUILD_CursesDialog) |
370 |
- ENDMACRO (CMAKE_BUILD_UTILITIES) |
371 |
- |
372 |
- |
373 |
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt |
374 |
---- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100 |
375 |
-+++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200 |
376 |
-@@ -25,13 +25,18 @@ |
377 |
- CursesDialog/ccmake |
378 |
- ) |
379 |
- |
380 |
--INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form |
381 |
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form) |
382 |
- INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) |
383 |
- |
384 |
- |
385 |
- ADD_EXECUTABLE(ccmake ${CURSES_SRCS} ) |
386 |
- TARGET_LINK_LIBRARIES(ccmake CMakeLib) |
387 |
--TARGET_LINK_LIBRARIES(ccmake cmForm) |
388 |
-+TARGET_LINK_LIBRARIES(ccmake form) |
389 |
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) |
390 |
-+IF(CURSES_EXTRA_LIBRARY) |
391 |
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) |
392 |
-+ENDIF(CURSES_EXTRA_LIBRARY) |
393 |
-+ |
394 |
- |
395 |
- INSTALL_TARGETS(/bin ccmake) |
396 |
-+ |
397 |
-+ |
398 |
-diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h |
399 |
---- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100 |
400 |
-+++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200 |
401 |
-@@ -15,8 +15,6 @@ |
402 |
- #define _MSE_INT_H |
403 |
- #endif |
404 |
- |
405 |
--#include <cmFormConfigure.h> |
406 |
-- |
407 |
- #if defined(__hpux) |
408 |
- # define _BOOL_DEFINED |
409 |
- # include <sys/time.h> |
410 |
|
411 |
diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch |
412 |
deleted file mode 100644 |
413 |
index 28d2e4f..0000000 |
414 |
--- a/dev-util/cmake/files/cmake-2.8.4-FindPythonLibs.patch |
415 |
+++ /dev/null |
416 |
@@ -1,12 +0,0 @@ |
417 |
-diff -urN cmake-2.8.4.old/Modules/FindPythonLibs.cmake cmake-2.8.4/Modules/FindPythonLibs.cmake |
418 |
---- cmake-2.8.4.old/Modules/FindPythonLibs.cmake 2011-02-20 19:32:16.363655002 +0100 |
419 |
-+++ cmake-2.8.4/Modules/FindPythonLibs.cmake 2011-02-20 19:33:51.905655001 +0100 |
420 |
-@@ -33,6 +33,8 @@ |
421 |
- ${Python_ADDITIONAL_VERSIONS} |
422 |
- 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
423 |
- |
424 |
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" |
425 |
-+ OUTPUT_VARIABLE _Python_VERSIONS) |
426 |
- FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) |
427 |
- STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) |
428 |
- IF(WIN32) |
429 |
|
430 |
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch |
431 |
deleted file mode 100644 |
432 |
index a91214c..0000000 |
433 |
--- a/dev-util/cmake/files/cmake-2.8.7-FindBLAS.patch |
434 |
+++ /dev/null |
435 |
@@ -1,45 +0,0 @@ |
436 |
-diff -ruN cmake-2.8.7.orig/Modules/FindBLAS.cmake cmake-2.8.7/Modules/FindBLAS.cmake |
437 |
---- cmake-2.8.7.orig/Modules/FindBLAS.cmake 2011-12-30 17:49:56.000000000 +0100 |
438 |
-+++ cmake-2.8.7/Modules/FindBLAS.cmake 2012-03-08 05:38:47.000000000 +0100 |
439 |
-@@ -1,3 +1,9 @@ |
440 |
-+# |
441 |
-+# Version modified for Gentoo Linux |
442 |
-+# If a valid PkgConfig configuration for blas is found, this overrides and cancels |
443 |
-+# all further checks. |
444 |
-+# |
445 |
-+ |
446 |
- # - Find BLAS library |
447 |
- # This module finds an installed fortran library that implements the BLAS |
448 |
- # linear-algebra interface (see http://www.netlib.org/blas/). |
449 |
-@@ -39,6 +45,24 @@ |
450 |
- # (To distribute this file outside of CMake, substitute the full |
451 |
- # License text for the above reference.) |
452 |
- |
453 |
-+# |
454 |
-+# first, try PkgConfig |
455 |
-+# |
456 |
-+find_package(PkgConfig REQUIRED) |
457 |
-+pkg_check_modules(PC_BLAS blas) |
458 |
-+if(PC_BLAS_FOUND) |
459 |
-+ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) |
460 |
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) |
461 |
-+ if (NOT ${PC_LIB}_LIBRARY) |
462 |
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") |
463 |
-+ endif (NOT ${PC_LIB}_LIBRARY) |
464 |
-+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) |
465 |
-+ endforeach(PC_LIB) |
466 |
-+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) |
467 |
-+ mark_as_advanced(BLAS_LIBRARIES) |
468 |
-+else(PC_BLAS_FOUND) |
469 |
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") |
470 |
-+ |
471 |
- include(CheckFunctionExists) |
472 |
- include(CheckFortranFunctionExists) |
473 |
- |
474 |
-@@ -622,3 +646,6 @@ |
475 |
- endif(BLA_F95) |
476 |
- |
477 |
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
478 |
-+ |
479 |
-+endif(PC_BLAS_FOUND) |
480 |
-+ |
481 |
|
482 |
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch |
483 |
deleted file mode 100644 |
484 |
index edaa91f..0000000 |
485 |
--- a/dev-util/cmake/files/cmake-2.8.7-FindBoost-python.patch |
486 |
+++ /dev/null |
487 |
@@ -1,73 +0,0 @@ |
488 |
---- Modules/FindBoost.cmake |
489 |
-+++ Modules/FindBoost.cmake |
490 |
-@@ -953,6 +953,11 @@ |
491 |
- set( _boost_docstring_release "Boost ${COMPONENT} library (release)") |
492 |
- set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") |
493 |
- |
494 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
495 |
-+ # CPython-specific version of _PYTHON_ABI_EXTRACTION_COMMAND variable from python.eclass. |
496 |
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_abi) |
497 |
-+ endif() |
498 |
-+ |
499 |
- # |
500 |
- # Find RELEASE libraries |
501 |
- # |
502 |
-@@ -962,6 +967,14 @@ |
503 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
504 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
505 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT} ) |
506 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
507 |
-+ list(APPEND _boost_RELEASE_NAMES |
508 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
509 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
510 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
511 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
512 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) |
513 |
-+ endif() |
514 |
- if(_boost_STATIC_RUNTIME_WORKAROUND) |
515 |
- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") |
516 |
- list(APPEND _boost_RELEASE_NAMES |
517 |
-@@ -969,6 +982,13 @@ |
518 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
519 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
520 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
521 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
522 |
-+ list(APPEND _boost_RELEASE_NAMES |
523 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
524 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
525 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
526 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
527 |
-+ endif() |
528 |
- endif() |
529 |
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
530 |
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) |
531 |
-@@ -994,6 +1014,15 @@ |
532 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
533 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} |
534 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT} ) |
535 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
536 |
-+ list(APPEND _boost_DEBUG_NAMES |
537 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
538 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
539 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
540 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
541 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED} |
542 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi} ) |
543 |
-+ endif() |
544 |
- if(_boost_STATIC_RUNTIME_WORKAROUND) |
545 |
- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") |
546 |
- list(APPEND _boost_DEBUG_NAMES |
547 |
-@@ -1001,6 +1030,13 @@ |
548 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
549 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
550 |
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
551 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
552 |
-+ list(APPEND _boost_DEBUG_NAMES |
553 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
554 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
555 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
556 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_abi}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
557 |
-+ endif() |
558 |
- endif() |
559 |
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
560 |
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) |
561 |
|
562 |
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch |
563 |
deleted file mode 100644 |
564 |
index 6808b80..0000000 |
565 |
--- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch |
566 |
+++ /dev/null |
567 |
@@ -1,44 +0,0 @@ |
568 |
-diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake |
569 |
---- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100 |
570 |
-+++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100 |
571 |
-@@ -1,3 +1,9 @@ |
572 |
-+# |
573 |
-+# Version modified for Gentoo Linux |
574 |
-+# If a valid PkgConfig configuration is found, this overrides and cancels |
575 |
-+# all further checks. |
576 |
-+# |
577 |
-+ |
578 |
- # - Find LAPACK library |
579 |
- # This module finds an installed fortran library that implements the LAPACK |
580 |
- # linear-algebra interface (see http://www.netlib.org/lapack/). |
581 |
-@@ -36,6 +42,24 @@ |
582 |
- # (To distribute this file outside of CMake, substitute the full |
583 |
- # License text for the above reference.) |
584 |
- |
585 |
-+# |
586 |
-+# first, try PkgConfig |
587 |
-+# |
588 |
-+find_package(PkgConfig REQUIRED) |
589 |
-+pkg_check_modules(PC_LAPACK lapack) |
590 |
-+if(PC_LAPACK_FOUND) |
591 |
-+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) |
592 |
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) |
593 |
-+ if (NOT ${PC_LIB}_LIBRARY) |
594 |
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") |
595 |
-+ endif (NOT ${PC_LIB}_LIBRARY) |
596 |
-+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) |
597 |
-+ endforeach(PC_LIB) |
598 |
-+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) |
599 |
-+ mark_as_advanced(LAPACK_LIBRARIES) |
600 |
-+else(PC_LAPACK_FOUND) |
601 |
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") |
602 |
-+ |
603 |
- set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) |
604 |
- |
605 |
- get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) |
606 |
-@@ -305,3 +329,5 @@ |
607 |
- endif(BLA_F95) |
608 |
- |
609 |
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
610 |
-+ |
611 |
-+endif(PC_LAPACK_FOUND) |
612 |
|
613 |
diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
614 |
deleted file mode 100644 |
615 |
index c5e17c5..0000000 |
616 |
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
617 |
+++ /dev/null |
618 |
@@ -1,18 +0,0 @@ |
619 |
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake |
620 |
-index c47f583..5783d37 100644 |
621 |
---- a/Modules/FindPkgConfig.cmake |
622 |
-+++ b/Modules/FindPkgConfig.cmake |
623 |
-@@ -87,7 +87,12 @@ |
624 |
- set(PKG_CONFIG_VERSION 1) |
625 |
- set(PKG_CONFIG_FOUND 0) |
626 |
- |
627 |
--find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
628 |
-+if(NOT PKG_CONFIG_EXECUTABLE) |
629 |
-+ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) |
630 |
-+ if(NOT PKG_CONFIG_EXECUTABLE) |
631 |
-+ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
632 |
-+ endif(NOT PKG_CONFIG_EXECUTABLE) |
633 |
-+endif(NOT PKG_CONFIG_EXECUTABLE) |
634 |
- mark_as_advanced(PKG_CONFIG_EXECUTABLE) |
635 |
- |
636 |
- if(PKG_CONFIG_EXECUTABLE) |
637 |
|
638 |
diff --git a/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch |
639 |
deleted file mode 100644 |
640 |
index ca76835..0000000 |
641 |
--- a/dev-util/cmake/files/cmake-2.8.8-more-no_host_paths.patch |
642 |
+++ /dev/null |
643 |
@@ -1,110 +0,0 @@ |
644 |
-Set some proper paths to make cmake find our tools. |
645 |
-Original patch by Heiko Przybyl, updated for cmake-2.8.8 by Chris Reffett |
646 |
- |
647 |
-The ebuild now adds an extra / at the end of $EPREFIX so that it is |
648 |
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains |
649 |
-correct) |
650 |
- |
651 |
---- cmake-2.8.8/Modules/Platform/Darwin.cmake |
652 |
-+++ cmake-2.8.8/Modules/Platform/Darwin.cmake |
653 |
-@@ -229,20 +229,24 @@ |
654 |
- |
655 |
- |
656 |
- |
657 |
--# default to searching for frameworks first |
658 |
--SET(CMAKE_FIND_FRAMEWORK FIRST) |
659 |
-+# default to searching for frameworks last |
660 |
-+SET(CMAKE_FIND_FRAMEWORK LAST) |
661 |
- # set up the default search directories for frameworks |
662 |
- SET(CMAKE_SYSTEM_FRAMEWORK_PATH |
663 |
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks |
664 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
665 |
- ~/Library/Frameworks |
666 |
- /Library/Frameworks |
667 |
- /Network/Library/Frameworks |
668 |
- /System/Library/Frameworks) |
669 |
- |
670 |
--# default to searching for application bundles first |
671 |
--SET(CMAKE_FIND_APPBUNDLE FIRST) |
672 |
-+# default to searching for application bundles last |
673 |
-+SET(CMAKE_FIND_APPBUNDLE LAST) |
674 |
- # set up the default search directories for application bundles |
675 |
- SET(_apps_paths) |
676 |
- FOREACH(_path |
677 |
-+ @GENTOO_PORTAGE_EPREFIX@Applications |
678 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin |
679 |
- "~/Applications" |
680 |
- "/Applications" |
681 |
- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ |
682 |
-diff -ruN cmake-2.8.8.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.8/Modules/Platform/UnixPaths.cmake |
683 |
---- cmake-2.8.8/Modules/Platform/UnixPaths.cmake |
684 |
-+++ cmake-2.8.8/Modules/Platform/UnixPaths.cmake |
685 |
-@@ -33,6 +33,7 @@ |
686 |
- # search types. |
687 |
- LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH |
688 |
- # Standard |
689 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ |
690 |
- /usr/local /usr / |
691 |
- |
692 |
- # CMake install location |
693 |
-@@ -44,43 +45,39 @@ |
694 |
- |
695 |
- # List common include file locations not under the common prefixes. |
696 |
- LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH |
697 |
-- # Windows API on Cygwin |
698 |
-- /usr/include/w32api |
699 |
-- |
700 |
-- # X11 |
701 |
-- /usr/X11R6/include /usr/include/X11 |
702 |
-- |
703 |
-- # Other |
704 |
-- /usr/pkg/include |
705 |
-- /opt/csw/include /opt/include |
706 |
-- /usr/openwin/include |
707 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/include |
708 |
- ) |
709 |
- |
710 |
- LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH |
711 |
-- # Windows API on Cygwin |
712 |
-- /usr/lib/w32api |
713 |
-- |
714 |
-- # X11 |
715 |
-- /usr/X11R6/lib /usr/lib/X11 |
716 |
-- |
717 |
-- # Other |
718 |
-- /usr/pkg/lib |
719 |
-- /opt/csw/lib /opt/lib |
720 |
-- /usr/openwin/lib |
721 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
722 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@ |
723 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
724 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
725 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
726 |
-+ @GENTOO_PORTAGE_EPREFIX@lib |
727 |
- ) |
728 |
- |
729 |
- LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH |
730 |
-- /usr/pkg/bin |
731 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin |
732 |
-+ @GENTOO_PORTAGE_EPREFIX@bin |
733 |
- ) |
734 |
- |
735 |
- LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES |
736 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
737 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@ |
738 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
739 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
740 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
741 |
-+ @GENTOO_PORTAGE_EPREFIX@lib |
742 |
- /lib /usr/lib /usr/lib32 /usr/lib64 |
743 |
- ) |
744 |
- |
745 |
- LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES |
746 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/include |
747 |
- /usr/include |
748 |
- ) |
749 |
- LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES |
750 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/include |
751 |
- /usr/include |
752 |
- ) |
753 |
- |
754 |
|
755 |
diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmake/files/cmake-2.8.8-tests.patch |
756 |
deleted file mode 100644 |
757 |
index 64af9d3..0000000 |
758 |
--- a/dev-util/cmake/files/cmake-2.8.8-tests.patch |
759 |
+++ /dev/null |
760 |
@@ -1,58 +0,0 @@ |
761 |
-Remove DeployQt4 test, which tries to break sandbox and ignores prefix, and CTest.updatecvs, which fails to commit as root |
762 |
---- cmake-2.8.8/Tests/CMakeLists.txt |
763 |
-+++ cmake-2.8.8/Tests/CMakeLists.txt |
764 |
-@@ -273,23 +273,6 @@ |
765 |
- ) |
766 |
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities") |
767 |
- |
768 |
-- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities) |
769 |
-- # this test also depends on the existence of the standard qtiff plugin |
770 |
-- if(QT4_WORKS AND QT_QTSQL_FOUND) |
771 |
-- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND} |
772 |
-- --build-and-test |
773 |
-- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy" |
774 |
-- "${CMake_BINARY_DIR}/Tests/Qt4Deploy" |
775 |
-- --build-generator ${CMAKE_TEST_GENERATOR} |
776 |
-- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} |
777 |
-- --build-project Qt4Deploy |
778 |
-- --build-options |
779 |
-- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} |
780 |
-- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} |
781 |
-- ) |
782 |
-- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy") |
783 |
-- endif() |
784 |
-- |
785 |
- endif() |
786 |
- endif() |
787 |
- |
788 |
-@@ -1548,30 +1531,6 @@ |
789 |
- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}") |
790 |
- ENDIF(Subversion_FOUND) |
791 |
- |
792 |
-- # Test CTest Update with CVS |
793 |
-- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) |
794 |
-- FIND_PACKAGE(CVS QUIET) |
795 |
-- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) |
796 |
-- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs) |
797 |
-- SET(CVS_FOUND ${CVS_EXECUTABLE}) |
798 |
-- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) |
799 |
-- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND}) |
800 |
-- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) |
801 |
-- IF("${CVS_EXECUTABLE}" MATCHES "cygwin") |
802 |
-- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!") |
803 |
-- SET(CTEST_TEST_UPDATE_CVS 0) |
804 |
-- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin") |
805 |
-- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) |
806 |
-- IF(CTEST_TEST_UPDATE_CVS) |
807 |
-- SET(CTestUpdateCVS_DIR "CTest UpdateCVS") |
808 |
-- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in" |
809 |
-- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY) |
810 |
-- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND} |
811 |
-- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" |
812 |
-- ) |
813 |
-- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}") |
814 |
-- ENDIF(CTEST_TEST_UPDATE_CVS) |
815 |
-- |
816 |
- # Test CTest Update with BZR |
817 |
- FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr) |
818 |
- MARK_AS_ADVANCED(BZR_EXECUTABLE) |
819 |
|
820 |
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim |
821 |
deleted file mode 100644 |
822 |
index 5cecd7d..0000000 |
823 |
--- a/dev-util/cmake/files/cmake.vim |
824 |
+++ /dev/null |
825 |
@@ -1,3 +0,0 @@ |
826 |
-autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim |
827 |
-autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake |
828 |
-autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake |
829 |
|
830 |
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml |
831 |
deleted file mode 100644 |
832 |
index a23f444..0000000 |
833 |
--- a/dev-util/cmake/metadata.xml |
834 |
+++ /dev/null |
835 |
@@ -1,5 +0,0 @@ |
836 |
-<?xml version="1.0" encoding="UTF-8"?> |
837 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
838 |
-<pkgmetadata> |
839 |
- <herd>kde</herd> |
840 |
-</pkgmetadata> |