Support more Python versions.

Package-Manager: portage-13850-svn/cvs/Linux x86_64

4 files changed, 22 insertions, 10 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 8edb4ec06e4d..121b895352bb 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.103 2009/07/17 19:08:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.104 2009/07/24 15:52:52 arfrever Exp $
+
+  24 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  files/cmake-FindPythonInterp.patch, files/cmake-FindPythonLibs.patch:
+  Support more Python versions.
 
 *cmake-2.6.4-r1 (17 Jul 2009)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c46fafa24657..ab6b380d8838 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,8 +1,8 @@
 AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00
 AUX cmake-2.6.4-FindBoost.patch 1094 RMD160 58cbed09bcb5fadf166cf64481f9605b5882f6a2 SHA1 5a3a91737b436e9de50c955bdb3e32b8fa7bed30 SHA256 a3f266086335b96af8e0dd848a05a10373762de9b9d6cc3b8af4b27fb43d362c
 AUX cmake-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA1 c463daa6e7d3a1d7065607f97993b5da3486e7e1 SHA256 c5390550c192aea18415087ed891f7e5192b2a385c9c72f4cda0c19b13f6bfbb
-AUX cmake-FindPythonInterp.patch 689 RMD160 77d7bb6e85fff6c54650de68ee241c28f2092bde SHA1 674f9a3ed0fcc2b92f2972cf0856ee2c88d59172 SHA256 b30f9f1d6f3c6100db7e98905f8d919fbb77b8c8bc5528d2f3874cb42eb28065
-AUX cmake-FindPythonLibs.patch 530 RMD160 3e012fbf78d649d6c8111d72d384da3b1b838268 SHA1 0576f44f61465b8403471f0648653226f843d3bd SHA256 1e7bff2a1e999ac877ffeac1414e54e1685c5ef303d698db50d81201029204ab
+AUX cmake-FindPythonInterp.patch 528 RMD160 0d68c93135185a3aac1abf970277955a4e93d0d0 SHA1 5413b48dfe16a68c9b33d428c5cea3cc291748cb SHA256 8aae1c7de1fe7cb62e06b412f374e0071e07dcba89818e8d450e4fd028fa67ae
+AUX cmake-FindPythonLibs.patch 819 RMD160 2e72b28bbc45470187fe70ae0a9547639372d3d8 SHA1 899579e4fb334b9122e0f17ad02eeca9db630faf SHA256 763b4c90b82283653c71a4ea1e85eb394112d362f02e96544a7fab45f3f70148
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.6.2.tar.gz 3543548 RMD160 df7ed9bba605bf31494aa1b835dee264b5fcb6bd SHA1 48d33afaf23d40f2ea9aa2f5018c7213983222c2 SHA256 b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9
 DIST cmake-2.6.3.tar.gz 3594959 RMD160 14f0e878844f55a1b3d02837e98087dcaabb16be SHA1 bf34e1661954d808ac3a3eb9d394b69e4d3b1a98 SHA256 3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450
@@ -11,5 +11,5 @@ EBUILD cmake-2.6.2-r1.ebuild 2818 RMD160 5b03134876644ed67781aa17d31ada00526a477
 EBUILD cmake-2.6.3-r1.ebuild 3076 RMD160 e71edf10b1f6bd24be7473a193e99781c9eb22b3 SHA1 628cdfb02a481a1874397fea63477b33d2f58e71 SHA256 5d1997a9584838717976c963bbfd9819724147d642a216dd963209ddfa06d1f4
 EBUILD cmake-2.6.4-r1.ebuild 3488 RMD160 6485cbdfa2a391d5c779c3189446eba2604181ff SHA1 f6a336229498af8c5e5a2ead5032eb63d0754d6f SHA256 09169e47bd4f788b3e059a8b9c103cde3d96da18c496cc491cadcc91251cce1a
 EBUILD cmake-2.6.4.ebuild 3437 RMD160 bc834bc6fb3ccbd22796fd1523e94c8b3324ac47 SHA1 e6d8e9b5f78fa22fbf0ac4b9c6f5c531182bfc69 SHA256 d6dcf085e37c15eacb30bcf32b09318588a33c97be127457a1597d1d6f3ece1a
-MISC ChangeLog 15419 RMD160 5930826af39333d8b576eacc9966e10db3fd3524 SHA1 62a71e69c261ed18defd6fce9ae5de381c48a691 SHA256 298c053fdb86daef1e79ffdd2860fc8c81559966a9d01ac9d32434b536b7a564
+MISC ChangeLog 15597 RMD160 fa38e292b59866f95449b73c6012ccb223466e56 SHA1 712142e1b51752d2c9b61d94d01dc19263f64b62 SHA256 d1c980b3aa11bc7255ea9cd4d34c59a3477e1d7c82bb8a6b1736ebfa57fc4d1a
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cmake/files/cmake-FindPythonInterp.patch b/dev-util/cmake/files/cmake-FindPythonInterp.patch
index f70d4f83d357..91ecc6fe5a5e 100644
--- a/dev-util/cmake/files/cmake-FindPythonInterp.patch
+++ b/dev-util/cmake/files/cmake-FindPythonInterp.patch
@@ -1,12 +1,11 @@
-diff -ur cmake-2.6.2.orig/Modules/FindPythonInterp.cmake cmake-2.6.2/Modules/FindPythonInterp.cmake
---- cmake-2.6.2.orig/Modules/FindPythonInterp.cmake	2008-09-24 20:34:34.000000000 +0200
-+++ cmake-2.6.2/Modules/FindPythonInterp.cmake	2009-01-03 19:54:21.000000000 +0100
+--- Modules/FindPythonInterp.cmake
++++ Modules/FindPythonInterp.cmake
 @@ -7,7 +7,7 @@
  #
  
  FIND_PROGRAM(PYTHON_EXECUTABLE
 -  NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
-+  NAMES python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
++  NAMES python python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
    PATHS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch
index f473cffd9d18..433ba31c5a70 100644
--- a/dev-util/cmake/files/cmake-FindPythonLibs.patch
+++ b/dev-util/cmake/files/cmake-FindPythonLibs.patch
@@ -1,5 +1,14 @@
---- Modules/FindPythonLibs.cmake	2008-05-08 11:18:22.000000000 -0400
-+++ Modules/FindPythonLibs.cmake	2008-05-08 11:18:40.000000000 -0400
+--- Modules/FindPythonLibs.cmake
++++ Modules/FindPythonLibs.cmake
+@@ -13,7 +13,7 @@
+ # Search for the python framework on Apple.
+ CMAKE_FIND_FRAMEWORKS(Python)
+ 
+-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
++FOREACH(_CURRENT_VERSION 3.2 3.1 3.0 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+   STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
+   IF(WIN32)
+     FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
 @@ -27,10 +27,6 @@
      NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
      PATHS