FindPythonLibs.cmake should use currently active Python version (bug #287143). Remove no longer needed "python3" USE flag.

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

7 files changed, 23 insertions, 77 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 056198038323..0ed4cf9ba750 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,15 @@
 # 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.107 2009/10/01 13:35:02 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.108 2009/10/01 18:10:14 arfrever Exp $
+
+*cmake-2.6.4-r3 (01 Oct 2009)
+
+  01 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -cmake-2.6.4-r2.ebuild, +cmake-2.6.4-r3.ebuild, cmake-2.8.0_rc1.ebuild,
+  -files/cmake-python-3.patch, files/cmake-FindPythonLibs.patch,
+  metadata.xml:
+  FindPythonLibs.cmake should use currently active Python version (bug
+  #287143). Remove no longer needed "python3" USE flag.
 
 *cmake-2.8.0_rc1 (01 Oct 2009)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 4a35858e6802..1a10a34bb927 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,8 +2,7 @@ AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c
 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 498 RMD160 a4113724d0c2bdb53e7c947790d8a7e337759c84 SHA1 abd7754549fef5aae515361acd6a509c98227bf5 SHA256 8c3d4dc1898eae4adaa392b556286076594470277bc7c1bddbe2a28213fff7c0
-AUX cmake-FindPythonLibs.patch 807 RMD160 015966b7de3f452e8e2508f801502a02ae6385e0 SHA1 017445fe3ec3bdd4b9c18c83b3b4088622c716f3 SHA256 fc1911deab11c56a3f6e5858a626bc96dc079b7a72ba51737b05e2a7fa0fb4ad
-AUX cmake-python-3.patch 969 RMD160 6147ea9c8c6ab2ee805f80bb001f97ef43a3d444 SHA1 6e7102ac2d3e3b4050025b37a460b1e3435a5e84 SHA256 5e7893b7750acc4bb5b6ed9d94ddbe54f2729e19d1eeb958b638de0a07dd657f
+AUX cmake-FindPythonLibs.patch 546 RMD160 429021001f1b464d8321703052890a34141a34ec SHA1 e5d62feab16058f123e1399e0504a50f50ee5a88 SHA256 86a5e78ff4e62cf8987401255197f7ba4ae70d00c257df3048372c5dcc035bdd
 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
@@ -12,8 +11,8 @@ DIST cmake-2.8.0-rc1.tar.gz 3524542 RMD160 7e80e6bd62ff70589e6ddde314170fdbf6ee7
 EBUILD cmake-2.6.2-r1.ebuild 2818 RMD160 5b03134876644ed67781aa17d31ada00526a4775 SHA1 ccbe554e8bd842419f6ec019dcc564df3c98db09 SHA256 f8bced49dbcb701e34035744a5e4cd4e36f620f8f3c4d147ebc5e1948f6fbc5c
 EBUILD cmake-2.6.3-r1.ebuild 3076 RMD160 e71edf10b1f6bd24be7473a193e99781c9eb22b3 SHA1 628cdfb02a481a1874397fea63477b33d2f58e71 SHA256 5d1997a9584838717976c963bbfd9819724147d642a216dd963209ddfa06d1f4
 EBUILD cmake-2.6.4-r1.ebuild 3485 RMD160 d5563d0db93b1936e350feb9755b318d5cb94bb2 SHA1 b446894b3e0efb73532a0d4e95d47c3b31a7684e SHA256 bb7e274284bcac0981bcc3fa749a8a71a211b2d3096f7c079e91513a3264d84f
-EBUILD cmake-2.6.4-r2.ebuild 3742 RMD160 4c0de89e7799c3a71f89de0a8b4d9ac4f9ea0960 SHA1 fd5c2c29fbc17df09377559be54381414fe6250a SHA256 0044956f38d508fc77909ce8e7def61f5df80f73698fe2eead79a7978a9a8b27
+EBUILD cmake-2.6.4-r3.ebuild 3488 RMD160 985912ecfcd2d03b57e082274502d9e224dc7f37 SHA1 0fd457fea704a36945b34f7fb17d27ca966a3da7 SHA256 e352e0bd8cf1cd5f3e0388c6026822f60dad3b623ae4666eff9041db86a62399
 EBUILD cmake-2.6.4.ebuild 3436 RMD160 a15fa36719f3581fa67c9d7e64c3ac5d55719a6e SHA1 0200e57a666461d4840164a52221b80e4f72636b SHA256 619d8daff2df4ec92265550c42717f2e3301497d37f4d0fc0c638af359da6d67
-EBUILD cmake-2.8.0_rc1.ebuild 3683 RMD160 52bf7c061a355085e2cb490456df6fa6d3939396 SHA1 4aa141445313e21c30286aaa6c725a3772dea9b8 SHA256 20d08eff45ca82b7ee14e507c1ee2ba16758815271594d82a4b4f15e48b80b68
-MISC ChangeLog 16214 RMD160 2867ccea8f86c1e4380756313ba63eb91bf63b13 SHA1 b018bbb5bf8c5ad37b53f7a90bbf75854e8b863f SHA256 349a5ee446eaa5bf8ce31c5802d5a0218041f57b0bcb0d0aaf54149f9def9ce6
-MISC metadata.xml 243 RMD160 1f3291b8046f981ffc71b1d2d58ceac2106b06c1 SHA1 ceb365206a68962f212f46c526f0cf8daf73c090 SHA256 335e49103b0cbe4a0839a735a83e52914202f8978232230506f31dcfc257d182
+EBUILD cmake-2.8.0_rc1.ebuild 3432 RMD160 9dbe0b9b01e48fca8e29bc7b09e5755f197ebab8 SHA1 358034a8c687c8fca8910efd1059842f42e5a2d1 SHA256 072e553a0ad92dfb05d4b6ba158d3c26fb6d2194a83e2c341c96f0496fad4d8a
+MISC ChangeLog 16604 RMD160 50744571f1f22fb1f965e022f24f94a7f2a90ab1 SHA1 c7bb9db518527edb077e6dbebe700004d6e5d73e SHA256 e887d55b5fcf037ea5c8f1d46df459a3ee0bce5155886ff693cfb9233270a1a1
+MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cmake/cmake-2.6.4-r2.ebuild b/dev-util/cmake/cmake-2.6.4-r3.ebuild
index ba8d8e55554d..945b819778fb 100644
--- a/dev-util/cmake/cmake-2.6.4-r2.ebuild
+++ b/dev-util/cmake/cmake-2.6.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.4-r2.ebuild,v 1.1 2009/07/28 16:30:34 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.4-r3.ebuild,v 1.1 2009/10/01 18:10:14 arfrever Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.
 LICENSE="CMake"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="emacs python3 qt4 vim-syntax"
+IUSE="emacs qt4 vim-syntax"
 
 DEPEND="
 	>=net-misc/curl-7.16.4
@@ -48,20 +48,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-FindBoost.patch"
 )
 
-pkg_setup() {
-	if use python3; then
-		ewarn "Support for Python 3 is experimental."
-		ewarn "Please include patches in bug reports!"
-		ebeep 6
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	use python3 && epatch "${FILESDIR}/${PN}-python-3.patch"
-}
-
 src_configure() {
 	local qt_arg par_arg
 
diff --git a/dev-util/cmake/cmake-2.8.0_rc1.ebuild b/dev-util/cmake/cmake-2.8.0_rc1.ebuild
index 75e1f69f527e..ece284370551 100644
--- a/dev-util/cmake/cmake-2.8.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-2.8.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0_rc1.ebuild,v 1.1 2009/10/01 13:35:02 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0_rc1.ebuild,v 1.2 2009/10/01 18:10:14 arfrever Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.
 LICENSE="CMake"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 SLOT="0"
-IUSE="emacs python3 qt4 vim-syntax"
+IUSE="emacs qt4 vim-syntax"
 
 DEPEND="
 	>=net-misc/curl-7.16.4
@@ -46,20 +46,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-FindPythonInterp.patch"
 )
 
-pkg_setup() {
-	if use python3; then
-		ewarn "Support for Python 3 is experimental."
-		ewarn "Please include patches in bug reports!"
-		ebeep 6
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	use python3 && epatch "${FILESDIR}/${PN}-python-3.patch"
-}
-
 src_configure() {
 	local qt_arg par_arg
 
diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch
index 7981140296da..d7f4f627be4c 100644
--- a/dev-util/cmake/files/cmake-FindPythonLibs.patch
+++ b/dev-util/cmake/files/cmake-FindPythonLibs.patch
@@ -1,22 +1,13 @@
 --- Modules/FindPythonLibs.cmake
 +++ Modules/FindPythonLibs.cmake
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,9 @@
  # 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 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++  OUTPUT_VARIABLE _PYTHON_VERSION)
++FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION})
    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
-       [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
--    PATH_SUFFIXES
--      python${_CURRENT_VERSION}/config
--    # Avoid finding the .dll in the PATH.  We want the .lib.
--    NO_SYSTEM_ENVIRONMENT_PATH
-   )
- 
-   SET(PYTHON_FRAMEWORK_INCLUDES)
diff --git a/dev-util/cmake/files/cmake-python-3.patch b/dev-util/cmake/files/cmake-python-3.patch
deleted file mode 100644
index 0fdcd0ca1922..000000000000
--- a/dev-util/cmake/files/cmake-python-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Modules/FindPythonInterp.cmake
-+++ Modules/FindPythonInterp.cmake
-@@ -7,7 +7,7 @@
- #
- 
- FIND_PROGRAM(PYTHON_EXECUTABLE
--  NAMES python python2.7 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.6\\InstallPath]
-   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
---- 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.7 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
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index 48b26285a0ca..a23f444b67d6 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="python3">Enable experimental support for Python 3</flag>
-	</use>
 </pkgmetadata>