From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AE5B01388E4 for ; Thu, 7 Feb 2013 16:11:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B5B0E0102; Thu, 7 Feb 2013 16:11:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC8B8E0102 for ; Thu, 7 Feb 2013 16:11:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6B1333DEDA for ; Thu, 7 Feb 2013 16:11:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 414C4E4073 for ; Thu, 7 Feb 2013 16:11:41 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1360253415.9c83061f27fbcce3dea027d90276764e2d1ee14d.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.10.2-r2.ebuild dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 9c83061f27fbcce3dea027d90276764e2d1ee14d X-VCS-Branch: master Date: Thu, 7 Feb 2013 16:11:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 718987cc-3395-4aba-9ca0-7cae54dc5365 X-Archives-Hash: 029c6a9eda4181b4146c14adac02b4d7 commit: 9c83061f27fbcce3dea027d90276764e2d1ee14d Author: Arfrever Frehtes Taifersar Arahesis gmail com> AuthorDate: Thu Feb 7 16:09:50 2013 +0000 Commit: Michael Palimaka gentoo 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)