* [gentoo-commits] proj/kde:master commit in: kde-base/kig/files/, kde-base/kig/
@ 2012-08-30 14:40 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2012-08-30 14:40 UTC (permalink / raw
To: gentoo-commits
commit: ea02e1faaaa687f726e7375c16720d0c1ef34361
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 30 14:38:36 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 14:38:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ea02e1fa
[kde-base/kig] Make scripting use flag working, bug #431838.
(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/kig/files/kig-4.9.0-boostpython.patch | 444 ++++++++++++++++++++++++
kde-base/kig/kig-4.9.49.9999.ebuild | 8 +-
kde-base/kig/kig-9999.ebuild | 8 +-
kde-base/kig/metadata.xml | 2 +-
4 files changed, 455 insertions(+), 7 deletions(-)
diff --git a/kde-base/kig/files/kig-4.9.0-boostpython.patch b/kde-base/kig/files/kig-4.9.0-boostpython.patch
new file mode 100644
index 0000000..6d9948a
--- /dev/null
+++ b/kde-base/kig/files/kig-4.9.0-boostpython.patch
@@ -0,0 +1,444 @@
+From 693ebdb3cb0db3abcec759a5f344c40322a5be0a Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 30 Aug 2012 14:02:44 +0200
+Subject: [PATCH] Use standard cmake module to find boost python.
+
+---
+ CMakeLists.txt | 30 +++----
+ KigConfigureChecks.cmake | 4 +-
+ cmake/COPYING-CMAKE-SCRIPTS | 22 ------
+ cmake/FindBoostPython.cmake | 153 ------------------------------------
+ cmake/modules/FindBoostPython.cmake | 134 -------------------------------
+ 5 Dateien geändert, 16 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-)
+ delete mode 100644 cmake/COPYING-CMAKE-SCRIPTS
+ delete mode 100644 cmake/FindBoostPython.cmake
+ delete mode 100644 cmake/modules/FindBoostPython.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba3e377..67926ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,9 +1,6 @@
+ project(kig)
+
+-#
+-# taken from kdeedu/CMakeList.txt
+-# from here...
+-set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake )
++option(WITH_SCRIPTING "Enable python scripting support" ON)
+
+ # search packages used by KDE
+ find_package(KDE4 4.3.80 REQUIRED)
+@@ -30,7 +27,10 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D
+
+ # ...to here
+
+-find_package(BoostPython)
++if(WITH_SCRIPTING)
++ find_package(PythonLibs)
++ find_package(Boost COMPONENTS python)
++endif(WITH_SCRIPTING)
+
+ kde4_no_enable_final(kig)
+
+@@ -45,14 +45,14 @@ add_subdirectory( macros )
+ #add_subdirectory( kfile )
+ add_subdirectory( data )
+ add_subdirectory( pykig )
+-if(BOOST_PYTHON_FOUND)
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+ add_subdirectory( scripting )
+-endif(BOOST_PYTHON_FOUND)
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+ include_directories( ${CMAKE_SOURCE_DIR}/modes )
+-if(BOOST_PYTHON_FOUND)
+- include_directories(${BOOST_PYTHON_INCLUDES})
+-endif(BOOST_PYTHON_FOUND)
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
++ include_directories(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+ # kigpart
+
+@@ -173,7 +173,7 @@ kde4_add_ui_files(kigpart_PART_SRCS
+ misc/kigcoordinateprecisiondialog.ui
+ )
+
+-if(BOOST_PYTHON_FOUND)
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+ set(kigpart_PART_SRCS ${kigpart_PART_SRCS}
+ scripting/newscriptwizard.cc
+ scripting/python_scripter.cc
+@@ -183,15 +183,15 @@ if(BOOST_PYTHON_FOUND)
+ )
+
+ set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}")
+-endif(BOOST_PYTHON_FOUND)
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+
+ kde4_add_plugin(kigpart ${kigpart_PART_SRCS})
+
+ target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} )
+-if(BOOST_PYTHON_FOUND)
+- target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS})
+-endif(BOOST_PYTHON_FOUND)
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
++ target_link_libraries(kigpart ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS})
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+ install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR})
+
+diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake
+index fed38b3..a53ea73 100644
+--- a/KigConfigureChecks.cmake
++++ b/KigConfigureChecks.cmake
+@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC)
+ set(CMAKE_REQUIRED_INCLUDES)
+ set(CMAKE_REQUIRED_LIBRARIES)
+
+-macro_optional_find_package(BoostPython)
+-
+ # at the end, output the configuration
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake
+@@ -18,7 +16,7 @@ configure_file(
+ )
+
+ macro_log_feature(
+- BOOST_PYTHON_FOUND
++ Boost_PYTHON_FOUND
+ "Boost.Python"
+ "Kig can optionally use Boost.Python for Python scripting"
+ "http://www.boost.org/"
+diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS
+deleted file mode 100644
+index 4b41776..0000000
+--- a/cmake/COPYING-CMAKE-SCRIPTS
++++ /dev/null
+@@ -1,22 +0,0 @@
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions
+-are met:
+-
+-1. Redistributions of source code must retain the copyright
+- notice, this list of conditions and the following disclaimer.
+-2. Redistributions in binary form must reproduce the copyright
+- notice, this list of conditions and the following disclaimer in the
+- documentation and/or other materials provided with the distribution.
+-3. The name of the author may not be used to endorse or promote products
+- derived from this software without specific prior written permission.
+-
+-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake
+deleted file mode 100644
+index 6d5f05e..0000000
+--- a/cmake/FindBoostPython.cmake
++++ /dev/null
+@@ -1,153 +0,0 @@
+-# - Try to find the a valid boost+python combination
+-# Once done this will define
+-#
+-# BOOST_PYTHON_FOUND - system has a valid boost+python combination
+-# BOOST_PYTHON_INCLUDES - the include directory for boost+python
+-# BOOST_PYTHON_LIBS - the needed libs for boost+python
+-
+-# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+- # Already in cache, be silent
+- set(BOOST_PYTHON_FIND_QUIETLY TRUE)
+-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+-
+-# some needed includes
+-include(CheckCXXSourceCompiles)
+-include(CheckIncludeFileCXX)
+-include(CheckLibraryExists)
+-
+-find_package(PkgConfig)
+-
+-# reset vars
+-set(BOOST_PYTHON_INCLUDES)
+-set(BOOST_PYTHON_LIBS)
+-
+-# handy arrays
+-set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
+-set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
+-set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
+-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")
+-
+-# 1st: check for boost/shared_ptr.hpp
+-check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
+-
+-if(HAVE_BOOST_SHARED_PTR_HPP)
+-
+- # try pkg-config next
+- set(_found FALSE)
+- foreach(_pyver ${PYTHON_VERSIONS})
+- if(NOT _found)
+- pkg_check_modules(_python QUIET ${_pyver})
+- if (_python_FOUND)
+- find_package(Boost 1.33 COMPONENTS python)
+- if (Boost_PYTHON_FOUND)
+- set(_found TRUE)
+- set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}")
+- set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}")
+- endif(Boost_PYTHON_FOUND)
+- endif(_python_FOUND)
+- endif(NOT _found)
+- endforeach(_pyver ${PYTHON_VERSIONS})
+-
+-endif(HAVE_BOOST_SHARED_PTR_HPP)
+-
+-if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
+- # save the old flags and setting the new ones
+- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-
+- foreach(_pyver ${PYTHON_VERSIONS})
+- if(NOT _found)
+- foreach(_pydir ${PYTHON_INCLUDE_DIRS})
+-
+- if(NOT _found)
+- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir})
+- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir})
+-
+- if(EXISTS ${_pydir})
+- if(EXISTS ${_pydir}/Python.h)
+-
+- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS})
+-
+- if(NOT _found)
+- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir})
+-
+- foreach(_pblib ${PYTHON_LIBS})
+-
+- if(NOT _found)
+-
+- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}")
+- set(CMAKE_REQUIRED_INCLUDES ${_pydir})
+- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver})
+-
+- check_cxx_source_compiles("
+-#include <boost/python.hpp>
+-const char* greet() { return \"Hello world!\"; }
+-BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
+-
+-int main() { return 0; }
+-
+-// some vars, in case of the compilation fail...
+-// python include dir: ${_pydir}
+-// python lib dir: ${_pylibdir}
+-// boost python lib: ${_pblib}
+-
+-" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile )
+-
+- set(CMAKE_REQUIRED_FLAGS)
+- set(CMAKE_REQUIRED_INCLUDES)
+- set(CMAKE_REQUIRED_LIBRARIES)
+-
+- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
+-
+- set(_found TRUE)
+-
+- set(BOOST_PYTHON_INCLUDES ${_pydir})
+- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}")
+-
+- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
+-
+- endif(NOT _found)
+-
+- endforeach(_pblib ${PYTHON_LIBS})
+-
+- endif(NOT _found)
+-
+- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS})
+-
+- endif(EXISTS ${_pydir}/Python.h)
+- endif(EXISTS ${_pydir})
+-
+- endif(NOT _found)
+-
+- endforeach(_pydir ${PYTHON_INCLUDE_DIRS})
+-
+- endif(NOT _found)
+-
+- endforeach(_pyver ${PYTHON_VERSIONS})
+-
+- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
+-
+-endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
+-
+-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+- set(BOOST_PYTHON_FOUND TRUE)
+-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+-
+-if(BOOST_PYTHON_FOUND)
+- if(NOT BoostPython_FIND_QUIETLY)
+- message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}")
+- endif(NOT BoostPython_FIND_QUIETLY)
+- set(KIG_ENABLE_PYTHON_SCRIPTING 1)
+-else (BOOST_PYTHON_FOUND)
+- if (BoostPython_FIND_REQUIRED)
+- message(FATAL_ERROR "Could NOT find Boost+Python")
+- endif(BoostPython_FIND_REQUIRED)
+- set(KIG_ENABLE_PYTHON_SCRIPTING 0)
+-endif(BOOST_PYTHON_FOUND)
+-
+-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
+diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake
+deleted file mode 100644
+index 72aae54..0000000
+--- a/cmake/modules/FindBoostPython.cmake
++++ /dev/null
+@@ -1,134 +0,0 @@
+-# - Try to find the a valid boost+python combination
+-# Once done this will define
+-#
+-# BOOST_PYTHON_FOUND - system has a valid boost+python combination
+-# BOOST_PYTHON_INCLUDES - the include directory for boost+python
+-# BOOST_PYTHON_LIBS - the needed libs for boost+python
+-
+-# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+- # Already in cache, be silent
+- set(BOOST_PYTHON_FIND_QUIETLY TRUE)
+-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+-
+-# some needed includes
+-include(CheckCXXSourceCompiles)
+-include(CheckIncludeFileCXX)
+-include(CheckLibraryExists)
+-
+-# reset vars
+-set(BOOST_PYTHON_INCLUDES)
+-set(BOOST_PYTHON_LIBS)
+-
+-# handy arrays
+-set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
+-set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
+-set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
+-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")
+-
+-# 1st: check for boost/shared_ptr.hpp
+-check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
+-
+-if(HAVE_BOOST_SHARED_PTR_HPP)
+-
+- set(_found FALSE)
+-
+- # save the old flags and setting the new ones
+- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-
+- foreach(_pyver ${PYTHON_VERSIONS})
+- if(NOT _found)
+- foreach(_pydir ${PYTHON_INCLUDE_DIRS})
+-
+- if(NOT _found)
+- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir})
+- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir})
+-
+- if(EXISTS ${_pydir})
+- if(EXISTS ${_pydir}/Python.h)
+-
+- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS})
+-
+- if(NOT _found)
+- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir})
+-
+- foreach(_pblib ${PYTHON_LIBS})
+-
+- if(NOT _found)
+-
+- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}")
+- set(CMAKE_REQUIRED_INCLUDES ${_pydir})
+- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver})
+-
+- check_cxx_source_compiles("
+-#include <boost/python.hpp>
+-const char* greet() { return \"Hello world!\"; }
+-BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
+-
+-int main() { return 0; }
+-
+-// some vars, in case of the compilation fail...
+-// python include dir: ${_pydir}
+-// python lib dir: ${_pylibdir}
+-// boost python lib: ${_pblib}
+-
+-" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile )
+-
+- set(CMAKE_REQUIRED_FLAGS)
+- set(CMAKE_REQUIRED_INCLUDES)
+- set(CMAKE_REQUIRED_LIBRARIES)
+-
+- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
+-
+- set(_found TRUE)
+-
+- set(BOOST_PYTHON_INCLUDES ${_pydir})
+- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}")
+-
+- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
+-
+- endif(NOT _found)
+-
+- endforeach(_pblib ${PYTHON_LIBS})
+-
+- endif(NOT _found)
+-
+- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS})
+-
+- endif(EXISTS ${_pydir}/Python.h)
+- endif(EXISTS ${_pydir})
+-
+- endif(NOT _found)
+-
+- endforeach(_pydir ${PYTHON_INCLUDE_DIRS})
+-
+- endif(NOT _found)
+-
+- endforeach(_pyver ${PYTHON_VERSIONS})
+-
+- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
+-
+-endif(HAVE_BOOST_SHARED_PTR_HPP)
+-
+-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+- set(BOOST_PYTHON_FOUND TRUE)
+-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+-
+-if(BOOST_PYTHON_FOUND)
+- if(NOT BoostPython_FIND_QUIETLY)
+- message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}")
+- endif(NOT BoostPython_FIND_QUIETLY)
+- set(KIG_ENABLE_PYTHON_SCRIPTING 1)
+-else (BOOST_PYTHON_FOUND)
+- if (BoostPython_FIND_REQUIRED)
+- message(FATAL_ERROR "Could NOT find Boost+Python")
+- endif(BoostPython_FIND_REQUIRED)
+- set(KIG_ENABLE_PYTHON_SCRIPTING 0)
+-endif(BOOST_PYTHON_FOUND)
+-
+-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
+--
+1.7.12
+
diff --git a/kde-base/kig/kig-4.9.49.9999.ebuild b/kde-base/kig/kig-4.9.49.9999.ebuild
index 87ec5f5..da79091 100644
--- a/kde-base/kig/kig-4.9.49.9999.ebuild
+++ b/kde-base/kig/kig-4.9.49.9999.ebuild
@@ -9,16 +9,18 @@ inherit kde4-base
DESCRIPTION="KDE Interactive Geometry tool"
KEYWORDS=""
-IUSE="debug kig-scripting"
+IUSE="debug scripting"
DEPEND="
- kig-scripting? ( >=dev-libs/boost-1.32 )
+ scripting? ( >=dev-libs/boost-1.48[python] )
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-4.9.0-boostpython.patch" )
+
src_configure() {
mycmakeargs=(
- $(cmake-utils_use_with kig-scripting BoostPython)
+ $(cmake-utils_use_with scripting)
)
kde4-base_src_configure
diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-9999.ebuild
index 87ec5f5..da79091 100644
--- a/kde-base/kig/kig-9999.ebuild
+++ b/kde-base/kig/kig-9999.ebuild
@@ -9,16 +9,18 @@ inherit kde4-base
DESCRIPTION="KDE Interactive Geometry tool"
KEYWORDS=""
-IUSE="debug kig-scripting"
+IUSE="debug scripting"
DEPEND="
- kig-scripting? ( >=dev-libs/boost-1.32 )
+ scripting? ( >=dev-libs/boost-1.48[python] )
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-4.9.0-boostpython.patch" )
+
src_configure() {
mycmakeargs=(
- $(cmake-utils_use_with kig-scripting BoostPython)
+ $(cmake-utils_use_with scripting)
)
kde4-base_src_configure
diff --git a/kde-base/kig/metadata.xml b/kde-base/kig/metadata.xml
index 75d68b1..dc23118 100644
--- a/kde-base/kig/metadata.xml
+++ b/kde-base/kig/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<use>
- <flag name="kig-scripting">Support Python scripting</flag>
+ <flag name="scripting">Support Python scripting</flag>
</use>
<herd>kde</herd>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kig/files/, kde-base/kig/
@ 2012-10-30 10:37 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2012-10-30 10:37 UTC (permalink / raw
To: gentoo-commits
commit: f313e7f101dceaa2a09e099ff3abb70f2730fafe
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 30 10:35:17 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 30 10:35:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f313e7f1
[kde-base/kig] Fix failing patch, wrt bug #440106.
The offending upstream commit is a05a87b8a0ab27a8f82f7d9ff2b4c8bf516f7b47.
Package-Manager: portage-2.1.11.31
---
kde-base/kig/files/kig-4.10.0-boostpython.patch | 450 +++++++++++++++++++++++
kde-base/kig/kig-9999.ebuild | 2 +-
2 files changed, 451 insertions(+), 1 deletions(-)
diff --git a/kde-base/kig/files/kig-4.10.0-boostpython.patch b/kde-base/kig/files/kig-4.10.0-boostpython.patch
new file mode 100644
index 0000000..fafe0ca
--- /dev/null
+++ b/kde-base/kig/files/kig-4.10.0-boostpython.patch
@@ -0,0 +1,450 @@
+From 0eb0768a4c66543b4ce716869eea744cb09b55ad Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 30 Aug 2012 14:02:44 +0200
+Subject: [PATCH] Use standard cmake module to find boost python.
+
+---
+ CMakeLists.txt | 34 ++++----
+ KigConfigureChecks.cmake | 4 +-
+ cmake/COPYING-CMAKE-SCRIPTS | 22 ------
+ cmake/FindBoostPython.cmake | 153 ------------------------------------
+ cmake/modules/FindBoostPython.cmake | 134 -------------------------------
+ 5 Dateien geändert, 20 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-)
+ delete mode 100644 cmake/COPYING-CMAKE-SCRIPTS
+ delete mode 100644 cmake/FindBoostPython.cmake
+ delete mode 100644 cmake/modules/FindBoostPython.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba3e377..092fde3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,9 +1,6 @@
+ project(kig)
+
+-#
+-# taken from kdeedu/CMakeList.txt
+-# from here...
+-set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake )
++option(WITH_SCRIPTING "Enable python scripting support" ON)
+
+ # search packages used by KDE
+ find_package(KDE4 4.3.80 REQUIRED)
+@@ -30,7 +27,14 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D
+
+ # ...to here
+
+-find_package(BoostPython)
++if(WITH_SCRIPTING)
++ find_package(PythonLibs)
++ find_package(Boost COMPONENTS python)
++endif(WITH_SCRIPTING)
++
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
++ set(KIG_ENABLE_PYTHON_SCRIPTING 1)
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+ kde4_no_enable_final(kig)
+
+@@ -45,14 +49,14 @@ add_subdirectory( macros )
+ #add_subdirectory( kfile )
+ add_subdirectory( data )
+ add_subdirectory( pykig )
+-if(BOOST_PYTHON_FOUND)
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+ add_subdirectory( scripting )
+-endif(BOOST_PYTHON_FOUND)
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+ macro_display_feature_log()
+
+ include_directories( ${CMAKE_SOURCE_DIR}/modes )
+-if(BOOST_PYTHON_FOUND)
+- include_directories(${BOOST_PYTHON_INCLUDES})
+-endif(BOOST_PYTHON_FOUND)
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
++ include_directories(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+ # kigpart
+
+@@ -173,7 +177,7 @@ kde4_add_ui_files(kigpart_PART_SRCS
+ misc/kigcoordinateprecisiondialog.ui
+ )
+
+-if(BOOST_PYTHON_FOUND)
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+ set(kigpart_PART_SRCS ${kigpart_PART_SRCS}
+ scripting/newscriptwizard.cc
+ scripting/python_scripter.cc
+@@ -183,15 +187,15 @@ if(BOOST_PYTHON_FOUND)
+ )
+
+ set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}")
+-endif(BOOST_PYTHON_FOUND)
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+
+ kde4_add_plugin(kigpart ${kigpart_PART_SRCS})
+
+ target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} )
+-if(BOOST_PYTHON_FOUND)
+- target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS})
+-endif(BOOST_PYTHON_FOUND)
++if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
++ target_link_libraries(kigpart ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS})
++endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
+
+ install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR})
+
+diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake
+index fed38b3..a53ea73 100644
+--- a/KigConfigureChecks.cmake
++++ b/KigConfigureChecks.cmake
+@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC)
+ set(CMAKE_REQUIRED_INCLUDES)
+ set(CMAKE_REQUIRED_LIBRARIES)
+
+-macro_optional_find_package(BoostPython)
+-
+ # at the end, output the configuration
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake
+@@ -18,7 +16,7 @@ configure_file(
+ )
+
+ macro_log_feature(
+- BOOST_PYTHON_FOUND
++ Boost_PYTHON_FOUND
+ "Boost.Python"
+ "Kig can optionally use Boost.Python for Python scripting"
+ "http://www.boost.org/"
+diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS
+deleted file mode 100644
+index 4b41776..0000000
+--- a/cmake/COPYING-CMAKE-SCRIPTS
++++ /dev/null
+@@ -1,22 +0,0 @@
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions
+-are met:
+-
+-1. Redistributions of source code must retain the copyright
+- notice, this list of conditions and the following disclaimer.
+-2. Redistributions in binary form must reproduce the copyright
+- notice, this list of conditions and the following disclaimer in the
+- documentation and/or other materials provided with the distribution.
+-3. The name of the author may not be used to endorse or promote products
+- derived from this software without specific prior written permission.
+-
+-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake
+deleted file mode 100644
+index 6d5f05e..0000000
+--- a/cmake/FindBoostPython.cmake
++++ /dev/null
+@@ -1,153 +0,0 @@
+-# - Try to find the a valid boost+python combination
+-# Once done this will define
+-#
+-# BOOST_PYTHON_FOUND - system has a valid boost+python combination
+-# BOOST_PYTHON_INCLUDES - the include directory for boost+python
+-# BOOST_PYTHON_LIBS - the needed libs for boost+python
+-
+-# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+- # Already in cache, be silent
+- set(BOOST_PYTHON_FIND_QUIETLY TRUE)
+-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+-
+-# some needed includes
+-include(CheckCXXSourceCompiles)
+-include(CheckIncludeFileCXX)
+-include(CheckLibraryExists)
+-
+-find_package(PkgConfig)
+-
+-# reset vars
+-set(BOOST_PYTHON_INCLUDES)
+-set(BOOST_PYTHON_LIBS)
+-
+-# handy arrays
+-set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
+-set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
+-set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
+-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")
+-
+-# 1st: check for boost/shared_ptr.hpp
+-check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
+-
+-if(HAVE_BOOST_SHARED_PTR_HPP)
+-
+- # try pkg-config next
+- set(_found FALSE)
+- foreach(_pyver ${PYTHON_VERSIONS})
+- if(NOT _found)
+- pkg_check_modules(_python QUIET ${_pyver})
+- if (_python_FOUND)
+- find_package(Boost 1.33 COMPONENTS python)
+- if (Boost_PYTHON_FOUND)
+- set(_found TRUE)
+- set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}")
+- set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}")
+- endif(Boost_PYTHON_FOUND)
+- endif(_python_FOUND)
+- endif(NOT _found)
+- endforeach(_pyver ${PYTHON_VERSIONS})
+-
+-endif(HAVE_BOOST_SHARED_PTR_HPP)
+-
+-if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
+- # save the old flags and setting the new ones
+- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-
+- foreach(_pyver ${PYTHON_VERSIONS})
+- if(NOT _found)
+- foreach(_pydir ${PYTHON_INCLUDE_DIRS})
+-
+- if(NOT _found)
+- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir})
+- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir})
+-
+- if(EXISTS ${_pydir})
+- if(EXISTS ${_pydir}/Python.h)
+-
+- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS})
+-
+- if(NOT _found)
+- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir})
+-
+- foreach(_pblib ${PYTHON_LIBS})
+-
+- if(NOT _found)
+-
+- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}")
+- set(CMAKE_REQUIRED_INCLUDES ${_pydir})
+- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver})
+-
+- check_cxx_source_compiles("
+-#include <boost/python.hpp>
+-const char* greet() { return \"Hello world!\"; }
+-BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
+-
+-int main() { return 0; }
+-
+-// some vars, in case of the compilation fail...
+-// python include dir: ${_pydir}
+-// python lib dir: ${_pylibdir}
+-// boost python lib: ${_pblib}
+-
+-" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile )
+-
+- set(CMAKE_REQUIRED_FLAGS)
+- set(CMAKE_REQUIRED_INCLUDES)
+- set(CMAKE_REQUIRED_LIBRARIES)
+-
+- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
+-
+- set(_found TRUE)
+-
+- set(BOOST_PYTHON_INCLUDES ${_pydir})
+- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}")
+-
+- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
+-
+- endif(NOT _found)
+-
+- endforeach(_pblib ${PYTHON_LIBS})
+-
+- endif(NOT _found)
+-
+- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS})
+-
+- endif(EXISTS ${_pydir}/Python.h)
+- endif(EXISTS ${_pydir})
+-
+- endif(NOT _found)
+-
+- endforeach(_pydir ${PYTHON_INCLUDE_DIRS})
+-
+- endif(NOT _found)
+-
+- endforeach(_pyver ${PYTHON_VERSIONS})
+-
+- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
+-
+-endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
+-
+-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+- set(BOOST_PYTHON_FOUND TRUE)
+-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+-
+-if(BOOST_PYTHON_FOUND)
+- if(NOT BoostPython_FIND_QUIETLY)
+- message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}")
+- endif(NOT BoostPython_FIND_QUIETLY)
+- set(KIG_ENABLE_PYTHON_SCRIPTING 1)
+-else (BOOST_PYTHON_FOUND)
+- if (BoostPython_FIND_REQUIRED)
+- message(FATAL_ERROR "Could NOT find Boost+Python")
+- endif(BoostPython_FIND_REQUIRED)
+- set(KIG_ENABLE_PYTHON_SCRIPTING 0)
+-endif(BOOST_PYTHON_FOUND)
+-
+-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
+diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake
+deleted file mode 100644
+index 72aae54..0000000
+--- a/cmake/modules/FindBoostPython.cmake
++++ /dev/null
+@@ -1,134 +0,0 @@
+-# - Try to find the a valid boost+python combination
+-# Once done this will define
+-#
+-# BOOST_PYTHON_FOUND - system has a valid boost+python combination
+-# BOOST_PYTHON_INCLUDES - the include directory for boost+python
+-# BOOST_PYTHON_LIBS - the needed libs for boost+python
+-
+-# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+- # Already in cache, be silent
+- set(BOOST_PYTHON_FIND_QUIETLY TRUE)
+-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+-
+-# some needed includes
+-include(CheckCXXSourceCompiles)
+-include(CheckIncludeFileCXX)
+-include(CheckLibraryExists)
+-
+-# reset vars
+-set(BOOST_PYTHON_INCLUDES)
+-set(BOOST_PYTHON_LIBS)
+-
+-# handy arrays
+-set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
+-set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
+-set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
+-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")
+-
+-# 1st: check for boost/shared_ptr.hpp
+-check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
+-
+-if(HAVE_BOOST_SHARED_PTR_HPP)
+-
+- set(_found FALSE)
+-
+- # save the old flags and setting the new ones
+- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-
+- foreach(_pyver ${PYTHON_VERSIONS})
+- if(NOT _found)
+- foreach(_pydir ${PYTHON_INCLUDE_DIRS})
+-
+- if(NOT _found)
+- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir})
+- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir})
+-
+- if(EXISTS ${_pydir})
+- if(EXISTS ${_pydir}/Python.h)
+-
+- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS})
+-
+- if(NOT _found)
+- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir})
+-
+- foreach(_pblib ${PYTHON_LIBS})
+-
+- if(NOT _found)
+-
+- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}")
+- set(CMAKE_REQUIRED_INCLUDES ${_pydir})
+- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver})
+-
+- check_cxx_source_compiles("
+-#include <boost/python.hpp>
+-const char* greet() { return \"Hello world!\"; }
+-BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
+-
+-int main() { return 0; }
+-
+-// some vars, in case of the compilation fail...
+-// python include dir: ${_pydir}
+-// python lib dir: ${_pylibdir}
+-// boost python lib: ${_pblib}
+-
+-" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile )
+-
+- set(CMAKE_REQUIRED_FLAGS)
+- set(CMAKE_REQUIRED_INCLUDES)
+- set(CMAKE_REQUIRED_LIBRARIES)
+-
+- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
+-
+- set(_found TRUE)
+-
+- set(BOOST_PYTHON_INCLUDES ${_pydir})
+- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}")
+-
+- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
+-
+- endif(NOT _found)
+-
+- endforeach(_pblib ${PYTHON_LIBS})
+-
+- endif(NOT _found)
+-
+- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS})
+-
+- endif(EXISTS ${_pydir}/Python.h)
+- endif(EXISTS ${_pydir})
+-
+- endif(NOT _found)
+-
+- endforeach(_pydir ${PYTHON_INCLUDE_DIRS})
+-
+- endif(NOT _found)
+-
+- endforeach(_pyver ${PYTHON_VERSIONS})
+-
+- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
+-
+-endif(HAVE_BOOST_SHARED_PTR_HPP)
+-
+-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+- set(BOOST_PYTHON_FOUND TRUE)
+-endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
+-
+-if(BOOST_PYTHON_FOUND)
+- if(NOT BoostPython_FIND_QUIETLY)
+- message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}")
+- endif(NOT BoostPython_FIND_QUIETLY)
+- set(KIG_ENABLE_PYTHON_SCRIPTING 1)
+-else (BOOST_PYTHON_FOUND)
+- if (BoostPython_FIND_REQUIRED)
+- message(FATAL_ERROR "Could NOT find Boost+Python")
+- endif(BoostPython_FIND_REQUIRED)
+- set(KIG_ENABLE_PYTHON_SCRIPTING 0)
+-endif(BOOST_PYTHON_FOUND)
+-
+-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
+--
+1.7.12
+
diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-9999.ebuild
index da79091..879d22a 100644
--- a/kde-base/kig/kig-9999.ebuild
+++ b/kde-base/kig/kig-9999.ebuild
@@ -16,7 +16,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.9.0-boostpython.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.10.0-boostpython.patch" )
src_configure() {
mycmakeargs=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kig/files/, kde-base/kig/
@ 2013-01-31 16:18 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2013-01-31 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 7c124771e71d9f3abc8159b6354161c4e6e516d7
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 31 16:18:35 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 16:18:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7c124771
[kde-base/kig] Remove unused patch. Tidy metadata.
Package-Manager: portage-2.1.11.50
---
kde-base/kig/files/kig-4.9.0-boostpython.patch | 448 ------------------------
kde-base/kig/metadata.xml | 8 +-
2 files changed, 4 insertions(+), 452 deletions(-)
diff --git a/kde-base/kig/files/kig-4.9.0-boostpython.patch b/kde-base/kig/files/kig-4.9.0-boostpython.patch
deleted file mode 100644
index c2035b1..0000000
--- a/kde-base/kig/files/kig-4.9.0-boostpython.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-From 0eb0768a4c66543b4ce716869eea744cb09b55ad Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Thu, 30 Aug 2012 14:02:44 +0200
-Subject: [PATCH] Use standard cmake module to find boost python.
-
----
- CMakeLists.txt | 34 ++++----
- KigConfigureChecks.cmake | 4 +-
- cmake/COPYING-CMAKE-SCRIPTS | 22 ------
- cmake/FindBoostPython.cmake | 153 ------------------------------------
- cmake/modules/FindBoostPython.cmake | 134 -------------------------------
- 5 Dateien geändert, 20 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-)
- delete mode 100644 cmake/COPYING-CMAKE-SCRIPTS
- delete mode 100644 cmake/FindBoostPython.cmake
- delete mode 100644 cmake/modules/FindBoostPython.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba3e377..092fde3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,9 +1,6 @@
- project(kig)
-
--#
--# taken from kdeedu/CMakeList.txt
--# from here...
--set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake )
-+option(WITH_SCRIPTING "Enable python scripting support" ON)
-
- # search packages used by KDE
- find_package(KDE4 4.3.80 REQUIRED)
-@@ -30,7 +27,14 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D
-
- # ...to here
-
--find_package(BoostPython)
-+if(WITH_SCRIPTING)
-+ find_package(PythonLibs)
-+ find_package(Boost COMPONENTS python)
-+endif(WITH_SCRIPTING)
-+
-+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
-+ set(KIG_ENABLE_PYTHON_SCRIPTING 1)
-+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
-
- kde4_no_enable_final(kig)
-
-@@ -45,14 +49,14 @@ add_subdirectory( macros )
- #add_subdirectory( kfile )
- add_subdirectory( data )
- add_subdirectory( pykig )
--if(BOOST_PYTHON_FOUND)
-+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
- add_subdirectory( scripting )
--endif(BOOST_PYTHON_FOUND)
-+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
-
- include_directories( ${CMAKE_SOURCE_DIR}/modes )
--if(BOOST_PYTHON_FOUND)
-- include_directories(${BOOST_PYTHON_INCLUDES})
--endif(BOOST_PYTHON_FOUND)
-+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
-+ include_directories(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
-+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
-
- # kigpart
-
-@@ -173,7 +177,7 @@ kde4_add_ui_files(kigpart_PART_SRCS
- misc/kigcoordinateprecisiondialog.ui
- )
-
--if(BOOST_PYTHON_FOUND)
-+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
- set(kigpart_PART_SRCS ${kigpart_PART_SRCS}
- scripting/newscriptwizard.cc
- scripting/python_scripter.cc
-@@ -183,15 +187,15 @@ if(BOOST_PYTHON_FOUND)
- )
-
- set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}")
--endif(BOOST_PYTHON_FOUND)
-+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
-
-
- kde4_add_plugin(kigpart ${kigpart_PART_SRCS})
-
- target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} )
--if(BOOST_PYTHON_FOUND)
-- target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS})
--endif(BOOST_PYTHON_FOUND)
-+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
-+ target_link_libraries(kigpart ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS})
-+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
-
- install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR})
-
-diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake
-index fed38b3..a53ea73 100644
---- a/KigConfigureChecks.cmake
-+++ b/KigConfigureChecks.cmake
-@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC)
- set(CMAKE_REQUIRED_INCLUDES)
- set(CMAKE_REQUIRED_LIBRARIES)
-
--macro_optional_find_package(BoostPython)
--
- # at the end, output the configuration
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake
-@@ -18,7 +16,7 @@ configure_file(
- )
-
- macro_log_feature(
-- BOOST_PYTHON_FOUND
-+ Boost_PYTHON_FOUND
- "Boost.Python"
- "Kig can optionally use Boost.Python for Python scripting"
- "http://www.boost.org/"
-diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS
-deleted file mode 100644
-index 4b41776..0000000
---- a/cmake/COPYING-CMAKE-SCRIPTS
-+++ /dev/null
-@@ -1,22 +0,0 @@
--Redistribution and use in source and binary forms, with or without
--modification, are permitted provided that the following conditions
--are met:
--
--1. Redistributions of source code must retain the copyright
-- notice, this list of conditions and the following disclaimer.
--2. Redistributions in binary form must reproduce the copyright
-- notice, this list of conditions and the following disclaimer in the
-- documentation and/or other materials provided with the distribution.
--3. The name of the author may not be used to endorse or promote products
-- derived from this software without specific prior written permission.
--
--THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
--IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
--OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
--IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
--INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
--NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
--THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake
-deleted file mode 100644
-index 6d5f05e..0000000
---- a/cmake/FindBoostPython.cmake
-+++ /dev/null
-@@ -1,153 +0,0 @@
--# - Try to find the a valid boost+python combination
--# Once done this will define
--#
--# BOOST_PYTHON_FOUND - system has a valid boost+python combination
--# BOOST_PYTHON_INCLUDES - the include directory for boost+python
--# BOOST_PYTHON_LIBS - the needed libs for boost+python
--
--# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
--#
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
-- # Already in cache, be silent
-- set(BOOST_PYTHON_FIND_QUIETLY TRUE)
--endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
--
--# some needed includes
--include(CheckCXXSourceCompiles)
--include(CheckIncludeFileCXX)
--include(CheckLibraryExists)
--
--find_package(PkgConfig)
--
--# reset vars
--set(BOOST_PYTHON_INCLUDES)
--set(BOOST_PYTHON_LIBS)
--
--# handy arrays
--set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
--set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
--set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
--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")
--
--# 1st: check for boost/shared_ptr.hpp
--check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
--
--if(HAVE_BOOST_SHARED_PTR_HPP)
--
-- # try pkg-config next
-- set(_found FALSE)
-- foreach(_pyver ${PYTHON_VERSIONS})
-- if(NOT _found)
-- pkg_check_modules(_python QUIET ${_pyver})
-- if (_python_FOUND)
-- find_package(Boost 1.33 COMPONENTS python)
-- if (Boost_PYTHON_FOUND)
-- set(_found TRUE)
-- set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}")
-- set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}")
-- endif(Boost_PYTHON_FOUND)
-- endif(_python_FOUND)
-- endif(NOT _found)
-- endforeach(_pyver ${PYTHON_VERSIONS})
--
--endif(HAVE_BOOST_SHARED_PTR_HPP)
--
--if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
-- # save the old flags and setting the new ones
-- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--
-- foreach(_pyver ${PYTHON_VERSIONS})
-- if(NOT _found)
-- foreach(_pydir ${PYTHON_INCLUDE_DIRS})
--
-- if(NOT _found)
-- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir})
-- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir})
--
-- if(EXISTS ${_pydir})
-- if(EXISTS ${_pydir}/Python.h)
--
-- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS})
--
-- if(NOT _found)
-- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir})
--
-- foreach(_pblib ${PYTHON_LIBS})
--
-- if(NOT _found)
--
-- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}")
-- set(CMAKE_REQUIRED_INCLUDES ${_pydir})
-- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver})
--
-- check_cxx_source_compiles("
--#include <boost/python.hpp>
--const char* greet() { return \"Hello world!\"; }
--BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
--
--int main() { return 0; }
--
--// some vars, in case of the compilation fail...
--// python include dir: ${_pydir}
--// python lib dir: ${_pylibdir}
--// boost python lib: ${_pblib}
--
--" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile )
--
-- set(CMAKE_REQUIRED_FLAGS)
-- set(CMAKE_REQUIRED_INCLUDES)
-- set(CMAKE_REQUIRED_LIBRARIES)
--
-- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
--
-- set(_found TRUE)
--
-- set(BOOST_PYTHON_INCLUDES ${_pydir})
-- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}")
--
-- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
--
-- endif(NOT _found)
--
-- endforeach(_pblib ${PYTHON_LIBS})
--
-- endif(NOT _found)
--
-- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS})
--
-- endif(EXISTS ${_pydir}/Python.h)
-- endif(EXISTS ${_pydir})
--
-- endif(NOT _found)
--
-- endforeach(_pydir ${PYTHON_INCLUDE_DIRS})
--
-- endif(NOT _found)
--
-- endforeach(_pyver ${PYTHON_VERSIONS})
--
-- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
--
--endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
--
--if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
-- set(BOOST_PYTHON_FOUND TRUE)
--endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
--
--if(BOOST_PYTHON_FOUND)
-- if(NOT BoostPython_FIND_QUIETLY)
-- message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}")
-- endif(NOT BoostPython_FIND_QUIETLY)
-- set(KIG_ENABLE_PYTHON_SCRIPTING 1)
--else (BOOST_PYTHON_FOUND)
-- if (BoostPython_FIND_REQUIRED)
-- message(FATAL_ERROR "Could NOT find Boost+Python")
-- endif(BoostPython_FIND_REQUIRED)
-- set(KIG_ENABLE_PYTHON_SCRIPTING 0)
--endif(BOOST_PYTHON_FOUND)
--
--mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
-diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake
-deleted file mode 100644
-index 72aae54..0000000
---- a/cmake/modules/FindBoostPython.cmake
-+++ /dev/null
-@@ -1,134 +0,0 @@
--# - Try to find the a valid boost+python combination
--# Once done this will define
--#
--# BOOST_PYTHON_FOUND - system has a valid boost+python combination
--# BOOST_PYTHON_INCLUDES - the include directory for boost+python
--# BOOST_PYTHON_LIBS - the needed libs for boost+python
--
--# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
--#
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
-- # Already in cache, be silent
-- set(BOOST_PYTHON_FIND_QUIETLY TRUE)
--endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
--
--# some needed includes
--include(CheckCXXSourceCompiles)
--include(CheckIncludeFileCXX)
--include(CheckLibraryExists)
--
--# reset vars
--set(BOOST_PYTHON_INCLUDES)
--set(BOOST_PYTHON_LIBS)
--
--# handy arrays
--set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
--set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
--set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
--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")
--
--# 1st: check for boost/shared_ptr.hpp
--check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
--
--if(HAVE_BOOST_SHARED_PTR_HPP)
--
-- set(_found FALSE)
--
-- # save the old flags and setting the new ones
-- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--
-- foreach(_pyver ${PYTHON_VERSIONS})
-- if(NOT _found)
-- foreach(_pydir ${PYTHON_INCLUDE_DIRS})
--
-- if(NOT _found)
-- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir})
-- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir})
--
-- if(EXISTS ${_pydir})
-- if(EXISTS ${_pydir}/Python.h)
--
-- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS})
--
-- if(NOT _found)
-- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir})
--
-- foreach(_pblib ${PYTHON_LIBS})
--
-- if(NOT _found)
--
-- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}")
-- set(CMAKE_REQUIRED_INCLUDES ${_pydir})
-- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver})
--
-- check_cxx_source_compiles("
--#include <boost/python.hpp>
--const char* greet() { return \"Hello world!\"; }
--BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); }
--
--int main() { return 0; }
--
--// some vars, in case of the compilation fail...
--// python include dir: ${_pydir}
--// python lib dir: ${_pylibdir}
--// boost python lib: ${_pblib}
--
--" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile )
--
-- set(CMAKE_REQUIRED_FLAGS)
-- set(CMAKE_REQUIRED_INCLUDES)
-- set(CMAKE_REQUIRED_LIBRARIES)
--
-- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
--
-- set(_found TRUE)
--
-- set(BOOST_PYTHON_INCLUDES ${_pydir})
-- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}")
--
-- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile)
--
-- endif(NOT _found)
--
-- endforeach(_pblib ${PYTHON_LIBS})
--
-- endif(NOT _found)
--
-- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS})
--
-- endif(EXISTS ${_pydir}/Python.h)
-- endif(EXISTS ${_pydir})
--
-- endif(NOT _found)
--
-- endforeach(_pydir ${PYTHON_INCLUDE_DIRS})
--
-- endif(NOT _found)
--
-- endforeach(_pyver ${PYTHON_VERSIONS})
--
-- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
--
--endif(HAVE_BOOST_SHARED_PTR_HPP)
--
--if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
-- set(BOOST_PYTHON_FOUND TRUE)
--endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
--
--if(BOOST_PYTHON_FOUND)
-- if(NOT BoostPython_FIND_QUIETLY)
-- message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}")
-- endif(NOT BoostPython_FIND_QUIETLY)
-- set(KIG_ENABLE_PYTHON_SCRIPTING 1)
--else (BOOST_PYTHON_FOUND)
-- if (BoostPython_FIND_REQUIRED)
-- message(FATAL_ERROR "Could NOT find Boost+Python")
-- endif(BoostPython_FIND_REQUIRED)
-- set(KIG_ENABLE_PYTHON_SCRIPTING 0)
--endif(BOOST_PYTHON_FOUND)
--
--mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
---
-1.7.12
-
diff --git a/kde-base/kig/metadata.xml b/kde-base/kig/metadata.xml
index dc23118..76914c7 100644
--- a/kde-base/kig/metadata.xml
+++ b/kde-base/kig/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<use>
- <flag name="scripting">Support Python scripting</flag>
-</use>
-<herd>kde</herd>
+ <use>
+ <flag name="scripting">Support Python scripting</flag>
+ </use>
+ <herd>kde</herd>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kig/files/, kde-base/kig/
@ 2013-04-11 17:02 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2013-04-11 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 3cd4bcdea028f8c05044e83f262ac0183b362afd
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 16:59:02 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 17:01:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3cd4bcde
[kde-base/kig] Update python support to match upstream changes, fixing bug #465328.
Python scripting support currently only supports python-2.x and is located using pkg-config. This is the reason for the strict python-2.7 dep, since that is the
only version that provides a .pc file.
Package-Manager: portage-2.1.11.60
---
kde-base/kig/files/kig-4.11.0-boostpython.patch | 22 ++++++++++++++++++++++
kde-base/kig/kig-9999.ebuild | 23 ++++++++++++++++++-----
2 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/kde-base/kig/files/kig-4.11.0-boostpython.patch b/kde-base/kig/files/kig-4.11.0-boostpython.patch
new file mode 100644
index 0000000..0f9557d
--- /dev/null
+++ b/kde-base/kig/files/kig-4.11.0-boostpython.patch
@@ -0,0 +1,22 @@
+diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake
+index d6c5a34..1fde037 100644
+--- a/cmake/modules/FindBoostPython.cmake
++++ b/cmake/modules/FindBoostPython.cmake
+@@ -24,7 +24,7 @@ set(BOOST_PYTHON_INCLUDES)
+ set(BOOST_PYTHON_LIBS)
+
+ # handy arrays
+-set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
++execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS)
+
+ # 1st: check for boost/shared_ptr.hpp
+ check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
+@@ -35,7 +35,7 @@ if(HAVE_BOOST_SHARED_PTR_HPP)
+ set(_found FALSE)
+ foreach(_pyver ${PYTHON_VERSIONS})
+ if(NOT _found)
+- pkg_check_modules(_python QUIET ${_pyver})
++ pkg_check_modules(_python python-${_pyver})
+ if (_python_FOUND)
+ find_package(Boost 1.33 COMPONENTS python)
+ if (Boost_PYTHON_FOUND)
diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-9999.ebuild
index dd23e7d..9c4ca10 100644
--- a/kde-base/kig/kig-9999.ebuild
+++ b/kde-base/kig/kig-9999.ebuild
@@ -5,22 +5,35 @@
EAPI=5
KDE_HANDBOOK="optional"
-inherit kde4-base
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde4-base
DESCRIPTION="KDE Interactive Geometry tool"
KEYWORDS=""
IUSE="debug scripting"
DEPEND="
- scripting? ( >=dev-libs/boost-1.48:=[python] )
+ ${PYTHON_DEPS}
+ scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.10.0-boostpython.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.11.0-boostpython.patch" )
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ kde4-base_pkg_setup
+}
+
+src_prepare() {
+ kde4-base_src_prepare
+
+ python_fix_shebang .
+}
src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_with scripting)
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package scripting BoostPython)
)
kde4-base_src_configure
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kig/files/, kde-base/kig/
@ 2013-06-05 20:47 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2013-06-05 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 821e9b47c82d743716296daf2f9cb29a8567992b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 20:47:29 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 20:47:29 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=821e9b47
[kde-base/kig] Sync patch with tree.
Package-Manager: portage-2.2.0_alpha177
---
...stpython.patch => kig-4.10.4-boostpython.patch} | 53 +++++++++++++---------
kde-base/kig/kig-4.10.49.9999.ebuild | 2 +-
2 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/kde-base/kig/files/kig-4.10.0-boostpython.patch b/kde-base/kig/files/kig-4.10.4-boostpython.patch
similarity index 90%
rename from kde-base/kig/files/kig-4.10.0-boostpython.patch
rename to kde-base/kig/files/kig-4.10.4-boostpython.patch
index 478795e..ec938a7 100644
--- a/kde-base/kig/files/kig-4.10.0-boostpython.patch
+++ b/kde-base/kig/files/kig-4.10.4-boostpython.patch
@@ -1,7 +1,7 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index aa4cc11..647a270 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e27b470..2db327f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -1,9 +1,6 @@
project(kig)
@@ -13,11 +13,12 @@ index aa4cc11..647a270 100644
# search packages used by KDE
find_package(KDE4 4.3.80 REQUIRED)
-@@ -30,7 +27,15 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D
+@@ -29,7 +26,16 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_USE_FAST_CONCATENATI
+ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
# ...to here
-
-find_package(BoostPython)
++
+if(WITH_SCRIPTING)
+ set(PythonLibs_FIND_VERSION "2.2")
+ find_package(PythonLibs)
@@ -30,7 +31,7 @@ index aa4cc11..647a270 100644
kde4_no_enable_final(kig)
-@@ -45,16 +50,16 @@ add_subdirectory( macros )
+@@ -44,16 +50,16 @@ add_subdirectory( macros )
#add_subdirectory( kfile )
add_subdirectory( data )
add_subdirectory( pykig )
@@ -52,16 +53,16 @@ index aa4cc11..647a270 100644
# kigpart
-@@ -176,7 +181,7 @@ kde4_add_ui_files(kigpart_PART_SRCS
+@@ -182,7 +188,7 @@ kde4_add_ui_files(kigpart_PART_SRCS
misc/kigcoordinateprecisiondialog.ui
)
-if(BOOST_PYTHON_FOUND)
+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND)
set(kigpart_PART_SRCS ${kigpart_PART_SRCS}
+ modes/popup/scriptactionsprovider.cc
scripting/newscriptwizard.cc
- scripting/python_scripter.cc
-@@ -186,15 +191,15 @@ if(BOOST_PYTHON_FOUND)
+@@ -193,15 +199,15 @@ if(BOOST_PYTHON_FOUND)
)
set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}")
@@ -81,10 +82,10 @@ index aa4cc11..647a270 100644
install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR})
-diff --git KigConfigureChecks.cmake KigConfigureChecks.cmake
+diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake
index fed38b3..a53ea73 100644
---- KigConfigureChecks.cmake
-+++ KigConfigureChecks.cmake
+--- a/KigConfigureChecks.cmake
++++ b/KigConfigureChecks.cmake
@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
@@ -103,10 +104,10 @@ index fed38b3..a53ea73 100644
"Boost.Python"
"Kig can optionally use Boost.Python for Python scripting"
"http://www.boost.org/"
-diff --git cmake/COPYING-CMAKE-SCRIPTS cmake/COPYING-CMAKE-SCRIPTS
+diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS
deleted file mode 100644
index 4b41776..0000000
---- cmake/COPYING-CMAKE-SCRIPTS
+--- a/cmake/COPYING-CMAKE-SCRIPTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Redistribution and use in source and binary forms, with or without
@@ -131,12 +132,12 @@ index 4b41776..0000000
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff --git cmake/FindBoostPython.cmake cmake/FindBoostPython.cmake
+diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake
deleted file mode 100644
-index 6d5f05e..0000000
---- cmake/FindBoostPython.cmake
+index 50339fd..0000000
+--- a/cmake/FindBoostPython.cmake
+++ /dev/null
-@@ -1,153 +0,0 @@
+@@ -1,163 +0,0 @@
-# - Try to find the a valid boost+python combination
-# Once done this will define
-#
@@ -171,6 +172,15 @@ index 6d5f05e..0000000
-set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
-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")
-
+-if(WIN32)
+- set(PythonLibs_FIND_VERSION 2.7.0)
+- find_package(PythonLibs)
+- find_package(Boost COMPONENTS python QUIET)
+- if(PYTHONLIBS_FOUND AND Boost_FOUND)
+- set(BOOST_PYTHON_INCLUDES ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
+- set(BOOST_PYTHON_LIBS ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES})
+- endif(PYTHONLIBS_FOUND AND Boost_FOUND)
+-else(WIN32)
-# 1st: check for boost/shared_ptr.hpp
-check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
-
@@ -272,6 +282,7 @@ index 6d5f05e..0000000
- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS})
-
-endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found)
+-endif(WIN32)
-
-if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS)
- set(BOOST_PYTHON_FOUND TRUE)
@@ -290,10 +301,10 @@ index 6d5f05e..0000000
-endif(BOOST_PYTHON_FOUND)
-
-mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS)
-diff --git cmake/modules/FindBoostPython.cmake cmake/modules/FindBoostPython.cmake
+diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake
deleted file mode 100644
index 72aae54..0000000
---- cmake/modules/FindBoostPython.cmake
+--- a/cmake/modules/FindBoostPython.cmake
+++ /dev/null
@@ -1,134 +0,0 @@
-# - Try to find the a valid boost+python combination
diff --git a/kde-base/kig/kig-4.10.49.9999.ebuild b/kde-base/kig/kig-4.10.49.9999.ebuild
index dd23e7d..d6b98e1 100644
--- a/kde-base/kig/kig-4.10.49.9999.ebuild
+++ b/kde-base/kig/kig-4.10.49.9999.ebuild
@@ -16,7 +16,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.10.0-boostpython.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.10.4-boostpython.patch" )
src_configure() {
mycmakeargs=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kig/files/, kde-base/kig/
@ 2013-08-07 14:21 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2013-08-07 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 91ecd2d7f11454fcdc3bde33872e1b4d688eb4ee
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 7 14:15:21 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 7 14:16:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=91ecd2d7
[kde-base/kig] Use updated python patch from Mario Bensi to match upstream changes.
Package-Manager: portage-2.1.13.5
---
kde-base/kig/files/kig-4.12.0-boostpython.patch | 17 +++++++++++++++++
kde-base/kig/kig-9999.ebuild | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/kde-base/kig/files/kig-4.12.0-boostpython.patch b/kde-base/kig/files/kig-4.12.0-boostpython.patch
new file mode 100644
index 0000000..7a4b878
--- /dev/null
+++ b/kde-base/kig/files/kig-4.12.0-boostpython.patch
@@ -0,0 +1,17 @@
+diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake
+index 2ccc161..02d9bf6 100644
+--- a/cmake/modules/FindBoostPython.cmake
++++ b/cmake/modules/FindBoostPython.cmake
+@@ -74,10 +74,10 @@ if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND)
+ # Second try: try pkg-config way
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+- set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")
++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS)
+ foreach(_pyver ${PYTHON_VERSIONS})
+ if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS)
+- pkg_check_modules(${_pyver} QUIET ${_pyver})
++ pkg_check_modules(_python python-${_pyver})
+ if(${_pyver}_FOUND)
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS})
\ No newline at end of file
diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-9999.ebuild
index 3666edb..a0d1267 100644
--- a/kde-base/kig/kig-9999.ebuild
+++ b/kde-base/kig/kig-9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.11.0-boostpython.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
pkg_setup() {
python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-07 14:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-11 17:02 [gentoo-commits] proj/kde:master commit in: kde-base/kig/files/, kde-base/kig/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2013-08-07 14:21 Michael Palimaka
2013-06-05 20:47 Johannes Huber
2013-01-31 16:18 Michael Palimaka
2012-10-30 10:37 Michael Palimaka
2012-08-30 14:40 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox