Add patch for python lib detection. Per bug #253593. Thanks to Oldrich Jedlicka for patch.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 137 insertions, 3 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index d4d8be1a0dec..8587a18028c6 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cmake
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.76 2008/12/02 23:25:37 scarabeus Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.77 2009/01/03 22:05:12 scarabeus Exp $
+
+*cmake-2.6.2-r1 (03 Jan 2009)
+
+  03 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/cmake-FindPythonInterp.patch, +cmake-2.6.2-r1.ebuild:
+  Add patch for python lib detection. Per bug #253593. Thanks to Oldrich
+  Jedlicka for patch.
 
   02 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org>
   -files/cmake-2.6.1-gc-sections.patch, -files/cmake-2.6.1-rpath.patch,
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 75c8751ef448..70d380729706 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,6 +2,7 @@ AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c
 AUX FindSWIG.cmake 2263 RMD160 c56589a1b2401b3b55a5d3f5336d8ad7d797b4c6 SHA1 c3687448a47ba49d9d03fea5ed0ba93cb85b60ae SHA256 5be6bdbfaf93f7d69845544b697d120732341ed2d8af043cdd43f5a892d06de0
 AUX cmake-2.0.6-rpath-fix.patch 526 RMD160 9039e42ce4def8ae7ce38946cb55b95b4502a1e9 SHA1 8e181634b1663a27139682309fb4180a0dbaa82d SHA256 18c58ecf9bdddce15764ab3481aba570e3378f8d8b1c5306a050b2c33323a1bc
 AUX cmake-2.4.7-findkde4.patch 1884 RMD160 918d56910e18ffec856f1cc67d0b67117736ae09 SHA1 6314d9dea24bfbcd262517aceead4b273e116c54 SHA256 bd22024e222d7bd0d99fa932bf193803acb956887bb6b41ecf2eca96ba0a5e3b
+AUX cmake-FindPythonInterp.patch 689 RMD160 77d7bb6e85fff6c54650de68ee241c28f2092bde SHA1 674f9a3ed0fcc2b92f2972cf0856ee2c88d59172 SHA256 b30f9f1d6f3c6100db7e98905f8d919fbb77b8c8bc5528d2f3874cb42eb28065
 AUX cmake-FindPythonLibs.patch 530 RMD160 3e012fbf78d649d6c8111d72d384da3b1b838268 SHA1 0576f44f61465b8403471f0648653226f843d3bd SHA256 1e7bff2a1e999ac877ffeac1414e54e1685c5ef303d698db50d81201029204ab
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.4.6.tar.gz 2604547 RMD160 61af13faecd10e85a0fee3252630b30b8781987a SHA1 5290aaf949413ee7f77275ba68e73cec1546364b SHA256 afb82bcf732d317f254b51ffdcd95e0a3b3c101c02f3751b12ce25fe46c0c304
@@ -11,6 +12,7 @@ DIST cmake-2.6.2.tar.gz 3543548 RMD160 df7ed9bba605bf31494aa1b835dee264b5fcb6bd
 EBUILD cmake-2.4.6-r1.ebuild 1933 RMD160 db78c10337212e1509cfbde355f9a5df954e347d SHA1 82048b8a1f483bafb1cb7fb3817c1ac56d804c2d SHA256 2504feaecd4ceae8c757da875d8a5d191be5783c0b9498dcc9f94c29ddaa76fb
 EBUILD cmake-2.4.7-r1.ebuild 2103 RMD160 c508a57af1782d997537316a155277d9dba8f54a SHA1 68d0d5aa0ef76b492df5795f2539a9f0973abcca SHA256 f09541251a3d019e9813eaaa9817f24e778905e9d4591d5f6bf7a0fb3763f805
 EBUILD cmake-2.4.8.ebuild 2786 RMD160 3a3fe9e0c38d2ab111e6b33e406786a8036b947e SHA1 b77551366524b13e51776251bf5e0411f244f9cb SHA256 3e2dcfa3c8ec27729d86596743ef1da35a990975fda769b38f9f50d819bfcbe7
+EBUILD cmake-2.6.2-r1.ebuild 2775 RMD160 ecb5087601b2216e729a480fa7e009a98a107a69 SHA1 efde331ad4fc15b5c9a5c5b02f284aeab637a93e SHA256 49e50b7d8768469bb241ca9e869b71d7900d3865883ef4ba69cfb8fc4867eff5
 EBUILD cmake-2.6.2.ebuild 2790 RMD160 544b72eb61e9c11045ebd6eecc54fff27753d8a2 SHA1 1a22ffd7b1fe5163b40e411b12ba03cc77a7e14b SHA256 68a8cca8707d1b4b7497f6e1f0c5e7138cc92a8ba0bdccffe5bc6ff1b74b643a
-MISC ChangeLog 11988 RMD160 a7d3f049f9f3c27606bc4fb8a81beabf4d6710a2 SHA1 57c3f6941818792ac96f466f4936d488401df76e SHA256 50c68122a526c250b58b5c3988234289bfdc9288cb3a57ee695c48d491a9c8af
+MISC ChangeLog 12230 RMD160 c429b070b6c94ccaced861b0ebc831a447692343 SHA1 00a06659e22524850b6b47a7a1256c037661fee2 SHA256 c5abbd092842e0b30ce3e65523eef5d3ec4f55c4ca7b7603f3e7f7dde936704c
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cmake/cmake-2.6.2-r1.ebuild b/dev-util/cmake/cmake-2.6.2-r1.ebuild
new file mode 100644
index 000000000000..5baa4b6b3e7d
--- /dev/null
+++ b/dev-util/cmake/cmake-2.6.2-r1.ebuild
@@ -0,0 +1,113 @@
+# 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.2-r1.ebuild,v 1.1 2009/01/03 22:05:12 scarabeus Exp $
+
+EAPI="2"
+
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic
+
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="emacs 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.09[curl]
+	emacs? ( virtual/emacs )
+	qt4? ( || ( ( x11-libs/qt-core:4
+			x11-libs/qt-gui:4 )
+		>=x11-libs/qt-4.3:4 ) )
+	vim-syntax? ( || (
+		app-editors/vim
+		app-editors/gvim ) )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-FindPythonLibs.patch"
+	epatch "${FILESDIR}/${PN}-FindPythonInterp.patch"
+}
+
+src_configure() {
+	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
+		append-flags "-fno-stack-protector"
+	fi
+
+	tc-export CC CXX LD
+
+	local qt_arg
+	if use qt4; then
+		qt_arg="--qt-gui"
+	else
+		qt_arg="--no-qt-gui"
+	fi
+
+	local par_arg
+	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
+}
+
+src_compile() {
+	./bootstrap \
+		--system-libs \
+		--prefix=/usr \
+		--docdir=/share/doc/${PF} \
+		--datadir=/share/${PN} \
+		--mandir=/share/man \
+		"$qt_arg" \
+		"$par_arg" || die "./bootstrap failed"
+
+	emake || die "emake failed."
+	if use emacs; then
+		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
+	fi
+}
+
+src_test() {
+	emake test || \
+		einfo "note test failure on qtwrapping was expected - nature of portage rather than a true failure"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	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
new file mode 100644
index 000000000000..f70d4f83d357
--- /dev/null
+++ b/dev-util/cmake/files/cmake-FindPythonInterp.patch
@@ -0,0 +1,12 @@
+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
+@@ -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
+   PATHS
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]