1 |
commit: 3b0721973def80758010c73f486239fe16eded80 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 27 10:23:55 2014 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 27 10:23:55 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3b072197 |
7 |
|
8 |
[dev-util/cmake] Moved to tree |
9 |
|
10 |
Package-Manager: portage-2.2.10 |
11 |
|
12 |
--- |
13 |
dev-util/cmake/cmake-3.0.0.ebuild | 183 --------------------- |
14 |
dev-util/cmake/files/50cmake-gentoo.el | 4 - |
15 |
.../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --- |
16 |
.../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 --- |
17 |
.../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ------ |
18 |
dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 ------ |
19 |
.../files/cmake-2.8.10.2-FindPythonInterp.patch | 22 --- |
20 |
.../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 --- |
21 |
.../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 ----- |
22 |
.../files/cmake-2.8.12.1-FindImageMagick.patch | 23 --- |
23 |
.../cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 -- |
24 |
dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch | 43 ----- |
25 |
.../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 ----------- |
26 |
dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch | 44 ----- |
27 |
dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 ---------------- |
28 |
dev-util/cmake/files/cmake.vim | 3 - |
29 |
dev-util/cmake/metadata.xml | 5 - |
30 |
17 files changed, 790 deletions(-) |
31 |
|
32 |
diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild |
33 |
deleted file mode 100644 |
34 |
index 63b4bf6..0000000 |
35 |
--- a/dev-util/cmake/cmake-3.0.0.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,183 +0,0 @@ |
38 |
-# Copyright 1999-2014 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
-# $Header: $ |
41 |
- |
42 |
-EAPI=5 |
43 |
- |
44 |
-CMAKE_REMOVE_MODULES="no" |
45 |
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
46 |
- |
47 |
-DESCRIPTION="Cross platform Make" |
48 |
-HOMEPAGE="http://www.cmake.org/" |
49 |
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" |
50 |
- |
51 |
-LICENSE="CMake" |
52 |
-SLOT="0" |
53 |
-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" |
54 |
-IUSE="emacs ncurses qt4 qt5" |
55 |
- |
56 |
-REQUIRED_USE="?? ( qt4 qt5 )" |
57 |
- |
58 |
-DEPEND=" |
59 |
- >=app-arch/libarchive-2.8.0:= |
60 |
- >=dev-libs/expat-2.0.1 |
61 |
- >=net-misc/curl-7.20.0-r1[ssl] |
62 |
- sys-libs/zlib |
63 |
- virtual/pkgconfig |
64 |
- emacs? ( virtual/emacs ) |
65 |
- ncurses? ( sys-libs/ncurses ) |
66 |
- qt4? ( |
67 |
- dev-qt/qtcore:4 |
68 |
- dev-qt/qtgui:4 |
69 |
- ) |
70 |
- qt5? ( |
71 |
- dev-qt/qtcore:5 |
72 |
- dev-qt/qtgui:5 |
73 |
- dev-qt/qtwidgets:5 |
74 |
- ) |
75 |
-" |
76 |
-RDEPEND="${DEPEND}" |
77 |
- |
78 |
-SITEFILE="50${PN}-gentoo.el" |
79 |
- |
80 |
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
81 |
- |
82 |
-PATCHES=( |
83 |
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch |
84 |
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch |
85 |
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch |
86 |
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch |
87 |
- "${FILESDIR}"/${PN}-2.8.10-libform.patch |
88 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch |
89 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
90 |
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch |
91 |
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch |
92 |
- "${FILESDIR}"/${PN}-3.0.0-FindLAPACK.patch |
93 |
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch |
94 |
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch |
95 |
-) |
96 |
- |
97 |
-cmake_src_bootstrap() { |
98 |
- # Cleanup args to extract only JOBS. |
99 |
- # Because bootstrap does not know anything else. |
100 |
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null |
101 |
- if [ $? -eq 0 ]; then |
102 |
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') |
103 |
- par_arg="--parallel=${par_arg}" |
104 |
- else |
105 |
- par_arg="--parallel=1" |
106 |
- fi |
107 |
- |
108 |
- # execinfo.h on Solaris isn't quite what it is on Darwin |
109 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
110 |
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
111 |
- fi |
112 |
- |
113 |
- tc-export CC CXX LD |
114 |
- |
115 |
- # bootstrap script isn't exactly /bin/sh compatible |
116 |
- ${CONFIG_SHELL:-sh} ./bootstrap \ |
117 |
- --prefix="${T}/cmakestrap/" \ |
118 |
- ${par_arg} \ |
119 |
- || die "Bootstrap failed" |
120 |
-} |
121 |
- |
122 |
-cmake_src_test() { |
123 |
- # fix OutDir and SelectLibraryConfigurations tests |
124 |
- # these are altered thanks to our eclass |
125 |
- sed -i -e 's:#IGNORE ::g' \ |
126 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
127 |
- || die |
128 |
- |
129 |
- pushd "${BUILD_DIR}" > /dev/null |
130 |
- |
131 |
- local ctestargs |
132 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
133 |
- |
134 |
- # Excluded tests: |
135 |
- # BootstrapTest: we actualy bootstrap it every time so why test it. |
136 |
- # CTest.updatecvs, which fails to commit as root |
137 |
- # Qt4Deploy, which tries to break sandbox and ignores prefix |
138 |
- # TestUpload, which requires network access |
139 |
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
140 |
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ |
141 |
- || die "Tests failed" |
142 |
- |
143 |
- popd > /dev/null |
144 |
-} |
145 |
- |
146 |
-src_prepare() { |
147 |
- cmake-utils_src_prepare |
148 |
- |
149 |
- # disable running of cmake in boostrap command |
150 |
- sed -i \ |
151 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
152 |
- bootstrap || die "sed failed" |
153 |
- |
154 |
- # Add gcc libs to the default link paths |
155 |
- sed -i \ |
156 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
157 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
158 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
159 |
- |
160 |
- cmake_src_bootstrap |
161 |
-} |
162 |
- |
163 |
-src_configure() { |
164 |
- local mycmakeargs=( |
165 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
166 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
167 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
168 |
- -DCMAKE_MAN_DIR=/share/man |
169 |
- -DCMAKE_DATA_DIR=/share/${PN} |
170 |
- $(cmake-utils_use_build ncurses CursesDialog) |
171 |
- ) |
172 |
- |
173 |
- if use qt4 || use qt5 ; then |
174 |
- mycmakeargs+=( |
175 |
- -DBUILD_QtDialog=ON |
176 |
- $(cmake-utils_use_find_package qt5 Qt5Widgets) |
177 |
- ) |
178 |
- fi |
179 |
- |
180 |
- cmake-utils_src_configure |
181 |
-} |
182 |
- |
183 |
-src_compile() { |
184 |
- cmake-utils_src_compile |
185 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
186 |
-} |
187 |
- |
188 |
-src_test() { |
189 |
- VIRTUALX_COMMAND="cmake_src_test" virtualmake |
190 |
-} |
191 |
- |
192 |
-src_install() { |
193 |
- cmake-utils_src_install |
194 |
- |
195 |
- if use emacs; then |
196 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
197 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
198 |
- fi |
199 |
- |
200 |
- insinto /usr/share/vim/vimfiles/syntax |
201 |
- doins Auxiliary/cmake-syntax.vim |
202 |
- |
203 |
- insinto /usr/share/vim/vimfiles/indent |
204 |
- doins Auxiliary/cmake-indent.vim |
205 |
- |
206 |
- insinto /usr/share/vim/vimfiles/ftdetect |
207 |
- doins "${FILESDIR}/${PN}.vim" |
208 |
- |
209 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
210 |
- |
211 |
- rm -rf "${D}/usr/share/cmake/{completions,editors}" || die |
212 |
-} |
213 |
- |
214 |
-pkg_postinst() { |
215 |
- use emacs && elisp-site-regen |
216 |
-} |
217 |
- |
218 |
-pkg_postrm() { |
219 |
- use emacs && elisp-site-regen |
220 |
-} |
221 |
|
222 |
diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el |
223 |
deleted file mode 100644 |
224 |
index e4a1a6d..0000000 |
225 |
--- a/dev-util/cmake/files/50cmake-gentoo.el |
226 |
+++ /dev/null |
227 |
@@ -1,4 +0,0 @@ |
228 |
-(add-to-list 'load-path "@SITELISP@") |
229 |
-(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) |
230 |
-(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) |
231 |
-(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) |
232 |
|
233 |
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 |
234 |
deleted file mode 100644 |
235 |
index ceb205f..0000000 |
236 |
--- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch |
237 |
+++ /dev/null |
238 |
@@ -1,19 +0,0 @@ |
239 |
-Patch by Heiko Przybyl |
240 |
- |
241 |
---- Source/cmComputeLinkInformation.cxx |
242 |
-+++ Source/cmComputeLinkInformation.cxx |
243 |
-@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge |
244 |
- for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); |
245 |
- ri != runtimeDirs.end(); ++ri) |
246 |
- { |
247 |
-+ // Do not add duplicates. |
248 |
-+ // I'd like to have that check already in the list generation code |
249 |
-+ // but that would need lots of more changes, even in ExpandListArgument(). |
250 |
-+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) |
251 |
-+ { |
252 |
-+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; |
253 |
-+ continue; |
254 |
-+ } |
255 |
- // Separate from previous path. |
256 |
- rpath += sep; |
257 |
- sep = this->GetRuntimeSep().c_str(); |
258 |
|
259 |
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 |
260 |
deleted file mode 100644 |
261 |
index 9cb4777..0000000 |
262 |
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch |
263 |
+++ /dev/null |
264 |
@@ -1,23 +0,0 @@ |
265 |
-Don't use .so for modules on darwin/macos. Use .bundle instead. |
266 |
-Patch by Heiko Przybyl |
267 |
- |
268 |
---- Modules/Platform/Darwin.cmake |
269 |
-+++ Modules/Platform/Darwin.cmake |
270 |
-@@ -26,7 +26,7 @@ |
271 |
- set(CMAKE_SHARED_LIBRARY_PREFIX "lib") |
272 |
- set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") |
273 |
- set(CMAKE_SHARED_MODULE_PREFIX "lib") |
274 |
--set(CMAKE_SHARED_MODULE_SUFFIX ".so") |
275 |
-+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") |
276 |
- set(CMAKE_MODULE_EXISTS 1) |
277 |
- set(CMAKE_DL_LIBS "") |
278 |
- |
279 |
-@@ -48,7 +48,7 @@ |
280 |
- set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") |
281 |
- set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") |
282 |
- set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") |
283 |
--set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") |
284 |
-+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") |
285 |
- |
286 |
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree |
287 |
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache |
288 |
|
289 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch |
290 |
deleted file mode 100644 |
291 |
index 97c93aa..0000000 |
292 |
--- a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch |
293 |
+++ /dev/null |
294 |
@@ -1,50 +0,0 @@ |
295 |
-Do not detect Xcode and set -isysroot for its SDK, since that messes up |
296 |
-our toolchain, and hence makes any compilation fail, bug #445308 |
297 |
- |
298 |
---- Modules/Platform/Darwin.cmake |
299 |
-+++ Modules/Platform/Darwin.cmake |
300 |
-@@ -60,18 +60,18 @@ |
301 |
- endif() |
302 |
- |
303 |
- # Ask xcode-select where to find /Developer or fall back to ancient location. |
304 |
--execute_process(COMMAND xcode-select -print-path |
305 |
-- OUTPUT_VARIABLE _stdout |
306 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE |
307 |
-- ERROR_VARIABLE _stderr |
308 |
-- RESULT_VARIABLE _failed) |
309 |
--if(NOT _failed AND IS_DIRECTORY ${_stdout}) |
310 |
-- set(OSX_DEVELOPER_ROOT ${_stdout}) |
311 |
--elseif(IS_DIRECTORY "/Developer") |
312 |
-- set(OSX_DEVELOPER_ROOT "/Developer") |
313 |
--else() |
314 |
-+#execute_process(COMMAND xcode-select -print-path |
315 |
-+# OUTPUT_VARIABLE _stdout |
316 |
-+# OUTPUT_STRIP_TRAILING_WHITESPACE |
317 |
-+# ERROR_VARIABLE _stderr |
318 |
-+# RESULT_VARIABLE _failed) |
319 |
-+#if(NOT _failed AND IS_DIRECTORY ${_stdout}) |
320 |
-+# set(OSX_DEVELOPER_ROOT ${_stdout}) |
321 |
-+#elseif(IS_DIRECTORY "/Developer") |
322 |
-+# set(OSX_DEVELOPER_ROOT "/Developer") |
323 |
-+#else() |
324 |
- set(OSX_DEVELOPER_ROOT "") |
325 |
--endif() |
326 |
-+#endif() |
327 |
- |
328 |
- execute_process(COMMAND sw_vers -productVersion |
329 |
- OUTPUT_VARIABLE CURRENT_OSX_VERSION |
330 |
-@@ -91,10 +91,10 @@ |
331 |
- # CMAKE_OSX_DEPLOYMENT_TARGET |
332 |
- |
333 |
- # Set cache variable - end user may change this during ccmake or cmake-gui configure. |
334 |
--if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) |
335 |
-- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING |
336 |
-- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") |
337 |
--endif() |
338 |
-+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) |
339 |
-+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING |
340 |
-+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") |
341 |
-+#endif() |
342 |
- |
343 |
- #---------------------------------------------------------------------------- |
344 |
- # CMAKE_OSX_SYSROOT |
345 |
|
346 |
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch |
347 |
deleted file mode 100644 |
348 |
index 052cc30..0000000 |
349 |
--- a/dev-util/cmake/files/cmake-2.8.10-libform.patch |
350 |
+++ /dev/null |
351 |
@@ -1,51 +0,0 @@ |
352 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
353 |
-index ea1c033..ae479ce 100644 |
354 |
---- a/CMakeLists.txt |
355 |
-+++ b/CMakeLists.txt |
356 |
-@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) |
357 |
- else () |
358 |
- set(BUILD_CursesDialog 0) |
359 |
- endif () |
360 |
-- if(BUILD_CursesDialog) |
361 |
-- add_subdirectory(Source/CursesDialog/form) |
362 |
-- endif() |
363 |
- endmacro () |
364 |
- |
365 |
- #----------------------------------------------------------------------- |
366 |
-diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt |
367 |
-index 96e28b4..4102379 100644 |
368 |
---- a/Source/CursesDialog/CMakeLists.txt |
369 |
-+++ b/Source/CursesDialog/CMakeLists.txt |
370 |
-@@ -25,13 +25,16 @@ set( CURSES_SRCS |
371 |
- CursesDialog/ccmake |
372 |
- ) |
373 |
- |
374 |
--include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form |
375 |
-- ${CMake_BINARY_DIR}/Source/CursesDialog/form) |
376 |
- include_directories(${CURSES_INCLUDE_PATH}) |
377 |
- |
378 |
- |
379 |
- add_executable(ccmake ${CURSES_SRCS} ) |
380 |
- target_link_libraries(ccmake CMakeLib) |
381 |
--target_link_libraries(ccmake cmForm) |
382 |
-+TARGET_LINK_LIBRARIES(ccmake form) |
383 |
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) |
384 |
-+IF(CURSES_EXTRA_LIBRARY) |
385 |
-+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) |
386 |
-+ENDIF(CURSES_EXTRA_LIBRARY) |
387 |
-+ |
388 |
- |
389 |
- install_targets(/bin ccmake) |
390 |
-diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h |
391 |
-index b157a28..f131ea4 100644 |
392 |
---- a/Source/CursesDialog/cmCursesStandardIncludes.h |
393 |
-+++ b/Source/CursesDialog/cmCursesStandardIncludes.h |
394 |
-@@ -15,8 +15,6 @@ |
395 |
- #define _MSE_INT_H |
396 |
- #endif |
397 |
- |
398 |
--#include <cmFormConfigure.h> |
399 |
-- |
400 |
- #if defined(__hpux) |
401 |
- # define _BOOL_DEFINED |
402 |
- # include <sys/time.h> |
403 |
|
404 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch |
405 |
deleted file mode 100644 |
406 |
index a7e8688..0000000 |
407 |
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch |
408 |
+++ /dev/null |
409 |
@@ -1,22 +0,0 @@ |
410 |
---- Modules/FindPythonInterp.cmake |
411 |
-+++ Modules/FindPythonInterp.cmake |
412 |
-@@ -60,6 +60,10 @@ |
413 |
- |
414 |
- list(APPEND _Python_NAMES python) |
415 |
- |
416 |
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) |
417 |
-+ set(_Python_NAMES python) |
418 |
-+endif() |
419 |
-+ |
420 |
- # Search for the current active python version first |
421 |
- find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) |
422 |
- |
423 |
-@@ -76,7 +80,7 @@ |
424 |
- unset(_PYTHON3_VERSIONS) |
425 |
- |
426 |
- # Search for newest python version if python executable isn't found |
427 |
--if(NOT PYTHON_EXECUTABLE) |
428 |
-+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) |
429 |
- foreach(_CURRENT_VERSION ${_Python_VERSIONS}) |
430 |
- set(_Python_NAMES python${_CURRENT_VERSION}) |
431 |
- if(WIN32) |
432 |
|
433 |
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch |
434 |
deleted file mode 100644 |
435 |
index 2a83ff7..0000000 |
436 |
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch |
437 |
+++ /dev/null |
438 |
@@ -1,24 +0,0 @@ |
439 |
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake |
440 |
-index bffa9fb..8fc90ee 100644 |
441 |
---- a/Modules/FindPythonLibs.cmake |
442 |
-+++ b/Modules/FindPythonLibs.cmake |
443 |
-@@ -74,6 +74,19 @@ set(_Python_VERSIONS |
444 |
- ${_PYTHON_FIND_OTHER_VERSIONS} |
445 |
- ) |
446 |
- |
447 |
-+# Gentoo portage requires that you use exactly the given python version |
448 |
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) |
449 |
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" |
450 |
-+ OUTPUT_VARIABLE _Gentoo_Python_VERSION) |
451 |
-+ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) |
452 |
-+ if (_Gentoo_Python_INDEX EQUAL -1) |
453 |
-+ # the current Gentoo python version is not compatible with what is requested |
454 |
-+ set(_Python_VERSIONS) |
455 |
-+ else () |
456 |
-+ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}") |
457 |
-+ endif () |
458 |
-+endif() |
459 |
-+ |
460 |
- unset(_PYTHON_FIND_OTHER_VERSIONS) |
461 |
- unset(_PYTHON1_VERSIONS) |
462 |
- unset(_PYTHON2_VERSIONS) |
463 |
|
464 |
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch |
465 |
deleted file mode 100644 |
466 |
index 6dc244c..0000000 |
467 |
--- a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch |
468 |
+++ /dev/null |
469 |
@@ -1,43 +0,0 @@ |
470 |
-From: Julian Ospald <hasufell@g.o> |
471 |
-Date: Sun Dec 8 13:38:06 UTC 2013 |
472 |
-Subject: fix check for freetype-2.5.1 |
473 |
- |
474 |
---- Modules/FindFreetype.cmake |
475 |
-+++ Modules/FindFreetype.cmake |
476 |
-@@ -64,6 +64,19 @@ |
477 |
- PATH_SUFFIXES include/freetype2 include |
478 |
- ) |
479 |
- |
480 |
-+if(NOT FREETYPE_INCLUDE_DIR_freetype2) |
481 |
-+ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h |
482 |
-+ HINTS |
483 |
-+ ENV FREETYPE_DIR |
484 |
-+ PATHS |
485 |
-+ /usr/X11R6 |
486 |
-+ /usr/local/X11R6 |
487 |
-+ /usr/local/X11 |
488 |
-+ /usr/freeware |
489 |
-+ PATH_SUFFIXES include/freetype2 include |
490 |
-+ ) |
491 |
-+endif() |
492 |
-+ |
493 |
- find_library(FREETYPE_LIBRARY |
494 |
- NAMES freetype libfreetype freetype219 |
495 |
- HINTS |
496 |
-@@ -82,8 +95,14 @@ |
497 |
- endif() |
498 |
- set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") |
499 |
- |
500 |
--if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") |
501 |
-- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str |
502 |
-+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") |
503 |
-+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") |
504 |
-+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") |
505 |
-+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") |
506 |
-+endif() |
507 |
-+ |
508 |
-+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) |
509 |
-+ file(STRINGS "${FREETYPE_H}" freetype_version_str |
510 |
- REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") |
511 |
- |
512 |
- unset(FREETYPE_VERSION_STRING) |
513 |
|
514 |
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch |
515 |
deleted file mode 100644 |
516 |
index b094f17..0000000 |
517 |
--- a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch |
518 |
+++ /dev/null |
519 |
@@ -1,23 +0,0 @@ |
520 |
---- Modules/FindImageMagick.cmake |
521 |
-+++ Modules/FindImageMagick.cmake |
522 |
-@@ -147,17 +147,17 @@ |
523 |
- ) |
524 |
- if(component STREQUAL "Magick++") |
525 |
- FIND_IMAGEMAGICK_API(Magick++ Magick++.h |
526 |
-- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI |
527 |
-+ Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI |
528 |
- ) |
529 |
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) |
530 |
- elseif(component STREQUAL "MagickWand") |
531 |
- FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h |
532 |
-- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI |
533 |
-+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI |
534 |
- ) |
535 |
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) |
536 |
- elseif(component STREQUAL "MagickCore") |
537 |
- FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h |
538 |
-- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI |
539 |
-+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI |
540 |
- ) |
541 |
- list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) |
542 |
- else() |
543 |
|
544 |
diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
545 |
deleted file mode 100644 |
546 |
index c5e17c5..0000000 |
547 |
--- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch |
548 |
+++ /dev/null |
549 |
@@ -1,18 +0,0 @@ |
550 |
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake |
551 |
-index c47f583..5783d37 100644 |
552 |
---- a/Modules/FindPkgConfig.cmake |
553 |
-+++ b/Modules/FindPkgConfig.cmake |
554 |
-@@ -87,7 +87,12 @@ |
555 |
- set(PKG_CONFIG_VERSION 1) |
556 |
- set(PKG_CONFIG_FOUND 0) |
557 |
- |
558 |
--find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
559 |
-+if(NOT PKG_CONFIG_EXECUTABLE) |
560 |
-+ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) |
561 |
-+ if(NOT PKG_CONFIG_EXECUTABLE) |
562 |
-+ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") |
563 |
-+ endif(NOT PKG_CONFIG_EXECUTABLE) |
564 |
-+endif(NOT PKG_CONFIG_EXECUTABLE) |
565 |
- mark_as_advanced(PKG_CONFIG_EXECUTABLE) |
566 |
- |
567 |
- if(PKG_CONFIG_EXECUTABLE) |
568 |
|
569 |
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch |
570 |
deleted file mode 100644 |
571 |
index 86c5dc7..0000000 |
572 |
--- a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch |
573 |
+++ /dev/null |
574 |
@@ -1,43 +0,0 @@ |
575 |
---- Modules/FindBLAS.cmake |
576 |
-+++ Modules/FindBLAS.cmake |
577 |
-@@ -4,6 +4,10 @@ |
578 |
- # |
579 |
- # Find BLAS library |
580 |
- # |
581 |
-+# Version modified for Gentoo Linux. |
582 |
-+# If a valid PkgConfig configuration is found, this overrides and cancels |
583 |
-+# all further checks. |
584 |
-+# |
585 |
- # This module finds an installed fortran library that implements the |
586 |
- # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The |
587 |
- # list of libraries searched for is taken from the autoconf macro file, |
588 |
-@@ -50,6 +54,23 @@ |
589 |
- # (To distribute this file outside of CMake, substitute the full |
590 |
- # License text for the above reference.) |
591 |
- |
592 |
-+# first, try PkgConfig |
593 |
-+# |
594 |
-+find_package(PkgConfig REQUIRED) |
595 |
-+pkg_check_modules(PC_BLAS blas) |
596 |
-+if(PC_BLAS_FOUND) |
597 |
-+ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) |
598 |
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) |
599 |
-+ if (NOT ${PC_LIB}_LIBRARY) |
600 |
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") |
601 |
-+ endif (NOT ${PC_LIB}_LIBRARY) |
602 |
-+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) |
603 |
-+ endforeach(PC_LIB) |
604 |
-+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) |
605 |
-+ mark_as_advanced(BLAS_LIBRARIES) |
606 |
-+else(PC_BLAS_FOUND) |
607 |
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") |
608 |
-+ |
609 |
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) |
610 |
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) |
611 |
- |
612 |
-@@ -688,3 +709,5 @@ |
613 |
- endif() |
614 |
- |
615 |
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
616 |
-+ |
617 |
-+endif(PC_BLAS_FOUND) |
618 |
|
619 |
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch |
620 |
deleted file mode 100644 |
621 |
index a6291d2..0000000 |
622 |
--- a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch |
623 |
+++ /dev/null |
624 |
@@ -1,93 +0,0 @@ |
625 |
-From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001 |
626 |
-From: Michael Palimaka <kensington@g.o> |
627 |
-Date: Thu, 19 Jun 2014 00:17:48 +1000 |
628 |
-Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries |
629 |
- wrt bug #400969. |
630 |
- |
631 |
---- |
632 |
- Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++ |
633 |
- 1 file changed, 41 insertions(+) |
634 |
- |
635 |
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake |
636 |
-index dfd4460..70bfb4f 100644 |
637 |
---- a/Modules/FindBoost.cmake |
638 |
-+++ b/Modules/FindBoost.cmake |
639 |
-@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
640 |
- set( _boost_docstring_release "Boost ${COMPONENT} library (release)") |
641 |
- set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") |
642 |
- |
643 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
644 |
-+ # Get version of Python. |
645 |
-+ if (NOT PYTHON_EXECUTABLE) |
646 |
-+ #if a certain version of python was detected by cmake before use that one |
647 |
-+ set(PYTHON_EXECUTABLE "python") |
648 |
-+ endif (NOT PYTHON_EXECUTABLE) |
649 |
-+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) |
650 |
-+ endif() |
651 |
-+ |
652 |
- # Compute component-specific hints. |
653 |
- set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "") |
654 |
- if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR |
655 |
-@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
656 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
657 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
658 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) |
659 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
660 |
-+ list(APPEND _boost_RELEASE_NAMES |
661 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
662 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
663 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} |
664 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} |
665 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) |
666 |
-+ endif() |
667 |
-+ |
668 |
- if(_boost_STATIC_RUNTIME_WORKAROUND) |
669 |
- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") |
670 |
- list(APPEND _boost_RELEASE_NAMES |
671 |
-@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
672 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
673 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
674 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
675 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
676 |
-+ list(APPEND _boost_RELEASE_NAMES |
677 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
678 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} |
679 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
680 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) |
681 |
-+ endif() |
682 |
- endif() |
683 |
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
684 |
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) |
685 |
-@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
686 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
687 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED} |
688 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) |
689 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
690 |
-+ list(APPEND _boost_DEBUG_NAMES |
691 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
692 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
693 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} |
694 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} |
695 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} |
696 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) |
697 |
-+ endif() |
698 |
- if(_boost_STATIC_RUNTIME_WORKAROUND) |
699 |
- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") |
700 |
- list(APPEND _boost_DEBUG_NAMES |
701 |
-@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
702 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
703 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
704 |
- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
705 |
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") |
706 |
-+ list(APPEND _boost_DEBUG_NAMES |
707 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
708 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} |
709 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} |
710 |
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) |
711 |
-+ endif() |
712 |
- endif() |
713 |
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") |
714 |
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) |
715 |
--- |
716 |
-1.8.5.5 |
717 |
- |
718 |
|
719 |
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch |
720 |
deleted file mode 100644 |
721 |
index 611c5ce..0000000 |
722 |
--- a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch |
723 |
+++ /dev/null |
724 |
@@ -1,44 +0,0 @@ |
725 |
---- Modules/FindLAPACK.cmake |
726 |
-+++ Modules/FindLAPACK.cmake |
727 |
-@@ -4,6 +4,10 @@ |
728 |
- # |
729 |
- # Find LAPACK library |
730 |
- # |
731 |
-+# Version modified for Gentoo Linux. |
732 |
-+# If a valid PkgConfig configuration is found, this overrides and cancels |
733 |
-+# all further checks. |
734 |
-+# |
735 |
- # This module finds an installed fortran library that implements the |
736 |
- # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). |
737 |
- # |
738 |
-@@ -72,6 +76,24 @@ |
739 |
- # N.B. _prefix is the prefix applied to the names of all cached variables that |
740 |
- # are generated internally and marked advanced by this macro. |
741 |
- |
742 |
-+# |
743 |
-+# first, try PkgConfig |
744 |
-+# |
745 |
-+find_package(PkgConfig REQUIRED) |
746 |
-+pkg_check_modules(PC_LAPACK lapack) |
747 |
-+if(PC_LAPACK_FOUND) |
748 |
-+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) |
749 |
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) |
750 |
-+ if (NOT ${PC_LIB}_LIBRARY) |
751 |
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") |
752 |
-+ endif (NOT ${PC_LIB}_LIBRARY) |
753 |
-+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) |
754 |
-+ endforeach(PC_LIB) |
755 |
-+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) |
756 |
-+ mark_as_advanced(LAPACK_LIBRARIES) |
757 |
-+else(PC_LAPACK_FOUND) |
758 |
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") |
759 |
-+ |
760 |
- set(_libraries_work TRUE) |
761 |
- set(${LIBRARIES}) |
762 |
- set(_combined_name) |
763 |
-@@ -348,3 +370,5 @@ |
764 |
- endif() |
765 |
- |
766 |
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) |
767 |
-+ |
768 |
-+endif(PC_LAPACK_FOUND) |
769 |
|
770 |
diff --git a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch |
771 |
deleted file mode 100644 |
772 |
index decfb91..0000000 |
773 |
--- a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch |
774 |
+++ /dev/null |
775 |
@@ -1,142 +0,0 @@ |
776 |
-From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001 |
777 |
-From: Michael Palimaka <kensington@g.o> |
778 |
-Date: Thu, 19 Jun 2014 00:08:13 +1000 |
779 |
-Subject: [PATCH] Set some proper paths to make cmake find our tools. |
780 |
- |
781 |
-The ebuild now adds an extra / at the end of $EPREFIX so that it is |
782 |
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains |
783 |
-correct) |
784 |
- |
785 |
-Original patch by Heiko Przybyl. |
786 |
-Updated by Chris Reffett (cmake-2.8.8) |
787 |
-Updated by Johannes Huber (cmake-2.8.9) |
788 |
-Updated by Michael Palimaka (cmake-2.8.10) |
789 |
-Updated by Chris Reffett (cmake-2.8.11) |
790 |
-Updated by Michael Palimaka (cmake-3.0.0) |
791 |
---- |
792 |
- Modules/Platform/Darwin.cmake | 12 +++++++---- |
793 |
- Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++-------------------- |
794 |
- 2 files changed, 29 insertions(+), 26 deletions(-) |
795 |
- |
796 |
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake |
797 |
-index e25df1e..9b22a6a 100644 |
798 |
---- a/Modules/Platform/Darwin.cmake |
799 |
-+++ b/Modules/Platform/Darwin.cmake |
800 |
-@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F) |
801 |
- set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F) |
802 |
- set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F) |
803 |
- |
804 |
--# default to searching for frameworks first |
805 |
-+# default to searching for frameworks last |
806 |
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK) |
807 |
-- set(CMAKE_FIND_FRAMEWORK FIRST) |
808 |
-+ set(CMAKE_FIND_FRAMEWORK LAST) |
809 |
- endif() |
810 |
- |
811 |
- # Older OS X linkers do not report their framework search path |
812 |
-@@ -156,6 +156,8 @@ endif() |
813 |
- |
814 |
- # set up the default search directories for frameworks |
815 |
- set(CMAKE_SYSTEM_FRAMEWORK_PATH |
816 |
-+ @GENTOO_PORTAGE_EPREFIX@Frameworks |
817 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
818 |
- ~/Library/Frameworks |
819 |
- ) |
820 |
- if(_CMAKE_OSX_SYSROOT_PATH) |
821 |
-@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT) |
822 |
- endif() |
823 |
- endif() |
824 |
- |
825 |
--# default to searching for application bundles first |
826 |
-+# default to searching for application bundles last |
827 |
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE) |
828 |
-- set(CMAKE_FIND_APPBUNDLE FIRST) |
829 |
-+ set(CMAKE_FIND_APPBUNDLE LAST) |
830 |
- endif() |
831 |
- # set up the default search directories for application bundles |
832 |
- set(_apps_paths) |
833 |
- foreach(_path |
834 |
-+ @GENTOO_PORTAGE_EPREFIX@Applications |
835 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin |
836 |
- "~/Applications" |
837 |
- "/Applications" |
838 |
- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ |
839 |
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake |
840 |
-index 20ee1d1..3481ca8 100644 |
841 |
---- a/Modules/Platform/UnixPaths.cmake |
842 |
-+++ b/Modules/Platform/UnixPaths.cmake |
843 |
-@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) |
844 |
- # search types. |
845 |
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH |
846 |
- # Standard |
847 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ |
848 |
- /usr/local /usr / |
849 |
- |
850 |
- # CMake install location |
851 |
-@@ -53,43 +54,41 @@ endif() |
852 |
- |
853 |
- # List common include file locations not under the common prefixes. |
854 |
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH |
855 |
-- # Windows API on Cygwin |
856 |
-- /usr/include/w32api |
857 |
-- |
858 |
-- # X11 |
859 |
-- /usr/X11R6/include /usr/include/X11 |
860 |
-- |
861 |
-- # Other |
862 |
-- /usr/pkg/include |
863 |
-- /opt/csw/include /opt/include |
864 |
-- /usr/openwin/include |
865 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/include |
866 |
- ) |
867 |
- |
868 |
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH |
869 |
-- # Windows API on Cygwin |
870 |
-- /usr/lib/w32api |
871 |
-- |
872 |
-- # X11 |
873 |
-- /usr/X11R6/lib /usr/lib/X11 |
874 |
-- |
875 |
-- # Other |
876 |
-- /usr/pkg/lib |
877 |
-- /opt/csw/lib /opt/lib |
878 |
-- /usr/openwin/lib |
879 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
880 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@ |
881 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
882 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
883 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
884 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
885 |
-+ @GENTOO_PORTAGE_EPREFIX@lib |
886 |
- ) |
887 |
- |
888 |
- list(APPEND CMAKE_SYSTEM_PROGRAM_PATH |
889 |
-- /usr/pkg/bin |
890 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/bin |
891 |
-+ @GENTOO_PORTAGE_EPREFIX@bin |
892 |
- ) |
893 |
- |
894 |
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES |
895 |
-- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 |
896 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc |
897 |
-+ @GENTOO_PORTAGE_GCCLIBDIR@ |
898 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 |
899 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 |
900 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 |
901 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/lib |
902 |
-+ @GENTOO_PORTAGE_EPREFIX@lib |
903 |
-+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 |
904 |
- ) |
905 |
- |
906 |
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES |
907 |
-+ GENTOO_PORTAGE_EPREFIX@usr/include |
908 |
- /usr/include |
909 |
- ) |
910 |
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES |
911 |
-+ @GENTOO_PORTAGE_EPREFIX@usr/include |
912 |
- /usr/include |
913 |
- ) |
914 |
- |
915 |
--- |
916 |
-1.8.5.5 |
917 |
- |
918 |
|
919 |
diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim |
920 |
deleted file mode 100644 |
921 |
index 5cecd7d..0000000 |
922 |
--- a/dev-util/cmake/files/cmake.vim |
923 |
+++ /dev/null |
924 |
@@ -1,3 +0,0 @@ |
925 |
-autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim |
926 |
-autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake |
927 |
-autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake |
928 |
|
929 |
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml |
930 |
deleted file mode 100644 |
931 |
index a23f444..0000000 |
932 |
--- a/dev-util/cmake/metadata.xml |
933 |
+++ /dev/null |
934 |
@@ -1,5 +0,0 @@ |
935 |
-<?xml version="1.0" encoding="UTF-8"?> |
936 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
937 |
-<pkgmetadata> |
938 |
- <herd>kde</herd> |
939 |
-</pkgmetadata> |