Add "python3" USE flag.

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

7 files changed, 200 insertions, 7 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 91f706714d4d..b724e7687ee2 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,14 @@
 # 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.105 2009/07/26 20:41:23 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.106 2009/07/28 16:30:34 arfrever Exp $
+
+*cmake-2.6.4-r2 (28 Jul 2009)
+
+  28 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +cmake-2.6.4-r2.ebuild, +files/cmake-python-3.patch,
+  files/cmake-FindPythonInterp.patch, files/cmake-FindPythonLibs.patch,
+  metadata.xml:
+  Add "python3" USE flag.
 
   26 Jul 2009; Marcus D. Hanwell <cryos@gentoo.org> cmake-2.6.4.ebuild,
   cmake-2.6.4-r1.ebuild:
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 8ca27e5d1796..a3200d55593d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,8 +1,9 @@
 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 528 RMD160 0d68c93135185a3aac1abf970277955a4e93d0d0 SHA1 5413b48dfe16a68c9b33d428c5cea3cc291748cb SHA256 8aae1c7de1fe7cb62e06b412f374e0071e07dcba89818e8d450e4fd028fa67ae
-AUX cmake-FindPythonLibs.patch 819 RMD160 2e72b28bbc45470187fe70ae0a9547639372d3d8 SHA1 899579e4fb334b9122e0f17ad02eeca9db630faf SHA256 763b4c90b82283653c71a4ea1e85eb394112d362f02e96544a7fab45f3f70148
+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.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
@@ -10,6 +11,7 @@ DIST cmake-2.6.4.tar.gz 3285371 RMD160 e4217067537f76e52317514cb5bb0cf38733d16a
 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.ebuild 3436 RMD160 a15fa36719f3581fa67c9d7e64c3ac5d55719a6e SHA1 0200e57a666461d4840164a52221b80e4f72636b SHA256 619d8daff2df4ec92265550c42717f2e3301497d37f4d0fc0c638af359da6d67
-MISC ChangeLog 15767 RMD160 b8db11c76fa56d293e6c13418e7bec452259beba SHA1 ef69600a722d89726a771286e8b3c265096e067c SHA256 7db47691e38c3b648276986982e8eb99d06cd0bb3220cbd9e26362cb3d36c7d4
-MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+MISC ChangeLog 16044 RMD160 a82fb8ad6e6e85d360930d8312d4d578c8b53973 SHA1 0f004d3ecb777257d536837759c009ffe0640035 SHA256 df8e11f9081aebd4485e355582be6e4bcbf72d65b46282191a46a2b872ca4482
+MISC metadata.xml 243 RMD160 1f3291b8046f981ffc71b1d2d58ceac2106b06c1 SHA1 ceb365206a68962f212f46c526f0cf8daf73c090 SHA256 335e49103b0cbe4a0839a735a83e52914202f8978232230506f31dcfc257d182
diff --git a/dev-util/cmake/cmake-2.6.4-r2.ebuild b/dev-util/cmake/cmake-2.6.4-r2.ebuild
new file mode 100644
index 000000000000..ba8d8e55554d
--- /dev/null
+++ b/dev-util/cmake/cmake-2.6.4-r2.ebuild
@@ -0,0 +1,158 @@
+# 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 $
+
+EAPI="2"
+
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic cmake-utils
+
+MY_PV="${PV/rc/RC-}"
+MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+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"
+
+DEPEND="
+	>=net-misc/curl-7.16.4
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libxml2-2.6.28
+	>=dev-libs/xmlrpc-c-1.06.27[curl]
+	emacs? ( virtual/emacs )
+	qt4? ( x11-libs/qt-gui:4 )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}/${PN}-FindJNI.patch"
+	"${FILESDIR}/${PN}-FindPythonLibs.patch"
+	"${FILESDIR}/${PN}-FindPythonInterp.patch"
+	"${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
+
+	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
+		append-flags "-fno-stack-protector"
+	fi
+
+	bootstrap=0
+	has_version ">=dev-util/cmake-2.6.1" || bootstrap=1
+	if [[ ${bootstrap} = 0 ]]; then
+		# Required version of CMake found, now test if it works
+		cmake --version &> /dev/null
+		if ! [[ $? = 0 ]]; then
+			bootstrap=1
+		fi
+	fi
+
+	if [[ ${bootstrap} = 1 ]]; then
+		tc-export CC CXX LD
+
+		if use qt4; then
+			qt_arg="--qt-gui"
+		else
+			qt_arg="--no-qt-gui"
+		fi
+
+		echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+		if [ $? -eq 0 ]; then
+			par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
+			par_arg="--parallel=${par_arg}"
+		else
+			par_arg="--parallel=1"
+		fi
+
+		./bootstrap \
+			--system-libs \
+			--prefix=/usr \
+			--docdir=/share/doc/${PF} \
+			--datadir=/share/${PN} \
+			--mandir=/share/man \
+			"$qt_arg" \
+			"$par_arg" || die "./bootstrap failed"
+	else
+		# this is way much faster so we should preffer it if some cmake is
+		# around.
+		use qt4 && qt_arg="ON" || qt_arg="OFF"
+		mycmakeargs="-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+			-DCMAKE_DOC_DIR=/share/doc/${PF}
+			-DCMAKE_MAN_DIR=/share/man
+			-DCMAKE_DATA_DIR=/share/${PN}
+			-DBUILD_CursesDialog=ON
+			-DBUILD_QtDialog=${qt_arg}"
+		cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use emacs; then
+		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
+	fi
+}
+
+src_test() {
+	einfo "Please note that test \"58 - SimpleInstall-Stage2\" might fail."
+	einfo "If any package installs with cmake, it means test failed but cmake work."
+	emake test
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/Docs/cmake-syntax.vim
+
+		insinto /usr/share/vim/vimfiles/indent
+		doins "${S}"/Docs/cmake-indent.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}/${VIMFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/cmake-FindPythonInterp.patch b/dev-util/cmake/files/cmake-FindPythonInterp.patch
index 91ecc6fe5a5e..2e4c47d6806f 100644
--- a/dev-util/cmake/files/cmake-FindPythonInterp.patch
+++ b/dev-util/cmake/files/cmake-FindPythonInterp.patch
@@ -5,7 +5,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 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
++  NAMES python 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 433ba31c5a70..7981140296da 100644
--- a/dev-util/cmake/files/cmake-FindPythonLibs.patch
+++ b/dev-util/cmake/files/cmake-FindPythonLibs.patch
@@ -5,7 +5,7 @@
  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)
++FOREACH(_CURRENT_VERSION 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/files/cmake-python-3.patch b/dev-util/cmake/files/cmake-python-3.patch
new file mode 100644
index 000000000000..0fdcd0ca1922
--- /dev/null
+++ b/dev-util/cmake/files/cmake-python-3.patch
@@ -0,0 +1,22 @@
+--- 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 a23f444b67d6..48b26285a0ca 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -2,4 +2,7 @@
 <!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>