Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kig/files/, kde-base/kig/
Date: Tue, 30 Oct 2012 10:37:41
Message-Id: 1351593317.f313e7f101dceaa2a09e099ff3abb70f2730fafe.kensington@gentoo
1 commit: f313e7f101dceaa2a09e099ff3abb70f2730fafe
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 30 10:35:17 2012 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 30 10:35:17 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f313e7f1
7
8 [kde-base/kig] Fix failing patch, wrt bug #440106.
9
10 The offending upstream commit is a05a87b8a0ab27a8f82f7d9ff2b4c8bf516f7b47.
11
12 Package-Manager: portage-2.1.11.31
13
14 ---
15 kde-base/kig/files/kig-4.10.0-boostpython.patch | 450 +++++++++++++++++++++++
16 kde-base/kig/kig-9999.ebuild | 2 +-
17 2 files changed, 451 insertions(+), 1 deletions(-)
18
19 diff --git a/kde-base/kig/files/kig-4.10.0-boostpython.patch b/kde-base/kig/files/kig-4.10.0-boostpython.patch
20 new file mode 100644
21 index 0000000..fafe0ca
22 --- /dev/null
23 +++ b/kde-base/kig/files/kig-4.10.0-boostpython.patch
24 @@ -0,0 +1,450 @@
25 +From 0eb0768a4c66543b4ce716869eea744cb09b55ad Mon Sep 17 00:00:00 2001
26 +From: Johannes Huber <johu@g.o>
27 +Date: Thu, 30 Aug 2012 14:02:44 +0200
28 +Subject: [PATCH] Use standard cmake module to find boost python.
29 +
30 +---
31 + CMakeLists.txt | 34 ++++----
32 + KigConfigureChecks.cmake | 4 +-
33 + cmake/COPYING-CMAKE-SCRIPTS | 22 ------
34 + cmake/FindBoostPython.cmake | 153 ------------------------------------
35 + cmake/modules/FindBoostPython.cmake | 134 -------------------------------
36 + 5 Dateien geändert, 20 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-)
37 + delete mode 100644 cmake/COPYING-CMAKE-SCRIPTS
38 + delete mode 100644 cmake/FindBoostPython.cmake
39 + delete mode 100644 cmake/modules/FindBoostPython.cmake
40 +
41 +diff --git a/CMakeLists.txt b/CMakeLists.txt
42 +index ba3e377..092fde3 100644
43 +--- a/CMakeLists.txt
44 ++++ b/CMakeLists.txt
45 +@@ -1,9 +1,6 @@
46 + project(kig)
47 +
48 +-#
49 +-# taken from kdeedu/CMakeList.txt
50 +-# from here...
51 +-set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake )
52 ++option(WITH_SCRIPTING "Enable python scripting support" ON)
53 +
54 + # search packages used by KDE
55 + find_package(KDE4 4.3.80 REQUIRED)
56 +@@ -30,7 +27,14 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D
57 +
58 + # ...to here
59 +
60 +-find_package(BoostPython)
61 ++if(WITH_SCRIPTING)
62 ++ find_package(PythonLibs)
63 ++ find_package(Boost COMPONENTS python)
64 ++endif(WITH_SCRIPTING)
65 ++
66 ++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
67 ++ set(KIG_ENABLE_PYTHON_SCRIPTING 1)
68 ++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
69 +
70 + kde4_no_enable_final(kig)
71 +
72 +@@ -45,14 +49,14 @@ add_subdirectory( macros )
73 + #add_subdirectory( kfile )
74 + add_subdirectory( data )
75 + add_subdirectory( pykig )
76 +-if(BOOST_PYTHON_FOUND)
77 ++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
78 + add_subdirectory( scripting )
79 +-endif(BOOST_PYTHON_FOUND)
80 ++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
81 +
82 + macro_display_feature_log()
83 +
84 + include_directories( ${CMAKE_SOURCE_DIR}/modes )
85 +-if(BOOST_PYTHON_FOUND)
86 +- include_directories(${BOOST_PYTHON_INCLUDES})
87 +-endif(BOOST_PYTHON_FOUND)
88 ++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
89 ++ include_directories(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
90 ++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
91 +
92 + # kigpart
93 +
94 +@@ -173,7 +177,7 @@ kde4_add_ui_files(kigpart_PART_SRCS
95 + misc/kigcoordinateprecisiondialog.ui
96 + )
97 +
98 +-if(BOOST_PYTHON_FOUND)
99 ++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
100 + set(kigpart_PART_SRCS ${kigpart_PART_SRCS}
101 + scripting/newscriptwizard.cc
102 + scripting/python_scripter.cc
103 +@@ -183,15 +187,15 @@ if(BOOST_PYTHON_FOUND)
104 + )
105 +
106 + set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}")
107 +-endif(BOOST_PYTHON_FOUND)
108 ++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
109 +
110 +
111 + kde4_add_plugin(kigpart ${kigpart_PART_SRCS})
112 +
113 + target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} )
114 +-if(BOOST_PYTHON_FOUND)
115 +- target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS})
116 +-endif(BOOST_PYTHON_FOUND)
117 ++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
118 ++ target_link_libraries(kigpart ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS})
119 ++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
120 +
121 + install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR})
122 +
123 +diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake
124 +index fed38b3..a53ea73 100644
125 +--- a/KigConfigureChecks.cmake
126 ++++ b/KigConfigureChecks.cmake
127 +@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC)
128 + set(CMAKE_REQUIRED_INCLUDES)
129 + set(CMAKE_REQUIRED_LIBRARIES)
130 +
131 +-macro_optional_find_package(BoostPython)
132 +-
133 + # at the end, output the configuration
134 + configure_file(
135 + ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake
136 +@@ -18,7 +16,7 @@ configure_file(
137 + )
138 +
139 + macro_log_feature(
140 +- BOOST_PYTHON_FOUND
141 ++ Boost_PYTHON_FOUND
142 + "Boost.Python"
143 + "Kig can optionally use Boost.Python for Python scripting"
144 + "http://www.boost.org/"
145 +diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS
146 +deleted file mode 100644
147 +index 4b41776..0000000
148 +--- a/cmake/COPYING-CMAKE-SCRIPTS
149 ++++ /dev/null
150 +@@ -1,22 +0,0 @@
151 +-Redistribution and use in source and binary forms, with or without
152 +-modification, are permitted provided that the following conditions
153 +-are met:
154 +-
155 +-1. Redistributions of source code must retain the copyright
156 +- notice, this list of conditions and the following disclaimer.
157 +-2. Redistributions in binary form must reproduce the copyright
158 +- notice, this list of conditions and the following disclaimer in the
159 +- documentation and/or other materials provided with the distribution.
160 +-3. The name of the author may not be used to endorse or promote products
161 +- derived from this software without specific prior written permission.
162 +-
163 +-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
164 +-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
165 +-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
166 +-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
167 +-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
168 +-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
169 +-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
170 +-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
171 +-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
172 +-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
173 +diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake
174 +deleted file mode 100644
175 +index 6d5f05e..0000000
176 +--- a/cmake/FindBoostPython.cmake
177 ++++ /dev/null
178 +@@ -1,153 +0,0 @@
179 +-# - Try to find the a valid boost+python combination
180 +-# Once done this will define
181 +-#
182 +-# BOOST_PYTHON_FOUND - system has a valid boost+python combination
183 +-# BOOST_PYTHON_INCLUDES - the include directory for boost+python
184 +-# BOOST_PYTHON_LIBS - the needed libs for boost+python
185 +-
186 +-# Copyright (c) 2006, Pino Toscano, <toscano.pino@×××××××.it>
187 +-#
188 +-# Redistribution and use is allowed according to the terms of the BSD license.
189 +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
190 +-
191 +-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
192 +- # Already in cache, be silent
193 +- set(BOOST_PYTHON_FIND_QUIETLY TRUE)
194 +-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
195 +-
196 +-# some needed includes
197 +-include(CheckCXXSourceCompiles)
198 +-include(CheckIncludeFileCXX)
199 +-include(CheckLibraryExists)
200 +-
201 +-find_package(PkgConfig)
202 +-
203 +-# reset vars
204 +-set(BOOST_PYTHON_INCLUDES)
205 +-set(BOOST_PYTHON_LIBS)
206 +-
207 +-# handy arrays
208 +-set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
209 +-set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
210 +-set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
211 +-set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python")
212 +-
213 +-# 1st: check for boost/shared_ptr.hpp
214 +-check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
215 +-
216 +-if(HAVE_BOOST_SHARED_PTR_HPP)
217 +-
218 +- # try pkg-config next
219 +- set(_found FALSE)
220 +- foreach(_pyver ${PYTHON_VERSIONS})
221 +- if(NOT _found)
222 +- pkg_check_modules(_python QUIET ${_pyver})
223 +- if (_python_FOUND)
224 +- find_package(Boost 1.33 COMPONENTS python)
225 +- if (Boost_PYTHON_FOUND)
226 +- set(_found TRUE)
227 +- set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}")
228 +- set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}")
229 +- endif(Boost_PYTHON_FOUND)
230 +- endif(_python_FOUND)
231 +- endif(NOT _found)
232 +- endforeach(_pyver ${PYTHON_VERSIONS})
233 +-
234 +-endif(HAVE_BOOST_SHARED_PTR_HPP)
235 +-
236 +-if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
237 +- # save the old flags and setting the new ones
238 +- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
239 +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
240 +-
241 +- foreach(_pyver ${PYTHON_VERSIONS})
242 +- if(NOT _found)
243 +- foreach(_pydir ${PYTHON_INCLUDE_DIRS})
244 +-
245 +- if(NOT _found)
246 +- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir})
247 +- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir})
248 +-
249 +- if(EXISTS ${_pydir})
250 +- if(EXISTS ${_pydir}/Python.h)
251 +-
252 +- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS})
253 +-
254 +- if(NOT _found)
255 +- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir})
256 +-
257 +- foreach(_pblib ${PYTHON_LIBS})
258 +-
259 +- if(NOT _found)
260 +-
261 +- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}")
262 +- set(CMAKE_REQUIRED_INCLUDES ${_pydir})
263 +- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver})
264 +-
265 +- check_cxx_source_compiles("
266 +-#include <boost/python.hpp>
267 +-const char* greet() { return \"Hello world!\"; }
268 +-BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
269 +-
270 +-int main() { return 0; }
271 +-
272 +-// some vars, in case of the compilation fail...
273 +-// python include dir: ${_pydir}
274 +-// python lib dir: ${_pylibdir}
275 +-// boost python lib: ${_pblib}
276 +-
277 +-" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile )
278 +-
279 +- set(CMAKE_REQUIRED_FLAGS)
280 +- set(CMAKE_REQUIRED_INCLUDES)
281 +- set(CMAKE_REQUIRED_LIBRARIES)
282 +-
283 +- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
284 +-
285 +- set(_found TRUE)
286 +-
287 +- set(BOOST_PYTHON_INCLUDES ${_pydir})
288 +- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}")
289 +-
290 +- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
291 +-
292 +- endif(NOT _found)
293 +-
294 +- endforeach(_pblib ${PYTHON_LIBS})
295 +-
296 +- endif(NOT _found)
297 +-
298 +- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS})
299 +-
300 +- endif(EXISTS ${_pydir}/Python.h)
301 +- endif(EXISTS ${_pydir})
302 +-
303 +- endif(NOT _found)
304 +-
305 +- endforeach(_pydir ${PYTHON_INCLUDE_DIRS})
306 +-
307 +- endif(NOT _found)
308 +-
309 +- endforeach(_pyver ${PYTHON_VERSIONS})
310 +-
311 +- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
312 +-
313 +-endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
314 +-
315 +-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
316 +- set(BOOST_PYTHON_FOUND TRUE)
317 +-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
318 +-
319 +-if(BOOST_PYTHON_FOUND)
320 +- if(NOT BoostPython_FIND_QUIETLY)
321 +- message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}")
322 +- endif(NOT BoostPython_FIND_QUIETLY)
323 +- set(KIG_ENABLE_PYTHON_SCRIPTING 1)
324 +-else (BOOST_PYTHON_FOUND)
325 +- if (BoostPython_FIND_REQUIRED)
326 +- message(FATAL_ERROR "Could NOT find Boost+Python")
327 +- endif(BoostPython_FIND_REQUIRED)
328 +- set(KIG_ENABLE_PYTHON_SCRIPTING 0)
329 +-endif(BOOST_PYTHON_FOUND)
330 +-
331 +-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
332 +diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake
333 +deleted file mode 100644
334 +index 72aae54..0000000
335 +--- a/cmake/modules/FindBoostPython.cmake
336 ++++ /dev/null
337 +@@ -1,134 +0,0 @@
338 +-# - Try to find the a valid boost+python combination
339 +-# Once done this will define
340 +-#
341 +-# BOOST_PYTHON_FOUND - system has a valid boost+python combination
342 +-# BOOST_PYTHON_INCLUDES - the include directory for boost+python
343 +-# BOOST_PYTHON_LIBS - the needed libs for boost+python
344 +-
345 +-# Copyright (c) 2006, Pino Toscano, <toscano.pino@×××××××.it>
346 +-#
347 +-# Redistribution and use is allowed according to the terms of the BSD license.
348 +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
349 +-
350 +-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
351 +- # Already in cache, be silent
352 +- set(BOOST_PYTHON_FIND_QUIETLY TRUE)
353 +-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
354 +-
355 +-# some needed includes
356 +-include(CheckCXXSourceCompiles)
357 +-include(CheckIncludeFileCXX)
358 +-include(CheckLibraryExists)
359 +-
360 +-# reset vars
361 +-set(BOOST_PYTHON_INCLUDES)
362 +-set(BOOST_PYTHON_LIBS)
363 +-
364 +-# handy arrays
365 +-set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
366 +-set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
367 +-set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
368 +-set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python")
369 +-
370 +-# 1st: check for boost/shared_ptr.hpp
371 +-check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
372 +-
373 +-if(HAVE_BOOST_SHARED_PTR_HPP)
374 +-
375 +- set(_found FALSE)
376 +-
377 +- # save the old flags and setting the new ones
378 +- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
379 +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
380 +-
381 +- foreach(_pyver ${PYTHON_VERSIONS})
382 +- if(NOT _found)
383 +- foreach(_pydir ${PYTHON_INCLUDE_DIRS})
384 +-
385 +- if(NOT _found)
386 +- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir})
387 +- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir})
388 +-
389 +- if(EXISTS ${_pydir})
390 +- if(EXISTS ${_pydir}/Python.h)
391 +-
392 +- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS})
393 +-
394 +- if(NOT _found)
395 +- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir})
396 +-
397 +- foreach(_pblib ${PYTHON_LIBS})
398 +-
399 +- if(NOT _found)
400 +-
401 +- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}")
402 +- set(CMAKE_REQUIRED_INCLUDES ${_pydir})
403 +- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver})
404 +-
405 +- check_cxx_source_compiles("
406 +-#include <boost/python.hpp>
407 +-const char* greet() { return \"Hello world!\"; }
408 +-BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
409 +-
410 +-int main() { return 0; }
411 +-
412 +-// some vars, in case of the compilation fail...
413 +-// python include dir: ${_pydir}
414 +-// python lib dir: ${_pylibdir}
415 +-// boost python lib: ${_pblib}
416 +-
417 +-" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile )
418 +-
419 +- set(CMAKE_REQUIRED_FLAGS)
420 +- set(CMAKE_REQUIRED_INCLUDES)
421 +- set(CMAKE_REQUIRED_LIBRARIES)
422 +-
423 +- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
424 +-
425 +- set(_found TRUE)
426 +-
427 +- set(BOOST_PYTHON_INCLUDES ${_pydir})
428 +- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}")
429 +-
430 +- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
431 +-
432 +- endif(NOT _found)
433 +-
434 +- endforeach(_pblib ${PYTHON_LIBS})
435 +-
436 +- endif(NOT _found)
437 +-
438 +- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS})
439 +-
440 +- endif(EXISTS ${_pydir}/Python.h)
441 +- endif(EXISTS ${_pydir})
442 +-
443 +- endif(NOT _found)
444 +-
445 +- endforeach(_pydir ${PYTHON_INCLUDE_DIRS})
446 +-
447 +- endif(NOT _found)
448 +-
449 +- endforeach(_pyver ${PYTHON_VERSIONS})
450 +-
451 +- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
452 +-
453 +-endif(HAVE_BOOST_SHARED_PTR_HPP)
454 +-
455 +-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
456 +- set(BOOST_PYTHON_FOUND TRUE)
457 +-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
458 +-
459 +-if(BOOST_PYTHON_FOUND)
460 +- if(NOT BoostPython_FIND_QUIETLY)
461 +- message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}")
462 +- endif(NOT BoostPython_FIND_QUIETLY)
463 +- set(KIG_ENABLE_PYTHON_SCRIPTING 1)
464 +-else (BOOST_PYTHON_FOUND)
465 +- if (BoostPython_FIND_REQUIRED)
466 +- message(FATAL_ERROR "Could NOT find Boost+Python")
467 +- endif(BoostPython_FIND_REQUIRED)
468 +- set(KIG_ENABLE_PYTHON_SCRIPTING 0)
469 +-endif(BOOST_PYTHON_FOUND)
470 +-
471 +-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
472 +--
473 +1.7.12
474 +
475
476 diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-9999.ebuild
477 index da79091..879d22a 100644
478 --- a/kde-base/kig/kig-9999.ebuild
479 +++ b/kde-base/kig/kig-9999.ebuild
480 @@ -16,7 +16,7 @@ DEPEND="
481 "
482 RDEPEND="${DEPEND}"
483
484 -PATCHES=( "${FILESDIR}/${PN}-4.9.0-boostpython.patch" )
485 +PATCHES=( "${FILESDIR}/${PN}-4.10.0-boostpython.patch" )
486
487 src_configure() {
488 mycmakeargs=(