[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     9c83061f27fbcce3dea027d90276764e2d1ee14d
Author:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
AuthorDate: Thu Feb  7 16:09:50 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 16:10:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9c83061f

[dev-util/cmake] Add a fix for finding the Python interpreter wrt bug #405181.

Package-Manager: portage-2.1.11.50

---
 dev-util/cmake/cmake-2.8.10.2-r2.ebuild            |    1 +
 .../files/cmake-2.8.10.2-FindPythonInterp.patch    |   22 ++++++++++++++++++++
 .../files/cmake-2.8.10.2-FindPythonLibs.patch      |    2 +-
 3 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
index 7c50be3..b455710 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
 	"${FILESDIR}"/${PN}-2.8.10-libform.patch
 	"${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
 	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch
 	"${FILESDIR}"/${PN}-2.8.10.2-qt5.patch

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
new file mode 100644
index 0000000..a7e8688
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch
@@ -0,0 +1,22 @@
+--- Modules/FindPythonInterp.cmake
++++ Modules/FindPythonInterp.cmake
+@@ -60,6 +60,10 @@
+ 
+ list(APPEND _Python_NAMES python)
+ 
++if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++    set(_Python_NAMES python)
++endif()
++
+ # Search for the current active python version first
+ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+ 
+@@ -76,7 +80,7 @@
+ unset(_PYTHON3_VERSIONS)
+ 
+ # Search for newest python version if python executable isn't found
+-if(NOT PYTHON_EXECUTABLE)
++if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
+     foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+       set(_Python_NAMES python${_CURRENT_VERSION})
+       if(WIN32)

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
index 53b395c..80cc4d3 100644
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -6,7 +6,7 @@ index bffa9fb..8fc90ee 100644
    ${_PYTHON_FIND_OTHER_VERSIONS}
    )
  
-+# Gentoo portage requries that you use exactly the given python version
++# Gentoo portage requires that you use exactly the given python version
 +if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
 +    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
 +                    OUTPUT_VARIABLE _Gentoo_Python_VERSION)